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

Refactor: slightly rework how variables are assigned during completion

Browse Source 
Seems better since we now have two callers. This would be a good use case for
[[nodiscard]].
This commit is contained in:
Johannes Altmanninger 2020-10-10 12:52:06 +02:00
parent 8ef8fb3d94
commit ddf0a8e461
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/complete.cpp
View File

@ -409,7 +409,7 @@ class completer_t {
void walk_wrap_chain(const wcstring &cmd, const wcstring &cmdline, source_range_t cmd_range, void walk_wrap_chain(const wcstring &cmd, const wcstring &cmdline, source_range_t cmd_range,
custom_arg_data_t *arg_data); custom_arg_data_t *arg_data);
const block_t *apply_var_assignments(const wcstring_list_t &var_assignments); cleanup_t apply_var_assignments(const wcstring_list_t &var_assignments);
bool empty() const { return completions.empty(); } bool empty() const { return completions.empty(); }
@ -1350,11 +1350,10 @@ bool completer_t::try_complete_user(const wcstring &str) {
#endif #endif
} }
// If we have variable assignments, attempt to apply them in our parser, returning a variable // If we have variable assignments, attempt to apply them in our parser. As soon as the return
// assignment block. The caller MUST clean this up by calling ctx.parser->pop_block(). If we do not // value goes out of scope, the variables will be removed from the parser.
// have variable assignments, then return nullptr. cleanup_t completer_t::apply_var_assignments(const wcstring_list_t &var_assignments) {
const block_t *completer_t::apply_var_assignments(const wcstring_list_t &var_assignments) { if (!ctx.parser || var_assignments.empty()) return cleanup_t{[] {}};
if (!ctx.parser || var_assignments.empty()) return nullptr;
env_stack_t &vars = ctx.parser->vars(); env_stack_t &vars = ctx.parser->vars();
assert(&vars == &ctx.vars && assert(&vars == &ctx.vars &&
"Don't know how to tab complete with a parser but a different variable set"); "Don't know how to tab complete with a parser but a different variable set");
@ -1385,7 +1384,7 @@ const block_t *completer_t::apply_var_assignments(const wcstring_list_t &var_ass
ctx.parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals)); ctx.parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals));
if (ctx.check_cancel()) break; if (ctx.check_cancel()) break;
} }
return block; return cleanup_t([=] { ctx.parser->pop_block(block); });
} }
// Complete a command by invoking user-specified completions. // Complete a command by invoking user-specified completions.
@ -1405,10 +1404,7 @@ void completer_t::complete_custom(const wcstring &cmd, const wcstring &cmdline,
} }
// Maybe apply variable assignments. // Maybe apply variable assignments.
const block_t *var_assignment_block = apply_var_assignments(*ad->var_assignments); cleanup_t restore_vars{apply_var_assignments(*ad->var_assignments)};
cleanup_t restore_variable_scope([=] {
if (var_assignment_block) ctx.parser->pop_block(var_assignment_block);
});
if (ctx.check_cancel()) return; if (ctx.check_cancel()) return;
if (!complete_param(cmd, ad->previous_argument, ad->current_argument, if (!complete_param(cmd, ad->previous_argument, ad->current_argument,
@ -1703,10 +1699,7 @@ void completer_t::perform_for_commandline(wcstring cmdline) {
} }
// Maybe apply variable assignments. // Maybe apply variable assignments.
const block_t *var_assignment_block = apply_var_assignments(var_assignments); cleanup_t restore_vars{apply_var_assignments(var_assignments)};
cleanup_t restore_variable_scope([=] {
if (var_assignment_block) ctx.parser->pop_block(var_assignment_block);
});
if (ctx.check_cancel()) return; if (ctx.check_cancel()) return;
// This function wants the unescaped string. // This function wants the unescaped string.