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

Remove code clone in parse_util_locate_cmdsub

Browse Source 
(cherry picked from commit bd178c8ba8)
This commit is contained in:
Johannes Altmanninger
2025-05-02 06:38:20 +02:00
parent db323348c7
commit 27504658ce
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/parse_util.rs
View File

@@ -228,7 +228,9 @@ fn process_opening_quote(
quote: char,
) -> Option<usize> {
let q_end = quote_end(input.into(), pos, quote)?;
// Found a valid closing quote.
if input[q_end] == '$' {
// The closing quote is another quoted command substitution.
*last_dollar = Some(q_end);
quoted_cmdsubs.push(paran_count);
}
@@ -307,21 +309,19 @@ fn process_opening_quote(
if quoted_cmdsubs.last() == Some(&paran_count) {
quoted_cmdsubs.pop();
// Quoted command substitutions temporarily close double quotes.
// In "foo$(bar)baz$(qux)"
// We are here ^
// After the ) in a quoted command substitution, we need to act as if
// there was an invisible double quote.
match quote_end(input.into(), pos, '"') {
Some(q_end) => {
// Found a valid closing quote.
// Stop at $(qux), which is another quoted command substitution.
if input[q_end] == '$' {
quoted_cmdsubs.push(paran_count);
}
pos = q_end;
}
// In "foo$(bar)baz$(qux)", after the ), we need to act as if there was a double quote.
match process_opening_quote(
input,
&mut inout_is_quoted,
paran_count,
&mut quoted_cmdsubs,
pos,
&mut last_dollar,
'"',
) {
Some(q_end) => pos = q_end,
None => break,
};
}
}
}
is_token_begin = is_token_delimiter(c, input.get(pos + 1).copied());