diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-03-09 20:16:26 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-03-09 20:16:26 -0800 |
| commit | f92b24221a1b2449b17161d57ae1b4699b82374b (patch) | |
| tree | eaba7e3031b7a9494da0a6cda68d11b66935b0f1 /complete.cpp | |
| parent | afd78f3f0b973e281db5b78e4d5851f36a32988f (diff) | |
Made pwd a builtin
Fixed a thread error when autosuggesting with a command substitution
Diffstat (limited to 'complete.cpp')
| -rw-r--r-- | complete.cpp | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/complete.cpp b/complete.cpp index 1d0bc0cb..2b2686b5 100644 --- a/complete.cpp +++ b/complete.cpp @@ -269,6 +269,14 @@ class completer_t { bool condition_test( const wcstring &condition ); + expand_flags_t expand_flags() const { + /* Never do command substitution in autosuggestions */ + expand_flags_t result = 0; + if (type == COMPLETE_AUTOSUGGEST) + result |= EXPAND_SKIP_CMDSUBST; + return result; + } + void get_commands_to_load(wcstring_list_t *lst) { if (lst) lst->insert(lst->end(), commands_to_load.begin(), commands_to_load.end()); @@ -988,7 +996,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use if( use_command && wants_description ) { - if( expand_string(str, this->completions, ACCEPT_INCOMPLETE | EXECUTABLES_ONLY ) != EXPAND_ERROR ) + if( expand_string(str, this->completions, ACCEPT_INCOMPLETE | EXECUTABLES_ONLY | this->expand_flags() ) != EXPAND_ERROR ) { this->complete_cmd_desc( str ); } @@ -1029,8 +1037,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use if( expand_string( nxt_completion, this->completions, - ACCEPT_INCOMPLETE | - EXECUTABLES_ONLY ) != EXPAND_ERROR ) + ACCEPT_INCOMPLETE | EXECUTABLES_ONLY | this->expand_flags() ) != EXPAND_ERROR ) { for( size_t i=prev_count; i< this->completions.size(); i++ ) { @@ -1098,7 +1105,7 @@ void completer_t::complete_cmd( const wcstring &str, bool use_function, bool use if( expand_string( nxt_completion, this->completions, - ACCEPT_INCOMPLETE | DIRECTORIES_ONLY ) != EXPAND_ERROR ) + ACCEPT_INCOMPLETE | DIRECTORIES_ONLY | this->expand_flags() ) != EXPAND_ERROR ) { } free(nxt_completion); @@ -1489,7 +1496,7 @@ void completer_t::complete_param_expand( const wcstring &sstr, bool do_file) if( expand_string( comp_str, this->completions, - flags ) == EXPAND_ERROR ) + flags | this->expand_flags() ) == EXPAND_ERROR ) { debug( 3, L"Error while expanding string '%ls'", comp_str ); } |