h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-06 08:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Suppress history autosuggestion for command lines prefixed with a space

Browse Source 
Currently we do not add such command lines to the history, so there
won't be a suggestion from history anyway.

Fixes #6763 which occurs because midnight commander feeds fish commands
like this one (note the leading space)

` cd (printf '%b' '\0057home\0057johannes\0057git\0057fish\0055shell\0057build')`

(cherry picked from commit 390647ae34)
This commit is contained in:
Johannes Altmanninger
2020-03-19 18:53:28 +01:00
parent 8c9b4d9000
commit 31d6ccfd59
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/reader.cpp
View File

@@ -1272,6 +1272,10 @@ void reader_data_t::completion_insert(const wchar_t *val, size_t token_end,
set_buffer_maintaining_pager(new_command_line, cursor); set_buffer_maintaining_pager(new_command_line, cursor);
} }
static bool may_add_to_history(const wcstring &commandline_prefix) {
return !commandline_prefix.empty() && commandline_prefix.at(0) != L' ';
}
// Returns a function that can be invoked (potentially // Returns a function that can be invoked (potentially
// on a background thread) to determine the autosuggestion // on a background thread) to determine the autosuggestion
static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer( static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer(
@@ -1295,17 +1299,19 @@ static std::function<autosuggestion_result_t(void)> get_autosuggestion_performer
return nothing; return nothing;
} }
history_search_t searcher(*history, search_string, history_search_type_t::prefix, if (may_add_to_history(search_string)) {
history_search_flags_t{}); history_search_t searcher(*history, search_string, history_search_type_t::prefix,
while (!ctx.check_cancel() && searcher.go_backwards()) { history_search_flags_t{});
const history_item_t &item = searcher.current_item(); while (!ctx.check_cancel() && searcher.go_backwards()) {
const history_item_t &item = searcher.current_item();
// Skip items with newlines because they make terrible autosuggestions. // Skip items with newlines because they make terrible autosuggestions.
if (item.str().find(L'\n') != wcstring::npos) continue; if (item.str().find(L'\n') != wcstring::npos) continue;
if (autosuggest_validate_from_history(item, working_directory, ctx)) { if (autosuggest_validate_from_history(item, working_directory, ctx)) {
// The command autosuggestion was handled specially, so we're done. // The command autosuggestion was handled specially, so we're done.
return {searcher.current_string(), search_string}; return {searcher.current_string(), search_string};
}
} }
} }
@@ -2754,7 +2760,7 @@ void reader_data_t::handle_readline_command(readline_cmd_t c, readline_loop_stat
// Finished command, execute it. Don't add items that start with a leading // Finished command, execute it. Don't add items that start with a leading
// space. // space.
const editable_line_t *el = &command_line; const editable_line_t *el = &command_line;
if (history != nullptr && !el->empty() && el->text.at(0) != L' ') { if (history != nullptr && may_add_to_history(el->text)) {
history->add_pending_with_file_detection(el->text, vars.get_pwd_slash()); history->add_pending_with_file_detection(el->text, vars.get_pwd_slash());
} }
rls.finished = true; rls.finished = true;