github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-03-15 23:22:53 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

use variable assignments on commandline in completions

Browse Source 
Fixes #6507

To do: If a variable assignment uses a command substitution that errors,
the error is printed, but without a proper location.
This commit is contained in:
Johannes Altmanninger 2020-01-17 14:14:06 +01:00
parent c513724d7b
commit 05ddda9155
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/complete.cpp
View File

@ -1572,8 +1572,30 @@ void completer_t::perform() {
if (wants_transient) {
ctx.parser->libdata().transient_commandlines.push_back(cmdline);
}
bool is_variable_assignment = bool(variable_assignment_equals_pos(cmd));
maybe_t<size_t> equals_pos = variable_assignment_equals_pos(cmd);
bool is_variable_assignment = bool(equals_pos);
if (is_variable_assignment && ctx.parser) {
// clone of parse_execution_context_t::apply_variable_assignments
// but this is not smart enough to report correct error locations, so we ignore
// errors and this create one scope for each assignment instead of just one;
// that should hardly matter
const block_t *block = block =
ctx.parser->push_block(block_t::variable_assignment_block());
const wcstring variable_name = cmd.substr(0, *equals_pos);
const wcstring expression = cmd.substr(*equals_pos + 1);
completion_list_t expression_expanded;
auto expand_ret = expand_string(expression, &expression_expanded,
expand_flag::no_descriptions, ctx);
wcstring_list_t vals;
if (expand_ret != expand_result_t::error) {
for (auto &completion : expression_expanded)
vals.emplace_back(std::move(completion.completion));
ctx.parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT,
std::move(vals));
}
cleanup_t scope([&] {
if (block) ctx.parser->pop_block(block);
});
// To avoid issues like #2705 we complete commands starting with variable
// assignments by recursively calling complete for the command suffix
// without the first variable assignment token.

4
tests/checks/variable-assignment.fish
View File

@ -91,3 +91,7 @@ eval ': | a=b'
# CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.
eval 'not a=b'
# CHECKERR: {{.*}}: Unsupported use of '='. In fish, please use 'set a b'.
complete -c foo -xa '$a'
a=b complete -C'foo '
#CHECK: b