Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2025-01-04 00:58:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't compute $history for variable completion description

Browse source 
Fixes #6288
This commit is contained in:
Johannes Altmanninger 2019-11-05 12:59:49 +01:00
parent 4f1fa9513c
commit 23eb6e9c09
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/complete.cpp
View file

@ -1190,13 +1190,18 @@ bool completer_t::complete_variable(const wcstring &str, size_t start_offset) {
wcstring desc; wcstring desc;
if (this->wants_descriptions()) { if (this->wants_descriptions()) {
// Can't use this->vars here, it could be any variable.
auto var = vars.get(env_name);
if (!var) continue;
if (this->type() != COMPLETE_AUTOSUGGEST) { if (this->type() != COMPLETE_AUTOSUGGEST) {
wcstring value = expand_escape_variable(*var); // $history can be huge, don't put it in the completion description; see #6288.
desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str()); if (env_name == L"history") {
desc = format_string(L"Full history of interactive commands");
} else {
// Can't use this->vars here, it could be any variable.
auto var = vars.get(env_name);
if (!var) continue;
wcstring value = expand_escape_variable(*var);
desc = format_string(COMPLETE_VAR_DESC_VAL, value.c_str());
}
} }
} }