github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-07 23:00:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix failing history pager search replacing all lines

Browse Source 
History pager search operates only on the current line, so a failing
search should only replace the current line with the search string.
This commit is contained in:
Johannes Altmanninger 2024-12-25 07:18:53 +01:00
parent a719f9d537
commit 459fc3c887
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/reader.rs
View File

@ -3589,12 +3589,17 @@ impl<'a> Reader<'a> {
// If the user hits return while navigating the pager, it only clears the pager.
if self.is_navigating_pager_contents() {
if self.history_pager.is_some() && self.pager.selected_completion_idx.is_none() {
let range = 0..self.data.command_line.len();
let failed_search_string = self.data.pager.search_field_line.text().to_owned();
self.replace_substring(EditableLineTag::Commandline, range, failed_search_string);
self.data
.command_line
.set_position(self.data.pager.search_field_line.position());
let range = 0..self.command_line.len();
let search_field = &self.data.pager.search_field_line;
let offset_from_end = search_field.len() - search_field.position();
let mut cursor = self.command_line.position();
let updated = replace_line_at_cursor(
self.command_line.text(),
&mut cursor,
search_field.text(),
);
self.replace_substring(EditableLineTag::Commandline, range, updated);
self.command_line.set_position(cursor - offset_from_end);
}
self.clear_pager();
return true;