PolytreeDE/alacritty
1
0
Fork 0
mirror of https://github.com/alacritty/alacritty.git synced 2024-11-11 13:51:01 -05:00
Code Releases Activity

Fix movement within search matches

Browse source 
Previously the SearchEndNext and SearchEndPrevious match acted exactly
like the SearchNext and SearchPrevious action, however this is not how
vim works. In vim, regardless of direction the `gN` action always jumps
to the next match start to the left of the cursor, while the `gn` action
always jumps to the next search end to the right of the cursor.

While both approaches might seem reasonable at first, vim's approach has
a significant advantage w.r.t. predictability and automation of the
movement. By always knowing which direction the motion goes to, this
allows for mappings that reliably navigate inside the current match
regardless of the global search direction. So deleting until the end of
the match would always be `dgn` for example, regardless in which
direction the user has jumped to it.

Fixes #3953.
This commit is contained in:
Christian Duerr 2020-07-14 15:17:29 +00:00 committed by GitHub
parent 76a4c373da
commit 183622e943
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
alacritty.yml
View file

@ -534,8 +534,8 @@
# - ToggleSemanticSelection # - ToggleSemanticSelection
# - SearchNext # - SearchNext
# - SearchPrevious # - SearchPrevious
# - SearchEndNext # - SearchStart
# - SearchEndPrevious # - SearchEnd
# #
# (macOS only): # (macOS only):
# - ToggleSimpleFullscreen: Enters fullscreen without occupying another space # - ToggleSimpleFullscreen: Enters fullscreen without occupying another space

8
alacritty/src/config/bindings.rs
View file

@ -218,10 +218,10 @@ pub enum ViAction {
SearchNext, SearchNext,
/// Jump to the beginning of the previous match. /// Jump to the beginning of the previous match.
SearchPrevious, SearchPrevious,
/// Jump to the end of the next match. /// Jump to the next start of a match to the left of the origin.
SearchEndNext, SearchStart,
/// Jump to the end of the previous match. /// Jump to the next end of a match to the right of the origin.
SearchEndPrevious, SearchEnd,
/// Launch the URL below the vi mode cursor. /// Launch the URL below the vi mode cursor.
Open, Open,
} }

20
alacritty/src/input.rs
View file

@ -208,20 +208,18 @@ impl<T: EventListener> Execute<T> for Action {
ctx.terminal_mut().vi_goto_point(*regex_match.start()); ctx.terminal_mut().vi_goto_point(*regex_match.start());
} }
}, },
Action::ViAction(ViAction::SearchEndNext) => { Action::ViAction(ViAction::SearchStart) => {
let origin = ctx.terminal().visible_to_buffer(ctx.terminal().vi_mode_cursor.point); let terminal = ctx.terminal();
let direction = ctx.search_direction(); let origin = terminal.visible_to_buffer(ctx.terminal().vi_mode_cursor.point);
let regex_match = terminal.search_next(origin, Direction::Left, Side::Left, None);
let regex_match = ctx.terminal().search_next(origin, direction, Side::Right, None);
if let Some(regex_match) = regex_match { if let Some(regex_match) = regex_match {
ctx.terminal_mut().vi_goto_point(*regex_match.end()); ctx.terminal_mut().vi_goto_point(*regex_match.start());
} }
}, },
Action::ViAction(ViAction::SearchEndPrevious) => { Action::ViAction(ViAction::SearchEnd) => {
let origin = ctx.terminal().visible_to_buffer(ctx.terminal().vi_mode_cursor.point); let terminal = ctx.terminal();
let direction = ctx.search_direction().opposite(); let origin = terminal.visible_to_buffer(ctx.terminal().vi_mode_cursor.point);
let regex_match = terminal.search_next(origin, Direction::Right, Side::Right, None);
let regex_match = ctx.terminal().search_next(origin, direction, Side::Right, None);
if let Some(regex_match) = regex_match { if let Some(regex_match) = regex_match {
ctx.terminal_mut().vi_goto_point(*regex_match.end()); ctx.terminal_mut().vi_goto_point(*regex_match.end());
} }