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

Do not query start of range if it's end is the same as the previous hunk's

Browse source
This commit is contained in:
Piotr Osiewicz 2023-08-08 00:27:38 +02:00
parent ca21626064
commit fa16895976
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7557,12 +7557,11 @@ impl Editor {
) -> Vec<RangeInclusive<u32>> { ) -> Vec<RangeInclusive<u32>> {
let mut results = Vec::new(); let mut results = Vec::new();
let buffer = &display_snapshot.buffer_snapshot; let buffer = &display_snapshot.buffer_snapshot;
let Some((color_fetcher, ranges)) = self.background_highlights let Some((_, ranges)) = self.background_highlights
.get(&TypeId::of::<T>()) else { .get(&TypeId::of::<T>()) else {
return vec![]; return vec![];
}; };
let color = color_fetcher(theme);
let start_ix = match ranges.binary_search_by(|probe| { let start_ix = match ranges.binary_search_by(|probe| {
let cmp = probe.end.cmp(&search_range.start, buffer); let cmp = probe.end.cmp(&search_range.start, buffer);
if cmp.is_gt() { if cmp.is_gt() {
@ -7584,8 +7583,14 @@ impl Editor {
if range.start.cmp(&search_range.end, buffer).is_ge() { if range.start.cmp(&search_range.end, buffer).is_ge() {
break; break;
} }
let start = range.start.to_point(buffer).row;
let end = range.end.to_point(buffer).row; let end = range.end.to_point(buffer).row;
if let Some(current_row) = &end_row {
if end == *current_row {
continue;
}
}
let start = range.start.to_point(buffer).row;
if start_row.is_none() { if start_row.is_none() {
assert_eq!(end_row, None); assert_eq!(end_row, None);
start_row = Some(start); start_row = Some(start);