github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-14 05:22:46 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow $() in command position

Browse Source
This commit is contained in:
Johannes Altmanninger 2024-11-21 23:33:13 +01:00
parent b1213f1385
commit 4b99fe2288
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/expand.rs
View File

@ -225,7 +225,11 @@ pub fn expand_to_command_and_args(
return ExpandResult::ok(); return ExpandResult::ok();
} }
let mut eflags = ExpandFlags::FAIL_ON_CMDSUBST; let mut eflags = if ctx.has_parser() {
ExpandFlags::empty()
} else {
ExpandFlags::FAIL_ON_CMDSUBST
};
if skip_wildcards { if skip_wildcards {
eflags |= ExpandFlags::SKIP_WILDCARDS; eflags |= ExpandFlags::SKIP_WILDCARDS;
} }
@ -1327,7 +1331,14 @@ impl<'a, 'b, 'c> Expander<'a, 'b, 'c> {
} }
if self.flags.contains(ExpandFlags::FAIL_ON_CMDSUBST) { if self.flags.contains(ExpandFlags::FAIL_ON_CMDSUBST) {
let mut cursor = 0; let mut cursor = 0;
match parse_util_locate_cmdsubst_range(&input, &mut cursor, true, None, None) { let mut has_dollar = false;
match parse_util_locate_cmdsubst_range(
&input,
&mut cursor,
true,
None,
Some(&mut has_dollar),
) {
MaybeParentheses::Error => { MaybeParentheses::Error => {
return ExpandResult::make_error(STATUS_EXPAND_ERROR.unwrap()); return ExpandResult::make_error(STATUS_EXPAND_ERROR.unwrap());
} }
@ -1338,6 +1349,9 @@ impl<'a, 'b, 'c> Expander<'a, 'b, 'c> {
return ExpandResult::ok(); return ExpandResult::ok();
} }
MaybeParentheses::CommandSubstitution(parens) => { MaybeParentheses::CommandSubstitution(parens) => {
if has_dollar {
return ExpandResult::ok();
}
append_cmdsub_error!( append_cmdsub_error!(
self.errors, self.errors,
parens.start(), parens.start(),