Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clip diagnostic range before and during empty range expansion

Browse source 
Co-Authored-By: Max Brunsfeld <max@zed.dev>
This commit is contained in:
Julia 2022-11-23 13:20:47 -05:00
parent e51cbf67ab
commit b58ae8bdd7
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
crates/project/src/project.rs
View file

@ -2677,14 +2677,17 @@ impl Project {
end = entry.range.end;
}
let mut range = start..end;
let mut range = snapshot.clip_point_utf16(start, Bias::Left)
..snapshot.clip_point_utf16(end, Bias::Right);
// Expand empty ranges by one codepoint
if range.start == range.end {
// This will be go to the next boundary when being clipped
range.end.0.column += 1;
if range.start == range.end && range.end.0.column > 0 {
range.start.0.column -= 1;
range.end.column += 1;
range.end = snapshot.clip_point_utf16(Unclipped(range.end), Bias::Right);
if range.start == range.end && range.end.column > 0 {
range.start.column -= 1;
range.end = snapshot.clip_point_utf16(Unclipped(range.end), Bias::Left);
}
}