andrey/helix-mirror
1
0
Fork 0
mirror of https://github.com/helix-editor/helix.git synced 2024-11-25 02:46:17 +04:00
Code Issues Projects Releases Wiki Activity

don't automatically dismiss zero width diagnostics (#9280)

Browse Source
This commit is contained in:
Pascal Kuthe 2024-01-09 01:54:55 +01:00 committed by GitHub
parent 20b91fd99a
commit 4da6191a1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helix-view/src/document.rs
View File

@ -1222,18 +1222,23 @@ fn apply_impl(
}; };
(&mut diagnostic.range.start, assoc) (&mut diagnostic.range.start, assoc)
})); }));
changes.update_positions(self.diagnostics.iter_mut().map(|diagnostic| { changes.update_positions(self.diagnostics.iter_mut().filter_map(|diagnostic| {
if diagnostic.zero_width {
// for zero width diagnostics treat the diagnostic as a point
// rather than a range
return None;
}
let assoc = if diagnostic.ends_at_word { let assoc = if diagnostic.ends_at_word {
Assoc::AfterWord Assoc::AfterWord
} else { } else {
Assoc::Before Assoc::Before
}; };
(&mut diagnostic.range.end, assoc) Some((&mut diagnostic.range.end, assoc))
})); }));
self.diagnostics.retain_mut(|diagnostic| { self.diagnostics.retain_mut(|diagnostic| {
if diagnostic.range.start > diagnostic.range.end if diagnostic.zero_width {
|| (!diagnostic.zero_width && diagnostic.range.start == diagnostic.range.end) diagnostic.range.end = diagnostic.range.start
{ } else if diagnostic.range.start >= diagnostic.range.end {
return false; return false;
} }
diagnostic.line = self.text.char_to_line(diagnostic.range.start); diagnostic.line = self.text.char_to_line(diagnostic.range.start);