mirror of
https://github.com/nushell/nushell.git
synced 2025-04-29 23:54:26 +02:00
# Description This PR makes it so that non-zero exit codes and termination by signal are treated as a normal `ShellError`. Currently, these are silent errors. That is, if an external command fails, then it's code block is aborted, but the parent block can sometimes continue execution. E.g., see #8569 and this example: ```nushell [1 2] | each { ^false } ``` Before this would give: ``` ╭───┬──╮ │ 0 │ │ │ 1 │ │ ╰───┴──╯ ``` Now, this shows an error: ``` Error: nu:🐚:eval_block_with_input × Eval block failed with pipeline input ╭─[entry #1:1:2] 1 │ [1 2] | each { ^false } · ┬ · ╰── source value ╰──── Error: nu:🐚:non_zero_exit_code × External command had a non-zero exit code ╭─[entry #1:1:17] 1 │ [1 2] | each { ^false } · ──┬── · ╰── exited with code 1 ╰──── ``` This PR fixes #12874, fixes #5960, fixes #10856, and fixes #5347. This PR also partially addresses #10633 and #10624 (only the last command of a pipeline is currently checked). It looks like #8569 is already fixed, but this PR will make sure it is definitely fixed (fixes #8569). # User-Facing Changes - Non-zero exit codes and termination by signal now cause an error to be thrown. - The error record value passed to a `catch` block may now have an `exit_code` column containing the integer exit code if the error was due to an external command. - Adds new config values, `display_errors.exit_code` and `display_errors.termination_signal`, which determine whether an error message should be printed in the respective error cases. For non-interactive sessions, these are set to `true`, and for interactive sessions `display_errors.exit_code` is false (via the default config). # Tests Added a few tests. # After Submitting - Update docs and book. - Future work: - Error if other external commands besides the last in a pipeline exit with a non-zero exit code. Then, deprecate `do -c` since this will be the default behavior everywhere. - Add a better mechanism for exit codes and deprecate `$env.LAST_EXIT_CODE` (it's buggy).
217 lines
7.7 KiB
Rust
217 lines
7.7 KiB
Rust
use crate::NushellPrompt;
|
|
use log::trace;
|
|
use nu_engine::ClosureEvalOnce;
|
|
use nu_protocol::{
|
|
engine::{EngineState, Stack},
|
|
report_shell_error, Config, PipelineData, Value,
|
|
};
|
|
use reedline::Prompt;
|
|
|
|
// Name of environment variable where the prompt could be stored
|
|
pub(crate) const PROMPT_COMMAND: &str = "PROMPT_COMMAND";
|
|
pub(crate) const PROMPT_COMMAND_RIGHT: &str = "PROMPT_COMMAND_RIGHT";
|
|
pub(crate) const PROMPT_INDICATOR: &str = "PROMPT_INDICATOR";
|
|
pub(crate) const PROMPT_INDICATOR_VI_INSERT: &str = "PROMPT_INDICATOR_VI_INSERT";
|
|
pub(crate) const PROMPT_INDICATOR_VI_NORMAL: &str = "PROMPT_INDICATOR_VI_NORMAL";
|
|
pub(crate) const PROMPT_MULTILINE_INDICATOR: &str = "PROMPT_MULTILINE_INDICATOR";
|
|
pub(crate) const TRANSIENT_PROMPT_COMMAND: &str = "TRANSIENT_PROMPT_COMMAND";
|
|
pub(crate) const TRANSIENT_PROMPT_COMMAND_RIGHT: &str = "TRANSIENT_PROMPT_COMMAND_RIGHT";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR: &str = "TRANSIENT_PROMPT_INDICATOR";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR_VI_INSERT: &str =
|
|
"TRANSIENT_PROMPT_INDICATOR_VI_INSERT";
|
|
pub(crate) const TRANSIENT_PROMPT_INDICATOR_VI_NORMAL: &str =
|
|
"TRANSIENT_PROMPT_INDICATOR_VI_NORMAL";
|
|
pub(crate) const TRANSIENT_PROMPT_MULTILINE_INDICATOR: &str =
|
|
"TRANSIENT_PROMPT_MULTILINE_INDICATOR";
|
|
|
|
// Store all these Ansi Escape Markers here so they can be reused easily
|
|
// According to Daniel Imms @Tyriar, we need to do these this way:
|
|
// <133 A><prompt><133 B><command><133 C><command output>
|
|
pub(crate) const PRE_PROMPT_MARKER: &str = "\x1b]133;A\x1b\\";
|
|
pub(crate) const POST_PROMPT_MARKER: &str = "\x1b]133;B\x1b\\";
|
|
pub(crate) const PRE_EXECUTION_MARKER: &str = "\x1b]133;C\x1b\\";
|
|
#[allow(dead_code)]
|
|
pub(crate) const POST_EXECUTION_MARKER_PREFIX: &str = "\x1b]133;D;";
|
|
#[allow(dead_code)]
|
|
pub(crate) const POST_EXECUTION_MARKER_SUFFIX: &str = "\x1b\\";
|
|
|
|
// OSC633 is the same as OSC133 but specifically for VSCode
|
|
pub(crate) const VSCODE_PRE_PROMPT_MARKER: &str = "\x1b]633;A\x1b\\";
|
|
pub(crate) const VSCODE_POST_PROMPT_MARKER: &str = "\x1b]633;B\x1b\\";
|
|
#[allow(dead_code)]
|
|
pub(crate) const VSCODE_PRE_EXECUTION_MARKER: &str = "\x1b]633;C\x1b\\";
|
|
#[allow(dead_code)]
|
|
//"\x1b]633;D;{}\x1b\\"
|
|
pub(crate) const VSCODE_POST_EXECUTION_MARKER_PREFIX: &str = "\x1b]633;D;";
|
|
#[allow(dead_code)]
|
|
pub(crate) const VSCODE_POST_EXECUTION_MARKER_SUFFIX: &str = "\x1b\\";
|
|
#[allow(dead_code)]
|
|
//"\x1b]633;E;{}\x1b\\"
|
|
pub(crate) const VSCODE_COMMANDLINE_MARKER_PREFIX: &str = "\x1b]633;E;";
|
|
#[allow(dead_code)]
|
|
pub(crate) const VSCODE_COMMANDLINE_MARKER_SUFFIX: &str = "\x1b\\";
|
|
#[allow(dead_code)]
|
|
// "\x1b]633;P;Cwd={}\x1b\\"
|
|
pub(crate) const VSCODE_CWD_PROPERTY_MARKER_PREFIX: &str = "\x1b]633;P;Cwd=";
|
|
#[allow(dead_code)]
|
|
pub(crate) const VSCODE_CWD_PROPERTY_MARKER_SUFFIX: &str = "\x1b\\";
|
|
|
|
pub(crate) const RESET_APPLICATION_MODE: &str = "\x1b[?1l";
|
|
|
|
fn get_prompt_string(
|
|
prompt: &str,
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
) -> Option<String> {
|
|
stack
|
|
.get_env_var(engine_state, prompt)
|
|
.and_then(|v| match v {
|
|
Value::Closure { val, .. } => {
|
|
let result = ClosureEvalOnce::new(engine_state, stack, *val)
|
|
.run_with_input(PipelineData::Empty);
|
|
|
|
trace!(
|
|
"get_prompt_string (block) {}:{}:{}",
|
|
file!(),
|
|
line!(),
|
|
column!()
|
|
);
|
|
|
|
result
|
|
.map_err(|err| {
|
|
report_shell_error(engine_state, &err);
|
|
})
|
|
.ok()
|
|
}
|
|
Value::String { .. } => Some(PipelineData::Value(v.clone(), None)),
|
|
_ => None,
|
|
})
|
|
.and_then(|pipeline_data| {
|
|
let output = pipeline_data.collect_string("", config).ok();
|
|
|
|
output.map(|mut x| {
|
|
// Just remove the very last newline.
|
|
if x.ends_with('\n') {
|
|
x.pop();
|
|
}
|
|
|
|
if x.ends_with('\r') {
|
|
x.pop();
|
|
}
|
|
x
|
|
})
|
|
})
|
|
}
|
|
|
|
pub(crate) fn update_prompt(
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
nu_prompt: &mut NushellPrompt,
|
|
) {
|
|
let configured_left_prompt_string =
|
|
match get_prompt_string(PROMPT_COMMAND, config, engine_state, stack) {
|
|
Some(s) => s,
|
|
None => "".to_string(),
|
|
};
|
|
|
|
// Now that we have the prompt string lets ansify it.
|
|
// <133 A><prompt><133 B><command><133 C><command output>
|
|
let left_prompt_string = if config.shell_integration.osc633 {
|
|
if stack.get_env_var(engine_state, "TERM_PROGRAM") == Some(Value::test_string("vscode")) {
|
|
// We're in vscode and we have osc633 enabled
|
|
Some(format!(
|
|
"{VSCODE_PRE_PROMPT_MARKER}{configured_left_prompt_string}{VSCODE_POST_PROMPT_MARKER}"
|
|
))
|
|
} else if config.shell_integration.osc133 {
|
|
// If we're in VSCode but we don't find the env var, but we have osc133 set, then use it
|
|
Some(format!(
|
|
"{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
|
|
))
|
|
} else {
|
|
configured_left_prompt_string.into()
|
|
}
|
|
} else if config.shell_integration.osc133 {
|
|
Some(format!(
|
|
"{PRE_PROMPT_MARKER}{configured_left_prompt_string}{POST_PROMPT_MARKER}"
|
|
))
|
|
} else {
|
|
configured_left_prompt_string.into()
|
|
};
|
|
|
|
let right_prompt_string = get_prompt_string(PROMPT_COMMAND_RIGHT, config, engine_state, stack);
|
|
|
|
let prompt_indicator_string = get_prompt_string(PROMPT_INDICATOR, config, engine_state, stack);
|
|
|
|
let prompt_multiline_string =
|
|
get_prompt_string(PROMPT_MULTILINE_INDICATOR, config, engine_state, stack);
|
|
|
|
let prompt_vi_insert_string =
|
|
get_prompt_string(PROMPT_INDICATOR_VI_INSERT, config, engine_state, stack);
|
|
|
|
let prompt_vi_normal_string =
|
|
get_prompt_string(PROMPT_INDICATOR_VI_NORMAL, config, engine_state, stack);
|
|
|
|
// apply the other indicators
|
|
nu_prompt.update_all_prompt_strings(
|
|
left_prompt_string,
|
|
right_prompt_string,
|
|
prompt_indicator_string,
|
|
prompt_multiline_string,
|
|
(prompt_vi_insert_string, prompt_vi_normal_string),
|
|
config.render_right_prompt_on_last_line,
|
|
);
|
|
trace!("update_prompt {}:{}:{}", file!(), line!(), column!());
|
|
}
|
|
|
|
/// Construct the transient prompt based on the normal nu_prompt
|
|
pub(crate) fn make_transient_prompt(
|
|
config: &Config,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
nu_prompt: &NushellPrompt,
|
|
) -> Box<dyn Prompt> {
|
|
let mut nu_prompt = nu_prompt.clone();
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_COMMAND, config, engine_state, stack) {
|
|
nu_prompt.update_prompt_left(Some(s))
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_COMMAND_RIGHT, config, engine_state, stack)
|
|
{
|
|
nu_prompt.update_prompt_right(Some(s), config.render_right_prompt_on_last_line)
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(TRANSIENT_PROMPT_INDICATOR, config, engine_state, stack) {
|
|
nu_prompt.update_prompt_indicator(Some(s))
|
|
}
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_INDICATOR_VI_INSERT,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_vi_insert(Some(s))
|
|
}
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_INDICATOR_VI_NORMAL,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_vi_normal(Some(s))
|
|
}
|
|
|
|
if let Some(s) = get_prompt_string(
|
|
TRANSIENT_PROMPT_MULTILINE_INDICATOR,
|
|
config,
|
|
engine_state,
|
|
stack,
|
|
) {
|
|
nu_prompt.update_prompt_multiline(Some(s))
|
|
}
|
|
|
|
Box::new(nu_prompt)
|
|
}
|