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

Stop centering when selecting larger syntax nodes (#28172)

Browse source 
With #27295, the cursor would center upon running
`SelectLargerSyntaxNode`. This was done to provide more context when
making large selections, but when making small selections (such as a
single parameter in an argument list) it was confusing that the scroll
position jumped.

This change makes that behavior slightly more conservative: now when the
selection is small enough to fit on the screen scrolling will only occur
to keep the cursor position on the screen (including respecting
`vertical_scroll_margin`).

Release Notes:

- N/A

Co-authored-by: João Marcos <marcospb19@hotmail.com>
This commit is contained in:
Julia Ryan 2025-04-07 06:06:15 -07:00 • committed by GitHub
parent 956f359045
commit 656302ee4c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1101,7 +1101,7 @@ impl SelectSyntaxNodeHistory {
enum SelectSyntaxNodeScrollBehavior { enum SelectSyntaxNodeScrollBehavior {
CursorTop, CursorTop,
CenterSelection, FitSelection,
CursorBottom, CursorBottom,
} }
@ -12352,17 +12352,15 @@ impl Editor {
let selection_height = end_row - start_row + 1; let selection_height = end_row - start_row + 1;
let scroll_margin_rows = self.vertical_scroll_margin() as u32; let scroll_margin_rows = self.vertical_scroll_margin() as u32;
// if fits on screen (considering margin), keep it in the middle, else, scroll to selection head let fits_on_the_screen = visible_row_count >= selection_height + scroll_margin_rows * 2;
let scroll_behavior = if visible_row_count >= selection_height + scroll_margin_rows * 2 { let scroll_behavior = if fits_on_the_screen {
let middle_row = (end_row + start_row) / 2; self.request_autoscroll(Autoscroll::fit(), cx);
let selection_center = middle_row.saturating_sub(visible_row_count / 2); SelectSyntaxNodeScrollBehavior::FitSelection
self.set_scroll_top_row(DisplayRow(selection_center), window, cx);
SelectSyntaxNodeScrollBehavior::CenterSelection
} else if is_selection_reversed { } else if is_selection_reversed {
self.scroll_cursor_top(&Default::default(), window, cx); self.scroll_cursor_top(&ScrollCursorTop, window, cx);
SelectSyntaxNodeScrollBehavior::CursorTop SelectSyntaxNodeScrollBehavior::CursorTop
} else { } else {
self.scroll_cursor_bottom(&Default::default(), window, cx); self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
SelectSyntaxNodeScrollBehavior::CursorBottom SelectSyntaxNodeScrollBehavior::CursorBottom
}; };
@ -12379,17 +12377,11 @@ impl Editor {
window: &mut Window, window: &mut Window,
cx: &mut Context<Self>, cx: &mut Context<Self>,
) { ) {
let Some(visible_row_count) = self.visible_row_count() else {
return;
};
self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction); self.hide_mouse_cursor(&HideMouseCursorOrigin::MovementAction);
if let Some((mut selections, scroll_behavior, is_selection_reversed)) = if let Some((mut selections, scroll_behavior, is_selection_reversed)) =
self.select_syntax_node_history.pop() self.select_syntax_node_history.pop()
{ {
let display_map = self.display_map.update(cx, |map, cx| map.snapshot(cx));
if let Some(selection) = selections.last_mut() { if let Some(selection) = selections.last_mut() {
selection.reversed = is_selection_reversed; selection.reversed = is_selection_reversed;
} }
@ -12400,22 +12392,15 @@ impl Editor {
}); });
self.select_syntax_node_history.disable_clearing = false; self.select_syntax_node_history.disable_clearing = false;
let newest = self.selections.newest::<usize>(cx);
let start_row = newest.start.to_display_point(&display_map).row().0;
let end_row = newest.end.to_display_point(&display_map).row().0;
match scroll_behavior { match scroll_behavior {
SelectSyntaxNodeScrollBehavior::CursorTop => { SelectSyntaxNodeScrollBehavior::CursorTop => {
self.scroll_cursor_top(&Default::default(), window, cx); self.scroll_cursor_top(&ScrollCursorTop, window, cx);
} }
SelectSyntaxNodeScrollBehavior::CenterSelection => { SelectSyntaxNodeScrollBehavior::FitSelection => {
let middle_row = (end_row + start_row) / 2; self.request_autoscroll(Autoscroll::fit(), cx);
let selection_center = middle_row.saturating_sub(visible_row_count / 2);
// centralize the selection, not the cursor
self.set_scroll_top_row(DisplayRow(selection_center), window, cx);
} }
SelectSyntaxNodeScrollBehavior::CursorBottom => { SelectSyntaxNodeScrollBehavior::CursorBottom => {
self.scroll_cursor_bottom(&Default::default(), window, cx); self.scroll_cursor_bottom(&ScrollCursorBottom, window, cx);
} }
} }
} }