extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-09 07:05:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix return setting last exit code (#14120)

Browse Source 
# Description

Fixes #14113 and #14112.

# Tests + Formatting

Added a test.
This commit is contained in:
Ian Manske
2024-10-17 20:05:58 -07:00
committed by GitHub
parent 28b6db115a
commit e911ff4d67
5 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-protocol/src/engine/stack.rs
View File

@ -287,8 +287,8 @@ impl Stack {
pub fn set_last_error(&mut self, error: &ShellError) {
if let Some(code) = error.external_exit_code() {
self.set_last_exit_code(code.item, code.span);
} else {
self.set_last_exit_code(1, Span::unknown());
} else if let Some(code) = error.exit_code() {
self.set_last_exit_code(code, Span::unknown());
}
}

7
crates/nu-protocol/src/errors/shell_error.rs
View File

@ -1470,8 +1470,11 @@ impl ShellError {
Some(Spanned { item, span })
}
pub fn exit_code(&self) -> i32 {
self.external_exit_code().map(|e| e.item).unwrap_or(1)
pub fn exit_code(&self) -> Option<i32> {
match self {
Self::Return { .. } | Self::Break { .. } | Self::Continue { .. } => None,
_ => self.external_exit_code().map(|e| e.item).or(Some(1)),
}
}
pub fn into_value(self, span: Span) -> Value {