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

More git hunk highlighting fixes (#18459)

Browse source 
Follow-up to https://github.com/zed-industries/zed/pull/18454

Release Notes:

- N/A
This commit is contained in:
Max Brunsfeld 2024-09-27 13:48:37 -07:00 • committed by GitHub
parent 689da9d0b1
commit 0daa070448
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
7 changed files with 69 additions and 100 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/assistant/src/inline_assistant.rs
View file

@ -1208,7 +1208,7 @@ impl InlineAssistant {
editor.set_read_only(true); editor.set_read_only(true);
editor.set_show_inline_completions(Some(false), cx); editor.set_show_inline_completions(Some(false), cx);
editor.highlight_rows::<DeletedLines>( editor.highlight_rows::<DeletedLines>(
Anchor::min()..=Anchor::max(), Anchor::min()..Anchor::max(),
cx.theme().status().deleted_background, cx.theme().status().deleted_background,
false, false,
cx, cx,
@ -2557,7 +2557,7 @@ enum CodegenStatus {
#[derive(Default)] #[derive(Default)]
struct Diff { struct Diff {
deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)>, deleted_row_ranges: Vec<(Anchor, RangeInclusive<u32>)>,
inserted_row_ranges: Vec<RangeInclusive<Anchor>>, inserted_row_ranges: Vec<Range<Anchor>>,
} }
impl Diff { impl Diff {
@ -3103,7 +3103,7 @@ impl CodegenAlternative {
new_end_row, new_end_row,
new_snapshot.line_len(MultiBufferRow(new_end_row)), new_snapshot.line_len(MultiBufferRow(new_end_row)),
)); ));
self.diff.inserted_row_ranges.push(start..=end); self.diff.inserted_row_ranges.push(start..end);
new_row += lines; new_row += lines;
} }
} }
@ -3181,7 +3181,7 @@ impl CodegenAlternative {
new_end_row, new_end_row,
new_snapshot.line_len(MultiBufferRow(new_end_row)), new_snapshot.line_len(MultiBufferRow(new_end_row)),
)); ));
inserted_row_ranges.push(start..=end); inserted_row_ranges.push(start..end);
new_row += line_count; new_row += line_count;
} }
} }

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

