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 15:05:27 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Express cancellation as a possible result of expand_string

Browse Source 
This allows us to properly thread control-C signals from command
substitutions into the expanding string.
This commit is contained in:
ridiculousfish 2020-01-22 11:58:10 -08:00
parent 8a9c39d433
commit e640a01ea5
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/complete.cpp
View File

@ -680,6 +680,9 @@ void completer_t::complete_cmd(const wcstring &str_cmd) {
this->expand_flags() | expand_flag::special_for_command |
expand_flag::for_completions | expand_flag::executables_only,
ctx);
if (result == expand_result_t::cancel) {
return;
}
if (result != expand_result_t::error && this->wants_descriptions()) {
this->complete_cmd_desc(str_cmd);
}

6
src/expand.cpp
View File

@ -1012,7 +1012,7 @@ expand_result_t expander_t::stage_wildcards(wcstring path_to_expand, completion_
case wildcard_expand_result_t::no_match:
break;
case wildcard_expand_result_t::cancel:
result = expand_result_t::error;
result = expand_result_t::cancel;
break;
}
}
@ -1055,6 +1055,10 @@ expand_result_t expander_t::expand_string(wcstring input, completion_list_t *out
expand_result_t total_result = expand_result_t::ok;
for (stage_t stage : stages) {
for (completion_t &comp : completions) {
if (ctx.check_cancel()) {
total_result = expand_result_t::cancel;
break;
}
expand_result_t this_result =
(expand.*stage)(std::move(comp.completion), &output_storage);
total_result = this_result;

2
src/expand.h
View File

@ -105,6 +105,8 @@ enum class expand_result_t {
error,
/// Expansion succeeded.
ok,
/// Expansion was cancelled (e.g. control-C).
cancel,
/// Expansion succeeded, but a wildcard in the string matched no files,
/// so the output is empty.
wildcard_no_match,

9
src/parse_execution.cpp
View File

@ -465,6 +465,9 @@ eval_result_t parse_execution_context_t::run_switch_statement(
case expand_result_t::error:
return report_errors(errors);
case expand_result_t::cancel:
return eval_result_t::cancelled;
case expand_result_t::wildcard_no_match:
return report_unmatched_wildcard_error(switch_value_n);
@ -874,6 +877,9 @@ eval_result_t parse_execution_context_t::expand_arguments_from_nodes(
case expand_result_t::error: {
return this->report_errors(errors);
}
case expand_result_t::cancel: {
return eval_result_t::cancelled;
}
case expand_result_t::wildcard_no_match: {
if (glob_behavior == failglob) {
// Report the unmatched wildcard error and stop processing.
@ -1023,6 +1029,9 @@ eval_result_t parse_execution_context_t::apply_variable_assignments(
this->report_errors(errors);
return eval_result_t::error;
}
case expand_result_t::cancel: {
return eval_result_t::cancelled;
}
case expand_result_t::wildcard_no_match: // nullglob (equivalent to set)
case expand_result_t::ok: {
break;