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

Fix text offset in the expanded deleted hunk (#11295)

Browse source
This commit is contained in:
Kirill Bulatov 2024-05-02 13:38:42 +03:00 • committed by GitHub
parent 23f191450e
commit aeff468e9c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -467,7 +467,7 @@ pub struct Editor {
next_inlay_id: usize, next_inlay_id: usize,
_subscriptions: Vec<Subscription>, _subscriptions: Vec<Subscription>,
pixel_position_of_newest_cursor: Option<gpui::Point<Pixels>>, pixel_position_of_newest_cursor: Option<gpui::Point<Pixels>>,
gutter_width: Pixels, gutter_dimensions: GutterDimensions,
pub vim_replace_map: HashMap<Range<usize>, String>, pub vim_replace_map: HashMap<Range<usize>, String>,
style: Option<EditorStyle>, style: Option<EditorStyle>,
editor_actions: Vec<Box<dyn Fn(&mut ViewContext<Self>)>>, editor_actions: Vec<Box<dyn Fn(&mut ViewContext<Self>)>>,
@ -503,6 +503,7 @@ pub struct EditorSnapshot {
const GIT_BLAME_GUTTER_WIDTH_CHARS: f32 = 53.; const GIT_BLAME_GUTTER_WIDTH_CHARS: f32 = 53.;
#[derive(Debug, Clone, Copy)]
pub struct GutterDimensions { pub struct GutterDimensions {
pub left_padding: Pixels, pub left_padding: Pixels,
pub right_padding: Pixels, pub right_padding: Pixels,
@ -1517,7 +1518,7 @@ impl Editor {
pixel_position_of_newest_cursor: None, pixel_position_of_newest_cursor: None,
last_bounds: None, last_bounds: None,
expect_bounds_change: None, expect_bounds_change: None,
gutter_width: Default::default(), gutter_dimensions: GutterDimensions::default(),
style: None, style: None,
show_cursor_names: false, show_cursor_names: false,
hovered_cursors: Default::default(), hovered_cursors: Default::default(),
@ -10807,7 +10808,7 @@ impl ViewInputHandler for Editor {
let start = OffsetUtf16(range_utf16.start).to_display_point(&snapshot); let start = OffsetUtf16(range_utf16.start).to_display_point(&snapshot);
let x = snapshot.x_for_display_point(start, &text_layout_details) - scroll_left let x = snapshot.x_for_display_point(start, &text_layout_details) - scroll_left
+ self.gutter_width; + self.gutter_dimensions.width;
let y = line_height * (start.row() as f32 - scroll_position.y); let y = line_height * (start.row() as f32 - scroll_position.y);
Some(Bounds { Some(Bounds {

4
crates/editor/src/element.rs
View file

@ -3644,7 +3644,7 @@ impl Element for EditorElement {
snapshot = self.editor.update(cx, |editor, cx| { snapshot = self.editor.update(cx, |editor, cx| {
editor.last_bounds = Some(bounds); editor.last_bounds = Some(bounds);
editor.gutter_width = gutter_dimensions.width; editor.gutter_dimensions = gutter_dimensions;
editor.set_visible_line_count(bounds.size.height / line_height, cx); editor.set_visible_line_count(bounds.size.height / line_height, cx);
let editor_width = let editor_width =
@ -5157,7 +5157,7 @@ fn compute_auto_height_layout(
let gutter_dimensions = let gutter_dimensions =
snapshot.gutter_dimensions(font_id, font_size, em_width, max_line_number_width, cx); snapshot.gutter_dimensions(font_id, font_size, em_width, max_line_number_width, cx);
editor.gutter_width = gutter_dimensions.width; editor.gutter_dimensions = gutter_dimensions;
let text_width = width - gutter_dimensions.width; let text_width = width - gutter_dimensions.width;
let overscroll = size(em_width, px(0.)); let overscroll = size(em_width, px(0.));

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

@ -332,7 +332,7 @@ impl Editor {
let deleted_hunk_color = deleted_hunk_color(cx); let deleted_hunk_color = deleted_hunk_color(cx);
let (editor_height, editor_with_deleted_text) = let (editor_height, editor_with_deleted_text) =
editor_with_deleted_text(diff_base_buffer, deleted_text_range, deleted_hunk_color, cx); editor_with_deleted_text(diff_base_buffer, deleted_text_range, deleted_hunk_color, cx);
let parent_gutter_width = self.gutter_width; let parent_gutter_offset = self.gutter_dimensions.width + self.gutter_dimensions.margin;
let mut new_block_ids = self.insert_blocks( let mut new_block_ids = self.insert_blocks(
Some(BlockProperties { Some(BlockProperties {
position, position,
@ -342,7 +342,7 @@ impl Editor {
div() div()
.bg(deleted_hunk_color) .bg(deleted_hunk_color)
.size_full() .size_full()
.pl(parent_gutter_width) .pl(parent_gutter_offset)
.child(editor_with_deleted_text.clone()) .child(editor_with_deleted_text.clone())
.into_any_element() .into_any_element()
}), }),