h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-25 02:01:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Simplify append_cmdsub_error

Browse Source
This commit is contained in:
Johannes Altmanninger
2026-06-21 11:15:43 +08:00
parent 5dcb985ad6
commit a12e393a2a
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/expand.rs
View File

@@ -341,17 +341,6 @@ macro_rules! append_syntax_error {
/// recorded. This is needed because command substitution is a recursive process and some errors
/// could consequently be recorded more than once.
macro_rules! append_cmdsub_error {
(
$errors:expr, $source_start:expr, $source_end:expr,
$fmt:expr $(, $arg:expr )* $(,)?
) => {
append_cmdsub_error_formatted!(
$errors, $source_start, $source_end,
wgettext_fmt!($fmt $(, $arg)*));
}
}
macro_rules! append_cmdsub_error_formatted {
(
$errors:expr, $source_start:expr, $source_end:expr,
$text:expr $(,)?
@@ -361,7 +350,7 @@ macro_rules! append_cmdsub_error_formatted {
error.source_start = $source_start;
error.source_length = $source_end - $source_start + 1;
error.code = ParseErrorCode::CmdSubst;
error.text = $text;
error.text = $text.to_owned();
if !errors.iter().any(|e| e.text == error.text) {
errors.push(error);
}
@@ -973,12 +962,7 @@ pub fn expand_cmdsubst(
wgettext!("Unknown error while evaluating command substitution")
}
};
append_cmdsub_error_formatted!(
errors,
cmdsub.opening_paren_offset(),
cmdsub.end() - 1,
err.to_owned()
);
append_cmdsub_error!(errors, cmdsub.opening_paren_offset(), cmdsub.end() - 1, err);
return ExpandResult::make_error(subshell_status);
}
@@ -1316,7 +1300,9 @@ fn stage_cmdsubst(&mut self, input: WString, out: &mut CompletionReceiver) -> Ex
self.errors,
cmdsub.opening_paren_offset(),
cmdsub.end() - 1,
"command substitutions not allowed in command position. Try var=(your-cmd) $var ..."
wgettext!(
"command substitutions not allowed in command position. Try var=(your-cmd) $var ..."
)
);
ExpandResult::make_error(STATUS_EXPAND_ERROR)
}