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

handle merging two syntax editors together

Browse source
This commit is contained in:
DropDemBits 2024-09-02 00:01:24 -04:00
parent 883e429179
commit db649195e9
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
2 changed files with 39 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

15
crates/syntax/src/syntax_editor.rs
View file

@ -37,8 +37,17 @@ impl SyntaxEditor {
self.annotations.push((element.syntax_element(), annotation))
}
pub fn combine(&mut self, other: SyntaxEditor) {
todo!()
pub fn merge(&mut self, mut other: SyntaxEditor) {
debug_assert!(
self.root == other.root || other.root.ancestors().any(|node| node == self.root),
"{:?} is not in the same tree as {:?}",
other.root,
self.root
);
self.changes.append(&mut other.changes);
self.mappings.merge(other.mappings);
self.annotations.append(&mut other.annotations);
}
pub fn delete(&mut self, element: impl Element) {
@ -290,7 +299,7 @@ mod tests {
}
#[test]
fn it() {
fn basic_usage() {
let root = make::match_arm(
[make::wildcard_pat().into()],
None,