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

Block custom/user completions for all invalid heads

Browse source 
If the head is not a valid, existent command, do not load and run custom
completion sources. This applies to both the autosuggestion provider and
manual user completions. File-based completions will still be offered.

Supersedes #4782 and #4783. Closes #4783. Closes #4782. Closes #2365.
This commit is contained in:
Mahmoud Al-Qudsi 2018-03-06 12:35:14 -06:00
parent 3c895c2839
commit 4414d5c888
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/complete.cpp
View file

@ -28,6 +28,7 @@
#include "builtin.h" #include "builtin.h"
#include "common.h" #include "common.h"
#include "complete.h" #include "complete.h"
#include "env.h"
#include "exec.h" #include "exec.h"
#include "expand.h" #include "expand.h"
#include "fallback.h" // IWYU pragma: keep #include "fallback.h" // IWYU pragma: keep
@ -842,13 +843,24 @@ bool completer_t::complete_param(const wcstring &scmd_orig, const wcstring &spop
wcstring cmd, path; wcstring cmd, path;
parse_cmd_string(cmd_orig, path, cmd); parse_cmd_string(cmd_orig, path, cmd);
if (this->type() == COMPLETE_DEFAULT) { env_vars_snapshot_t vars; //does not need to be populated for our needs
// this has to be called before complete_load
if (!function_exists_no_autoload(cmd.c_str(), vars) && !builtin_exists(cmd)
&& !path_get_path(cmd, nullptr)) {
//Do not load custom completions if the head does not exist
//This prevents errors caused during the execution of completion providers for
//tools that do not exist. Applies to both manual completions ("cm<TAB>", "cmd <TAB>")
//and automatic completions ("gi" autosuggestion provider -> git)
}
else if (this->type() == COMPLETE_DEFAULT) {
ASSERT_IS_MAIN_THREAD(); ASSERT_IS_MAIN_THREAD();
complete_load(cmd, true); complete_load(cmd, true);
} else if (this->type() == COMPLETE_AUTOSUGGEST && } else if (this->type() == COMPLETE_AUTOSUGGEST &&
!completion_autoloader.has_tried_loading(cmd)) { !completion_autoloader.has_tried_loading(cmd)) {
// Load this command (on the main thread) // Load this command (on the main thread)
iothread_perform_on_main([&]() { complete_load(cmd, false); }); iothread_perform_on_main([&]() {
complete_load(cmd, false);
});
} }
// Make a list of lists of all options that we care about. // Make a list of lists of all options that we care about.