Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-27 13:33:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

properly sort changes by depth to sort between nodes that have the same start range

Browse source
This commit is contained in:
DropDemBits 2024-09-02 21:34:00 -04:00
parent 5fe518361e
commit b565d8db74
No known key found for this signature in database
GPG key ID: 7FE02A6C1EDFA075
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use std::{collections::VecDeque, ops::RangeInclusive}; use std::{cmp::Ordering, collections::VecDeque, ops::RangeInclusive};
use rowan::TextRange; use rowan::TextRange;
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
@ -30,7 +30,12 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
let SyntaxEditor { root, mut changes, mappings, annotations } = editor; let SyntaxEditor { root, mut changes, mappings, annotations } = editor;
// Sort changes by range then change kind, so that we can: let mut node_depths = FxHashMap::<SyntaxNode, usize>::default();
let mut get_node_depth = |node: SyntaxNode| {
*node_depths.entry(node).or_insert_with_key(|node| node.ancestors().count())
};
// Sort changes by range, then depth, then change kind, so that we can:
// - ensure that parent edits are ordered before child edits // - ensure that parent edits are ordered before child edits
// - ensure that inserts will be guaranteed to be inserted at the right range // - ensure that inserts will be guaranteed to be inserted at the right range
// - easily check for disjoint replace ranges // - easily check for disjoint replace ranges
@ -38,6 +43,16 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
a.target_range() a.target_range()
.start() .start()
.cmp(&b.target_range().start()) .cmp(&b.target_range().start())
.then_with(|| {
let a_target = a.target_parent();
let b_target = b.target_parent();
if a_target == b_target {
return Ordering::Equal;
}
get_node_depth(a_target).cmp(&get_node_depth(b_target))
})
.then(a.change_kind().cmp(&b.change_kind())) .then(a.change_kind().cmp(&b.change_kind()))
}); });
@ -49,8 +64,8 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
l.change_kind() == ChangeKind::Replace && r.change_kind() == ChangeKind::Replace l.change_kind() == ChangeKind::Replace && r.change_kind() == ChangeKind::Replace
}) })
.all(|(l, r)| { .all(|(l, r)| {
(l.target_parent() != r.target_parent() get_node_depth(l.target_parent()) != get_node_depth(r.target_parent())
|| l.target_range().intersect(r.target_range()).is_none()) || l.target_range().intersect(r.target_range()).is_none()
}); });
if stdx::never!( if stdx::never!(