Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-11-11 15:37:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use swap instead of copying in reader_repaint_without_autosuggestion

Browse source
This commit is contained in:
ridiculousfish 2013-02-20 18:18:08 -08:00
parent f1d923714a
commit 7b873179ad
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
reader.cpp
View file

@ -545,16 +545,14 @@ static void reader_repaint()
static void reader_repaint_without_autosuggestion()
{
const wcstring saved_autosuggestion = data->autosuggestion;
data->autosuggestion.clear();
// Swap in an empty autosuggestion, repaint, then swap it out
wcstring saved_autosuggestion;
data->autosuggestion.swap(saved_autosuggestion);
reader_repaint();
data->autosuggestion = saved_autosuggestion;
data->autosuggestion.swap(saved_autosuggestion);
}
/**
Internal helper function for handling killing parts of text.
*/
/** Internal helper function for handling killing parts of text. */
static void reader_kill(size_t begin_idx, size_t length, int mode, int newv)
{
const wchar_t *begin = data->command_line.c_str() + begin_idx;
@ -1753,7 +1751,8 @@ static bool handle_completions(const std::vector<completion_t> &comp)
is_quoted = (quote != L'\0');
/* Clear the autosuggestion from the old commandline before abandoning it (see #561) */
reader_repaint_without_autosuggestion();
if (! data->autosuggestion.empty())
reader_repaint_without_autosuggestion();
write_loop(1, "\n", 1);