Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-27 05:13:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clear the autosuggestion from the old commandline when showing the completion list. Fixes #561

Browse source
This commit is contained in:
Yannis Chatzimichos 2013-02-18 08:20:31 +02:00 committed by ridiculousfish
parent b9ba227733
commit f1d923714a
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reader.cpp
View file

@ -543,6 +543,15 @@ static void reader_repaint()
data->repaint_needed = false; data->repaint_needed = false;
} }
static void reader_repaint_without_autosuggestion()
{
const wcstring saved_autosuggestion = data->autosuggestion;
data->autosuggestion.clear();
reader_repaint();
data->autosuggestion = saved_autosuggestion;
}
/** /**
Internal helper function for handling killing parts of text. Internal helper function for handling killing parts of text.
*/ */
@ -1743,6 +1752,9 @@ static bool handle_completions(const std::vector<completion_t> &comp)
parse_util_get_parameter_info(data->command_line, data->buff_pos, &quote, NULL, NULL); parse_util_get_parameter_info(data->command_line, data->buff_pos, &quote, NULL, NULL);
is_quoted = (quote != L'\0'); is_quoted = (quote != L'\0');
/* Clear the autosuggestion from the old commandline before abandoning it (see #561) */
reader_repaint_without_autosuggestion();
write_loop(1, "\n", 1); write_loop(1, "\n", 1);
run_pager(prefix, is_quoted, comp); run_pager(prefix, is_quoted, comp);