Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-15 06:33:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix insert ranges not being excluded from disjointness

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

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

@ -1,10 +1,10 @@
use std::{collections::VecDeque, ops::RangeInclusive}; use std::{collections::VecDeque, ops::RangeInclusive};
use rowan::TextRange; use rowan::TextRange;
use rustc_hash::{FxHashMap, FxHashSet}; use rustc_hash::FxHashMap;
use crate::{ use crate::{
syntax_editor::{mapping::MissingMapping, Change, ChangeKind, Position, PositionRepr}, syntax_editor::{mapping::MissingMapping, Change, ChangeKind, PositionRepr},
SyntaxElement, SyntaxNode, SyntaxNodePtr, SyntaxElement, SyntaxNode, SyntaxNodePtr,
}; };
@ -41,12 +41,17 @@ pub(super) fn apply_edits(editor: SyntaxEditor) -> SyntaxEdit {
.then(a.change_kind().cmp(&b.change_kind())) .then(a.change_kind().cmp(&b.change_kind()))
}); });
let disjoint_replaces_ranges = changes.iter().zip(changes.iter().skip(1)).all(|(l, r)| { let disjoint_replaces_ranges = changes
l.change_kind() == ChangeKind::Replace .iter()
&& r.change_kind() == ChangeKind::Replace .zip(changes.iter().skip(1))
&& (l.target_parent() != r.target_parent() .filter(|(l, r)| {
// We only care about checking for disjoint replace ranges
l.change_kind() == ChangeKind::Replace && r.change_kind() == ChangeKind::Replace
})
.all(|(l, r)| {
(l.target_parent() != 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!(
!disjoint_replaces_ranges, !disjoint_replaces_ranges,