h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-22 15:51:18 -03:00
Code Issues Packages Projects Releases Wiki Activity

Eliminate complete_set_variable_names

Browse Source
This commit is contained in:
ridiculousfish
2018-09-10 18:36:04 -07:00
parent e6b13c6bac
commit 94adb53b1f
3 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/complete.cpp
View File

@@ -74,20 +74,6 @@ static const wcstring &C_(const wcstring &s) { return s; }
static void complete_load(const wcstring &name, bool reload);
/// Testing apparatus.
const wcstring_list_t *s_override_variable_names = NULL;
void complete_set_variable_names(const wcstring_list_t *names) {
s_override_variable_names = names;
}
static inline wcstring_list_t complete_get_variable_names(const environment_t &vars) {
if (s_override_variable_names != NULL) {
return *s_override_variable_names;
}
return vars.get_names(0);
}
/// Struct describing a completion option entry.
///
/// If option is empty, the comp field must not be empty and contains a list of arguments to the
@@ -1125,10 +1111,8 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
size_t varlen = str.length() - start_offset;
bool res = false;
const wcstring_list_t names = complete_get_variable_names(vars);
for (size_t i = 0; i < names.size(); i++) {
const wcstring &env_name = names.at(i);
const wcstring_list_t names = vars.get_names(0);
for (const wcstring &env_name : vars.get_names(0)) {
string_fuzzy_match_t match =
string_fuzzy_match_string(var, env_name, this->max_fuzzy_match_type());
if (match.type == fuzzy_match_none) {