h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-21 03:21:16 -03:00
Code Issues Packages Projects Releases Wiki Activity

Some work to allow completions to be evaluated off of the main thread

Browse Source
This commit is contained in:
ridiculousfish
2012-02-24 12:13:35 -08:00
parent 90e979d0d9
commit a515db4aea
12 changed files with 144 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
reader.cpp
View File

@@ -258,8 +258,7 @@ class reader_data_t
/**
Function for tab completion
*/
void (*complete_func)( const wchar_t *,
std::vector<completion_t>& );
complete_function_t complete_func;
/**
Function for syntax highlighting
@@ -1235,6 +1234,10 @@ struct autosuggestion_context_t {
int threaded_autosuggest(void) {
ASSERT_IS_BACKGROUND_THREAD();
std::vector<completion_t> completions;
complete(search_string.c_str(), completions, COMPLETE_AUTOSUGGEST);
while (searcher.go_backwards()) {
history_item_t item = searcher.current_item();
bool item_ok = false;
@@ -2299,8 +2302,7 @@ void reader_set_prompt( const wchar_t *new_prompt )
data->prompt = new_prompt;
}
void reader_set_complete_function( void (*f)( const wchar_t *,
std::vector<completion_t>& ) )
void reader_set_complete_function( complete_function_t f )
{
data->complete_func = f;
}
@@ -2828,7 +2830,7 @@ const wchar_t *reader_readline()
buffcpy = wcsndup( begin, len );
// comp = al_halloc( 0 );
data->complete_func( buffcpy, comp );
data->complete_func( buffcpy, comp, COMPLETE_DEFAULT );
sort_completion_list( comp );
remove_duplicates( comp );