h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-12 20:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Send events more often for variable sets outside of builtin_set

Browse Source 
When changing certain variables programmatically, ensure that events
are sent. Fixes #6653
This commit is contained in:
ridiculousfish
2020-03-07 19:44:58 -08:00
parent eac6252ab9
commit 5886b961d8
10 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/parse_execution.cpp
View File

@@ -403,9 +403,9 @@ end_execution_reason_t parse_execution_context_t::run_for_statement(
}
int retval;
if (var) {
retval = parser->vars().set(for_var_name, ENV_LOCAL | ENV_USER, var->as_list());
retval = parser->set_var_and_fire(for_var_name, ENV_LOCAL | ENV_USER, var->as_list());
} else {
retval = parser->vars().set_empty(for_var_name, ENV_LOCAL | ENV_USER);
retval = parser->set_empty_var_and_fire(for_var_name, ENV_LOCAL | ENV_USER);
}
assert(retval == ENV_OK);
@@ -424,7 +424,7 @@ end_execution_reason_t parse_execution_context_t::run_for_statement(
break;
}
int retval = parser->vars().set_one(for_var_name, ENV_DEFAULT | ENV_USER, val);
int retval = parser->set_var_and_fire(for_var_name, ENV_DEFAULT | ENV_USER, val);
assert(retval == ENV_OK && "for loop variable should have been successfully set");
(void)retval;
@@ -1014,7 +1014,7 @@ end_execution_reason_t parse_execution_context_t::apply_variable_assignments(
vals.emplace_back(std::move(completion.completion));
}
if (proc) proc->variable_assignments.push_back({variable_name, vals});
parser->vars().set(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals));
parser->set_var_and_fire(variable_name, ENV_LOCAL | ENV_EXPORT, std::move(vals));
}
return end_execution_reason_t::ok;
}