language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-26 20:09:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Raise edition one more level

Browse source
This commit is contained in:
Johann Hemmann 2024-01-30 16:57:40 +01:00 • committed by Lukas Wirth
parent 454e481422
commit 2cf5d8811a
13 changed files with 61 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/syntax/src/parsing/reparsing.rs
View file

@ -26,7 +26,9 @@ pub(crate) fn incremental_reparse(
return Some((green, merge_errors(errors, new_errors, old_range, edit), old_range));
}
if let Some((green, new_errors, old_range)) = reparse_block(node, edit) {
if let Some((green, new_errors, old_range)) =
reparse_block(node, edit, parser::Edition::Edition2021)
{
return Some((green, merge_errors(errors, new_errors, old_range, edit), old_range));
}
None
@ -84,6 +86,7 @@ fn reparse_token(
fn reparse_block(
root: &SyntaxNode,
edit: &Indel,
edition: parser::Edition,
) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> {
let (node, reparser) = find_reparsable_node(root, edit.delete)?;
let text = get_text_after_edit(node.clone().into(), edit);
@ -94,7 +97,7 @@ fn reparse_block(
return None;
}
let tree_traversal = reparser.parse(&parser_input, parser::Edition::Edition2021);
let tree_traversal = reparser.parse(&parser_input, edition);
let (green, new_parser_errors, _eof) = build_tree(lexed, tree_traversal);