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

Use unescape_string_in_place

Browse Source 
We already get a copy, so we might as well just use it.
This commit is contained in:
Fabian Homborg 2021-10-28 17:32:52 +02:00
parent 8428247f31
commit 2ef8a9c1af
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/expand.cpp
View File

@ -1001,22 +1001,20 @@ expand_result_t expander_t::stage_cmdsubst(wcstring input, completion_receiver_t
expand_result_t expander_t::stage_variables(wcstring input, completion_receiver_t *out) {
// We accept incomplete strings here, since complete uses expand_string to expand incomplete
// strings from the commandline.
wcstring next;
unescape_string(input, &next, UNESCAPE_SPECIAL | UNESCAPE_INCOMPLETE);
unescape_string_in_place(&input, UNESCAPE_SPECIAL | UNESCAPE_INCOMPLETE);
if (flags & expand_flag::skip_variables) {
for (auto &i : next) {
for (auto &i : input) {
if (i == VARIABLE_EXPAND) {
i = L'$';
}
}
if (!out->add(std::move(next))) {
if (!out->add(std::move(input))) {
return append_overflow_error(errors);
}
return expand_result_t::ok;
} else {
size_t size = next.size();
return expand_variables(std::move(next), out, size, ctx.vars, errors);
return expand_variables(std::move(input), out, input.size(), ctx.vars, errors);
}
}