PolytreeDE
/
alacritty
mirror of https://github.com/alacritty/alacritty.git
1
0
Fork 0
Code Releases Activity

Fix viless search origin 

When searching without vi mode the display is no longer reset when the
user hasn't jumped between matches at all. Since there's no reason to
confirm the search, we shouldn't just reset the viewport without a good
reason.

The search is now also restarted completely when the entire search regex
is deleted. While this doesn't reset to the original viewport position
if the user has jumped between matches, it should make things feel a
little less arbitrary.

Fixes #4020.
This commit is contained in:
Christian Duerr 2020-07-25 14:05:11 +00:00 committed by GitHub
parent 555a85ed95
commit 9a4d847d89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
alacritty/src/event.rs
View File

@ -396,8 +396,10 @@ impl<'a, N: Notify + 'a, T: EventListener> input::ActionContext<T> for ActionCon
fn cancel_search(&mut self) {
self.terminal.cancel_search();
// Recover pre-search state.
self.search_reset_state();
// Recover pre-search state in vi mode.
if self.terminal.mode().contains(TermMode::VI) {
self.search_reset_state();
}
// Move vi cursor down if resize will pull from history.
if self.terminal.history_size() != 0 && self.terminal.grid().display_offset() == 0 {
@ -513,6 +515,11 @@ impl<'a, N: Notify + 'a, T: EventListener> ActionContext<'a, N, T> {
// Stop search if there's nothing to search for.
self.search_reset_state();
self.terminal.cancel_search();
// Restart search without vi mode to clear the search origin.
if !self.terminal.mode().contains(TermMode::VI) {
self.start_search(self.search_state.direction);
}
} else {
// Create terminal search from the new regex string.
self.terminal.start_search(&regex);