h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-30 11:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

shift-delete to stop trying to delete completion-based autosuggestions from history

Browse Source 
shift-delete attempts to delete the autosuggestion from history even
if the autosuggestion is not from history.

This is weird. We probably shouldn't do this. Let's flash the
commandline instead to try to reduce confusion.
This commit is contained in:
Johannes Altmanninger
2025-01-10 09:02:54 +01:00
parent 29c45100fa
commit f448ddd579
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/reader.rs
View File

@@ -2974,7 +2974,13 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
rl::HistoryPagerDelete => {
// Also applies to ordinary history search.
let is_history_search = !self.history_search.is_at_end();
if is_history_search || self.is_at_line_with_autosuggestion() {
let is_autosuggestion = self.is_at_line_with_autosuggestion();
if is_history_search || is_autosuggestion {
self.input_data.function_set_status(true);
if is_autosuggestion && !self.autosuggestion.is_from_history {
self.flash();
return;
}
self.history.remove(if is_history_search {
self.history_search.current_result()
} else {
@@ -2987,7 +2993,6 @@ fn handle_readline_command(&mut self, c: ReadlineCmd) {
} else {
self.autosuggestion.clear();
}
self.input_data.function_set_status(true);
return;
}
if self.history_pager.is_none() {
@@ -4525,6 +4530,9 @@ struct Autosuggestion {
// Whether the autosuggestion should be case insensitive.
// This is true for file-generated autosuggestions, but not for history.
icase: bool,
// Whether the autosuggestion is a whole match from history.
is_from_history: bool,
}
impl Autosuggestion {
@@ -4565,12 +4573,14 @@ fn new(
search_string_range: Range<usize>,
text: WString,
icase: bool,
is_from_history: bool,
) -> Self {
Self {
autosuggestion: Autosuggestion {
text,
search_string_range,
icase,
is_from_history,
},
command_line,
needs_load: vec![],
@@ -4633,6 +4643,7 @@ fn get_autosuggestion_performer(
search_string_range,
searcher.current_string().to_owned(),
/*icase=*/ false,
/*is_history=*/ true,
);
}
}
@@ -4682,6 +4693,7 @@ fn get_autosuggestion_performer(
search_string_range.clone(),
suggestion,
true, // normal completions are case-insensitive
/*is_from_history=*/ false,
);
result.needs_load = needs_load;
result