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

bundle old root into SyntaxEdit result

Browse source 
useful for `SourceChangeBuilder` so it can still perform a tree diff without having to store the old root separately
This commit is contained in:
DropDemBits 2024-09-03 11:20:23 -04:00
parent 69e8393963
commit 12c62662aa
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
crates/syntax/src/syntax_editor/edit_algo.rs
View file

@ -81,7 +81,12 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
"some replace change ranges intersect: {:?}",
changes
) {
return SyntaxEdit { root, annotations: Default::default(), changed_elements: vec![] };
return SyntaxEdit {
old_root: root.clone(),
new_root: root,
annotations: Default::default(),
changed_elements: vec![],
};
}
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
@ -273,7 +278,12 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
annotation_groups.entry(annotation).or_insert(vec![]).push(element);
}
SyntaxEdit { root, changed_elements, annotations: annotation_groups }
SyntaxEdit {
old_root: tree_mutator.immutable,
new_root: root,
changed_elements,
annotations: annotation_groups,
}
}
fn to_owning_node(element: &SyntaxElement) -> SyntaxNode {
@ -329,6 +339,7 @@ impl ChangedAncestor {
}
struct TreeMutator {
immutable: SyntaxNode,
mutable_clone: SyntaxNode,
}
@ -336,7 +347,7 @@ impl TreeMutator {
fn new(immutable: &SyntaxNode) -> TreeMutator {
let immutable = immutable.clone();
let mutable_clone = immutable.clone_for_update();
TreeMutator { mutable_clone }
TreeMutator { immutable, mutable_clone }
}
fn make_element_mut(&self, element: &SyntaxElement) -> SyntaxElement {