@ -821,7 +821,7 @@ impl SelectionHistory {
struct RowHighlight { struct RowHighlight {
index: usize, index: usize,
range: RangeInclusive<Anchor>, range: Range<Anchor>,
color: Hsla, color: Hsla,
should_autoscroll: bool, should_autoscroll: bool,
} }
@ -11502,9 +11502,11 @@ impl Editor {
/// Adds a row highlight for the given range. If a row has multiple highlights, the /// Adds a row highlight for the given range. If a row has multiple highlights, the
/// last highlight added will be used. /// last highlight added will be used.
///
/// If the range ends at the beginning of a line, then that line will not be highlighted.
pub fn highlight_rows<T: 'static>( pub fn highlight_rows<T: 'static>(
&mut self, &mut self,
range: RangeInclusive<Anchor>, range: Range<Anchor>,
color: Hsla, color: Hsla,
should_autoscroll: bool, should_autoscroll: bool,
cx: &mut ViewContext<Self>, cx: &mut ViewContext<Self>,
@ -11513,8 +11515,8 @@ impl Editor {
let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default(); let row_highlights = self.highlighted_rows.entry(TypeId::of::<T>()).or_default();
let ix = row_highlights.binary_search_by(|highlight| { let ix = row_highlights.binary_search_by(|highlight| {
Ordering::Equal Ordering::Equal
.then_with(|| highlight.range.start().cmp(&range.start(), &snapshot)) .then_with(|| highlight.range.start.cmp(&range.start, &snapshot))
.then_with(|| highlight.range.end().cmp(&range.end(), &snapshot)) .then_with(|| highlight.range.end.cmp(&range.end, &snapshot))
}); });
if let Err(mut ix) = ix { if let Err(mut ix) = ix {
@ -11527,18 +11529,13 @@ impl Editor {
let prev_highlight = &mut row_highlights[ix - 1]; let prev_highlight = &mut row_highlights[ix - 1];
if prev_highlight if prev_highlight
.range .range
.end() .end
.cmp(&range.start(), &snapshot) .cmp(&range.start, &snapshot)
.is_ge() .is_ge()
{ {
ix -= 1; ix -= 1;
if prev_highlight if prev_highlight.range.end.cmp(&range.end, &snapshot).is_lt() {
.range prev_highlight.range.end = range.end;
.end()
.cmp(&range.end(), &snapshot)
.is_lt()
{
prev_highlight.range = *prev_highlight.range.start()..=*range.end();
} }
merged = true; merged = true;
prev_highlight.index = index; prev_highlight.index = index;
@ -11564,18 +11561,17 @@ impl Editor {
let highlight = &row_highlights[ix]; let highlight = &row_highlights[ix];
if next_highlight if next_highlight
.range .range
.start() .start
.cmp(&highlight.range.end(), &snapshot) .cmp(&highlight.range.end, &snapshot)
.is_le() .is_le()
{ {
if next_highlight if next_highlight
.range .range
.end() .end
.cmp(&highlight.range.end(), &snapshot) .cmp(&highlight.range.end, &snapshot)
.is_gt() .is_gt()
{ {
row_highlights[ix].range = row_highlights[ix].range.end = next_highlight.range.end;
*highlight.range.start()..=*next_highlight.range.end();
} }
row_highlights.remove(ix + 1); row_highlights.remove(ix + 1);
} else { } else {
@ -11597,15 +11593,12 @@ impl Editor {
let mut ranges_to_remove = ranges_to_remove.iter().peekable(); let mut ranges_to_remove = ranges_to_remove.iter().peekable();
row_highlights.retain(|highlight| { row_highlights.retain(|highlight| {
while let Some(range_to_remove) = ranges_to_remove.peek() { while let Some(range_to_remove) = ranges_to_remove.peek() {
match range_to_remove.end.cmp(&highlight.range.start(), &snapshot) { match range_to_remove.end.cmp(&highlight.range.start, &snapshot) {
Ordering::Less => { Ordering::Less | Ordering::Equal => {
ranges_to_remove.next(); ranges_to_remove.next();
} }
Ordering::Equal => {
return false;
}
Ordering::Greater => { Ordering::Greater => {
match range_to_remove.start.cmp(&highlight.range.end(), &snapshot) { match range_to_remove.start.cmp(&highlight.range.end, &snapshot) {
Ordering::Less | Ordering::Equal => { Ordering::Less | Ordering::Equal => {
return false; return false;
} }
@ -11625,9 +11618,7 @@ impl Editor {
} }
/// For a highlight given context type, gets all anchor ranges that will be used for row highlighting. /// For a highlight given context type, gets all anchor ranges that will be used for row highlighting.
pub fn highlighted_rows<T: 'static>( pub fn highlighted_rows<T: 'static>(&self) -> impl '_ + Iterator<Item = (Range<Anchor>, Hsla)> {
&self,
) -> impl '_ + Iterator<Item = (RangeInclusive<Anchor>, Hsla)> {
self.highlighted_rows self.highlighted_rows
.get(&TypeId::of::<T>()) .get(&TypeId::of::<T>())
.map_or(&[] as &[_], |vec| vec.as_slice()) .map_or(&[] as &[_], |vec| vec.as_slice())
@ -11650,9 +11641,17 @@ impl Editor {
.fold( .fold(
BTreeMap::<DisplayRow, Hsla>::new(), BTreeMap::<DisplayRow, Hsla>::new(),
|mut unique_rows, highlight| { |mut unique_rows, highlight| {
let start_row = highlight.range.start().to_display_point(&snapshot).row(); let start = highlight.range.start.to_display_point(&snapshot);
let end_row = highlight.range.end().to_display_point(&snapshot).row(); let end = highlight.range.end.to_display_point(&snapshot);
for row in start_row.0..=end_row.0 { let start_row = start.row().0;
let end_row = if highlight.range.end.text_anchor != text::Anchor::MAX
&& end.column() == 0
{
end.row().0.saturating_sub(1)
} else {
end.row().0
};
for row in start_row..=end_row {
let used_index = let used_index =
used_highlight_orders.entry(row).or_insert(highlight.index); used_highlight_orders.entry(row).or_insert(highlight.index);
if highlight.index >= *used_index { if highlight.index >= *used_index {
@ -11674,7 +11673,7 @@ impl Editor {
.flat_map(|highlighted_rows| highlighted_rows.iter()) .flat_map(|highlighted_rows| highlighted_rows.iter())
.filter_map(|highlight| { .filter_map(|highlight| {
if highlight.should_autoscroll { if highlight.should_autoscroll {
Some(highlight.range.start().to_display_point(snapshot).row()) Some(highlight.range.start.to_display_point(snapshot).row())
} else { } else {
None None
} }

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

@ -11832,7 +11832,6 @@ async fn test_edits_around_expanded_insertion_hunks(
); );
cx.update_editor(|editor, cx| { cx.update_editor(|editor, cx| {
editor.move_up(&MoveUp, cx);
editor.delete_line(&DeleteLine, cx); editor.delete_line(&DeleteLine, cx);
}); });
executor.run_until_parked(); executor.run_until_parked();
@ -11846,7 +11845,7 @@ async fn test_edits_around_expanded_insertion_hunks(
+ const B: u32 = 42; + const B: u32 = 42;
+ const C: u32 = 42; + const C: u32 = 42;
+ const D: u32 = 42; + const D: u32 = 42;
+ + const E: u32 = 42;
fn main() { fn main() {
println!("hello"); println!("hello");
@ -11872,8 +11871,8 @@ async fn test_edits_around_expanded_insertion_hunks(
use some::mod2; use some::mod2;
const A: u32 = 42; const A: u32 = 42;
const B: u32 = 42;
ˇ ˇ
fn main() { fn main() {
println!("hello"); println!("hello");
@ -11889,8 +11888,8 @@ async fn test_edits_around_expanded_insertion_hunks(
use some::mod2; use some::mod2;
const A: u32 = 42; const A: u32 = 42;
+ const B: u32 = 42;
+
fn main() { fn main() {
println!("hello"); println!("hello");
@ -11907,7 +11906,9 @@ async fn test_edits_around_expanded_insertion_hunks(
executor.run_until_parked(); executor.run_until_parked();
cx.assert_diff_hunks( cx.assert_diff_hunks(
r#" r#"
use some::mod1;
- use some::mod2;
-
- const A: u32 = 42; - const A: u32 = 42;
fn main() { fn main() {

29
crates/editor/src/hunk_diff.rs
View file

@ -6,10 +6,7 @@ use multi_buffer::{
Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferDiffHunk, MultiBufferRow, Anchor, AnchorRangeExt, ExcerptRange, MultiBuffer, MultiBufferDiffHunk, MultiBufferRow,
MultiBufferSnapshot, ToPoint, MultiBufferSnapshot, ToPoint,
}; };
use std::{ use std::{ops::Range, sync::Arc};
ops::{Range, RangeInclusive},
sync::Arc,
};
use ui::{ use ui::{
prelude::*, ActiveTheme, ContextMenu, IconButtonShape, InteractiveElement, IntoElement, prelude::*, ActiveTheme, ContextMenu, IconButtonShape, InteractiveElement, IntoElement,
ParentElement, PopoverMenu, Styled, Tooltip, ViewContext, VisualContext, ParentElement, PopoverMenu, Styled, Tooltip, ViewContext, VisualContext,
@ -19,7 +16,7 @@ use util::RangeExt;
use crate::{ use crate::{
editor_settings::CurrentLineHighlight, hunk_status, hunks_for_selections, BlockDisposition, editor_settings::CurrentLineHighlight, hunk_status, hunks_for_selections, BlockDisposition,
BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, DisplayRow, DisplaySnapshot, BlockProperties, BlockStyle, CustomBlockId, DiffRowHighlight, DisplayRow, DisplaySnapshot,
Editor, EditorElement, EditorSnapshot, ExpandAllHunkDiffs, GoToHunk, GoToPrevHunk, RevertFile, Editor, EditorElement, ExpandAllHunkDiffs, GoToHunk, GoToPrevHunk, RevertFile,
RevertSelectedHunks, ToDisplayPoint, ToggleHunkDiff, RevertSelectedHunks, ToDisplayPoint, ToggleHunkDiff,
}; };
@ -298,7 +295,7 @@ impl Editor {
} }
DiffHunkStatus::Added => { DiffHunkStatus::Added => {
self.highlight_rows::<DiffRowHighlight>( self.highlight_rows::<DiffRowHighlight>(
to_inclusive_row_range(hunk_start..hunk_end, &snapshot), hunk_start..hunk_end,
added_hunk_color(cx), added_hunk_color(cx),
false, false,
cx, cx,
@ -307,7 +304,7 @@ impl Editor {
} }
DiffHunkStatus::Modified => { DiffHunkStatus::Modified => {
self.highlight_rows::<DiffRowHighlight>( self.highlight_rows::<DiffRowHighlight>(
to_inclusive_row_range(hunk_start..hunk_end, &snapshot), hunk_start..hunk_end,
added_hunk_color(cx), added_hunk_color(cx),
false, false,
cx, cx,
@ -960,7 +957,7 @@ fn editor_with_deleted_text(
editor.set_read_only(true); editor.set_read_only(true);
editor.set_show_inline_completions(Some(false), cx); editor.set_show_inline_completions(Some(false), cx);
editor.highlight_rows::<DiffRowHighlight>( editor.highlight_rows::<DiffRowHighlight>(
Anchor::min()..=Anchor::max(), Anchor::min()..Anchor::max(),
deleted_color, deleted_color,
false, false,
cx, cx,
@ -1039,22 +1036,6 @@ fn buffer_diff_hunk(
None None
} }
fn to_inclusive_row_range(
row_range: Range<Anchor>,
snapshot: &EditorSnapshot,
) -> RangeInclusive<Anchor> {
let mut end = row_range.end.to_point(&snapshot.buffer_snapshot);
if end.column == 0 && end.row > 0 {
end = Point::new(
end.row - 1,
snapshot
.buffer_snapshot
.line_len(MultiBufferRow(end.row - 1)),
);
}
row_range.start..=snapshot.buffer_snapshot.anchor_after(end)
}
impl DisplayDiffHunk { impl DisplayDiffHunk {
pub fn start_display_row(&self) -> DisplayRow { pub fn start_display_row(&self) -> DisplayRow {
match self { match self {

32
crates/editor/src/test/editor_test_context.rs
View file

@ -9,7 +9,6 @@ use gpui::{
AnyWindowHandle, AppContext, Keystroke, ModelContext, Pixels, Point, View, ViewContext, AnyWindowHandle, AppContext, Keystroke, ModelContext, Pixels, Point, View, ViewContext,
VisualTestContext, WindowHandle, VisualTestContext, WindowHandle,
}; };
use indoc::indoc;
use itertools::Itertools; use itertools::Itertools;
use language::{Buffer, BufferSnapshot, LanguageRegistry}; use language::{Buffer, BufferSnapshot, LanguageRegistry};
use multi_buffer::{ExcerptRange, ToPoint}; use multi_buffer::{ExcerptRange, ToPoint};
@ -337,8 +336,9 @@ impl EditorTestContext {
let insertions = editor let insertions = editor
.highlighted_rows::<DiffRowHighlight>() .highlighted_rows::<DiffRowHighlight>()
.map(|(range, _)| { .map(|(range, _)| {
range.start().to_point(&snapshot.buffer_snapshot).row let start = range.start.to_point(&snapshot.buffer_snapshot);
..range.end().to_point(&snapshot.buffer_snapshot).row + 1 let end = range.end.to_point(&snapshot.buffer_snapshot);
start.row..end.row
}) })
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let deletions = editor let deletions = editor
@ -384,13 +384,8 @@ impl EditorTestContext {
/// See the `util::test::marked_text_ranges` function for more information. /// See the `util::test::marked_text_ranges` function for more information.
#[track_caller] #[track_caller]
pub fn assert_editor_state(&mut self, marked_text: &str) { pub fn assert_editor_state(&mut self, marked_text: &str) {
let (unmarked_text, expected_selections) = marked_text_ranges(marked_text, true); let (expected_text, expected_selections) = marked_text_ranges(marked_text, true);
let buffer_text = self.buffer_text(); pretty_assertions::assert_eq!(self.buffer_text(), expected_text, "unexpected buffer text");
if buffer_text != unmarked_text {
panic!("Unmarked text doesn't match buffer text\nBuffer text: {buffer_text:?}\nUnmarked text: {unmarked_text:?}\nRaw buffer text\n{buffer_text}\nRaw unmarked text\n{unmarked_text}");
}
self.assert_selections(expected_selections, marked_text.to_string()) self.assert_selections(expected_selections, marked_text.to_string())
} }
@ -463,20 +458,11 @@ impl EditorTestContext {
let actual_marked_text = let actual_marked_text =
generate_marked_text(&self.buffer_text(), &actual_selections, true); generate_marked_text(&self.buffer_text(), &actual_selections, true);
if expected_selections != actual_selections { if expected_selections != actual_selections {
panic!( pretty_assertions::assert_eq!(
indoc! {"
{}Editor has unexpected selections.
Expected selections:
{}
Actual selections:
{}
"},
self.assertion_context(),
expected_marked_text,
actual_marked_text, actual_marked_text,
expected_marked_text,
"{}Editor has unexpected selections",
self.assertion_context(),
); );
} }
} }

22
crates/go_to_line/src/go_to_line.rs
View file

@ -116,11 +116,13 @@ impl GoToLine {
if let Some(point) = self.point_from_query(cx) { if let Some(point) = self.point_from_query(cx) {
self.active_editor.update(cx, |active_editor, cx| { self.active_editor.update(cx, |active_editor, cx| {
let snapshot = active_editor.snapshot(cx).display_snapshot; let snapshot = active_editor.snapshot(cx).display_snapshot;
let point = snapshot.buffer_snapshot.clip_point(point, Bias::Left); let start = snapshot.buffer_snapshot.clip_point(point, Bias::Left);
let anchor = snapshot.buffer_snapshot.anchor_before(point); let end = start + Point::new(1, 0);
let start = snapshot.buffer_snapshot.anchor_before(start);
let end = snapshot.buffer_snapshot.anchor_after(end);
active_editor.clear_row_highlights::<GoToLineRowHighlights>(); active_editor.clear_row_highlights::<GoToLineRowHighlights>();
active_editor.highlight_rows::<GoToLineRowHighlights>( active_editor.highlight_rows::<GoToLineRowHighlights>(
anchor..=anchor, start..end,
cx.theme().colors().editor_highlighted_line_background, cx.theme().colors().editor_highlighted_line_background,
true, true,
cx, cx,
@ -244,13 +246,13 @@ mod tests {
field_1: i32, // display line 3 field_1: i32, // display line 3
field_2: i32, // display line 4 field_2: i32, // display line 4
} // display line 5 } // display line 5
// display line 7 // display line 6
struct Another { // display line 8 struct Another { // display line 7
field_1: i32, // display line 9 field_1: i32, // display line 8
field_2: i32, // display line 10 field_2: i32, // display line 9
field_3: i32, // display line 11 field_3: i32, // display line 10
field_4: i32, // display line 12 field_4: i32, // display line 11
} // display line 13 } // display line 12
"} "}
}), }),
) )

4
crates/outline/src/outline.rs
View file

@ -143,7 +143,7 @@ impl OutlineViewDelegate {
self.active_editor.update(cx, |active_editor, cx| { self.active_editor.update(cx, |active_editor, cx| {
active_editor.clear_row_highlights::<OutlineRowHighlights>(); active_editor.clear_row_highlights::<OutlineRowHighlights>();
active_editor.highlight_rows::<OutlineRowHighlights>( active_editor.highlight_rows::<OutlineRowHighlights>(
outline_item.range.start..=outline_item.range.end, outline_item.range.start..outline_item.range.end,
cx.theme().colors().editor_highlighted_line_background, cx.theme().colors().editor_highlighted_line_background,
true, true,
cx, cx,
@ -245,7 +245,7 @@ impl PickerDelegate for OutlineViewDelegate {
.next(); .next();
if let Some((rows, _)) = highlight { if let Some((rows, _)) = highlight {
active_editor.change_selections(Some(Autoscroll::center()), cx, |s| { active_editor.change_selections(Some(Autoscroll::center()), cx, |s| {
s.select_ranges([*rows.start()..*rows.start()]) s.select_ranges([rows.start..rows.start])
}); });
active_editor.clear_row_highlights::<OutlineRowHighlights>(); active_editor.clear_row_highlights::<OutlineRowHighlights>();
active_editor.focus(cx); active_editor.focus(cx);