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

Don't autosuggest in builtin_read

Browse source 
https://github.com/fish-shell/fish-shell/issues/29
This commit is contained in:
ridiculousfish 2012-11-18 02:43:35 -08:00
parent c9c2fc5ee3
commit dc8cc39bc8
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builtin.cpp
View file

@ -2327,6 +2327,8 @@ static int builtin_read( parser_t &parser, wchar_t **argv )
reader_set_highlight_function( &highlight_shell ); reader_set_highlight_function( &highlight_shell );
reader_set_test_function( &reader_shell_test ); reader_set_test_function( &reader_shell_test );
} }
/* No autosuggestions in builtin_read */
reader_set_allow_autosuggesting(false);
reader_set_buffer( commandline, wcslen( commandline ) ); reader_set_buffer( commandline, wcslen( commandline ) );
proc_push_interactive( 1 ); proc_push_interactive( 1 );

17
reader.cpp
View file

@ -201,7 +201,10 @@ class reader_data_t
/** String containing the autosuggestion */ /** String containing the autosuggestion */
wcstring autosuggestion; wcstring autosuggestion;
/** When backspacing, we suppress autosuggestions */ /** Whether autosuggesting is allowed at all */
bool allow_autosuggestion;
/** When backspacing, we temporarily suppress autosuggestions */
bool suppress_autosuggestion; bool suppress_autosuggestion;
/** The representation of the current screen contents */ /** The representation of the current screen contents */
@ -319,6 +322,7 @@ class reader_data_t
/** Constructor */ /** Constructor */
reader_data_t() : reader_data_t() :
allow_autosuggestion(0),
suppress_autosuggestion(0), suppress_autosuggestion(0),
history(0), history(0),
token_history_pos(0), token_history_pos(0),
@ -1237,7 +1241,7 @@ static void update_autosuggestion(void) {
} }
#else #else
data->autosuggestion.clear(); data->autosuggestion.clear();
if (! data->suppress_autosuggestion && ! data->command_line.empty() && data->history_search.is_at_end()) { if (data->allow_autosuggestion && ! data->suppress_autosuggestion && ! data->command_line.empty() && data->history_search.is_at_end()) {
autosuggestion_context_t *ctx = new autosuggestion_context_t(data->history, data->command_line, data->buff_pos); autosuggestion_context_t *ctx = new autosuggestion_context_t(data->history, data->command_line, data->buff_pos);
iothread_perform(threaded_autosuggest, autosuggest_completed, ctx); iothread_perform(threaded_autosuggest, autosuggest_completed, ctx);
} }
@ -2239,6 +2243,11 @@ void reader_set_right_prompt(const wcstring &new_prompt)
data->right_prompt = new_prompt; data->right_prompt = new_prompt;
} }
void reader_set_allow_autosuggesting(bool flag)
{
data->allow_autosuggestion = flag;
}
void reader_set_complete_function( complete_function_t f ) void reader_set_complete_function( complete_function_t f )
{ {
data->complete_func = f; data->complete_func = f;
@ -2446,7 +2455,6 @@ static void handle_end_loop()
} }
else else
{ {
/* PCA: we used to only hangup jobs if stdin was closed. This prevented child processes from exiting. It's unclear to my why it matters if stdin is closed, but it seems to me if we're forcing an exit, we definitely want to hang up our processes. /* PCA: we used to only hangup jobs if stdin was closed. This prevented child processes from exiting. It's unclear to my why it matters if stdin is closed, but it seems to me if we're forcing an exit, we definitely want to hang up our processes.
See https://github.com/fish-shell/fish-shell/issues/138 See https://github.com/fish-shell/fish-shell/issues/138
@ -2470,8 +2478,6 @@ static void handle_end_loop()
} }
} }
/** /**
Read interactively. Read input from stdin while providing editing Read interactively. Read input from stdin while providing editing
facilities. facilities.
@ -2482,6 +2488,7 @@ static int read_i()
reader_set_complete_function( &complete ); reader_set_complete_function( &complete );
reader_set_highlight_function( &highlight_shell ); reader_set_highlight_function( &highlight_shell );
reader_set_test_function( &reader_shell_test ); reader_set_test_function( &reader_shell_test );
reader_set_allow_autosuggesting(true);
reader_import_history_if_necessary(); reader_import_history_if_necessary();
parser_t &parser = parser_t::principal_parser(); parser_t &parser = parser_t::principal_parser();

4
reader.h
View file

@ -177,6 +177,10 @@ void reader_set_left_prompt( const wcstring &prompt );
*/ */
void reader_set_right_prompt( const wcstring &prompt ); void reader_set_right_prompt( const wcstring &prompt );
/** Sets whether autosuggesting is allowed. */
void reader_set_allow_autosuggesting(bool flag);
/** /**
Returns true if the shell is exiting, 0 otherwise. Returns true if the shell is exiting, 0 otherwise.
*/ */