Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-13 13:39:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Allow autosuggestion after completion

Browse source 
It seems kinda silly to not directly do it, but it was explicitly
stopped in the code.

I'm quite good at deleting that, aren't I?

Fixes #3016.
This commit is contained in:
Fabian Homborg 2016-05-25 21:23:50 +02:00 committed by Kurtis Rader
parent 7af9e1f5c5
commit 2885c085d8
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/reader.cpp
View file

@ -1127,9 +1127,6 @@ static void completion_insert(const wchar_t *val, complete_flags_t flags) {
wcstring new_command_line = completion_apply_to_command_line(val, flags, el->text, &cursor,
false /* not append only */);
reader_set_buffer_maintaining_pager(new_command_line, cursor);
// Since we just inserted a completion, don't immediately do a new autosuggestion.
data->suppress_autosuggestion = true;
}
struct autosuggestion_context_t {
@ -2775,15 +2772,15 @@ const wchar_t *reader_readline(int nchars) {
// Evaluate. If the current command is unfinished, or if the charater is escaped using a
// backslash, insert a newline.
case R_EXECUTE: {
// Delete any autosuggestion.
data->autosuggestion.clear();
// If the user hits return while navigating the pager, it only clears the pager.
if (data->is_navigating_pager_contents()) {
clear_pager();
break;
}
// Delete any autosuggestion.
data->autosuggestion.clear();
// The user may have hit return with pager contents, but while not navigating them.
// Clear the pager in that event.
clear_pager();