ensure that when nu evaluates files, it allows early returns (#7415)

# Description

Fixes #7301.

# User-Facing Changes

`return` can now be used in scripts without explicit `def main`.

# Tests + Formatting

Don't forget to add tests that cover your changes. (I'm not sure how to
test this.)

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- `cargo test --workspace` to check that all tests pass

# After Submitting

If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
This commit is contained in:
pwygab 2023-02-02 07:02:27 +08:00 committed by GitHub
parent c130ca1bc6
commit 24d7227e27
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 56 additions and 8 deletions

View file

@ -41,6 +41,7 @@ pub fn read_plugin_file(
&contents, &contents,
&plugin_filename, &plugin_filename,
PipelineData::empty(), PipelineData::empty(),
false,
); );
} }
} }
@ -93,6 +94,7 @@ pub fn eval_config_contents(
&contents, &contents,
&config_filename, &config_filename,
PipelineData::empty(), PipelineData::empty(),
false,
); );
// Merge the environment in case env vars changed in the config // Merge the environment in case env vars changed in the config

View file

@ -106,13 +106,21 @@ pub fn evaluate_file(
&file, &file,
file_path_str, file_path_str,
PipelineData::empty(), PipelineData::empty(),
true,
) { ) {
std::process::exit(1); std::process::exit(1);
} }
if !eval_source(engine_state, stack, args.as_bytes(), "<commandline>", input) { if !eval_source(
engine_state,
stack,
args.as_bytes(),
"<commandline>",
input,
true,
) {
std::process::exit(1); std::process::exit(1);
} }
} else if !eval_source(engine_state, stack, &file, file_path_str, input) { } else if !eval_source(engine_state, stack, &file, file_path_str, input, true) {
std::process::exit(1); std::process::exit(1);
} }

View file

@ -145,6 +145,7 @@ pub fn evaluate_repl(
s.item.as_bytes(), s.item.as_bytes(),
&format!("entry #{entry_num}"), &format!("entry #{entry_num}"),
PipelineData::empty(), PipelineData::empty(),
false,
); );
engine_state.merge_env(stack, get_guaranteed_cwd(engine_state, stack))?; engine_state.merge_env(stack, get_guaranteed_cwd(engine_state, stack))?;
} }
@ -472,6 +473,7 @@ pub fn evaluate_repl(
s.as_bytes(), s.as_bytes(),
&format!("entry #{entry_num}"), &format!("entry #{entry_num}"),
PipelineData::empty(), PipelineData::empty(),
false,
); );
} }
let cmd_duration = start_time.elapsed(); let cmd_duration = start_time.elapsed();

View file

@ -1,5 +1,5 @@
use crate::repl::eval_hook; use crate::repl::eval_hook;
use nu_engine::eval_block; use nu_engine::{eval_block, eval_block_with_early_return};
use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents}; use nu_parser::{escape_quote_string, lex, parse, unescape_unquote_string, Token, TokenContents};
use nu_protocol::engine::StateWorkingSet; use nu_protocol::engine::StateWorkingSet;
use nu_protocol::CliError; use nu_protocol::CliError;
@ -203,6 +203,7 @@ pub fn eval_source(
source: &[u8], source: &[u8],
fname: &str, fname: &str,
input: PipelineData, input: PipelineData,
allow_return: bool,
) -> bool { ) -> bool {
let start_time = std::time::Instant::now(); let start_time = std::time::Instant::now();
@ -230,7 +231,13 @@ pub fn eval_source(
return false; return false;
} }
match eval_block(engine_state, stack, &block, input, false, false) { let b = if allow_return {
eval_block_with_early_return(engine_state, stack, &block, input, false, false)
} else {
eval_block(engine_state, stack, &block, input, false, false)
};
match b {
Ok(pipeline_data) => { Ok(pipeline_data) => {
let config = engine_state.get_config(); let config = engine_state.get_config();
let result; let result;

View file

@ -1,4 +1,4 @@
use nu_engine::{eval_block, CallExt}; use nu_engine::{eval_block_with_early_return, CallExt};
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type}; use nu_protocol::{Category, Example, PipelineData, ShellError, Signature, SyntaxShape, Type};
@ -48,7 +48,7 @@ impl Command for Source {
let block_id: i64 = call.req_parser_info(engine_state, stack, 0)?; let block_id: i64 = call.req_parser_info(engine_state, stack, 0)?;
let block = engine_state.get_block(block_id as usize).clone(); let block = engine_state.get_block(block_id as usize).clone();
eval_block( eval_block_with_early_return(
engine_state, engine_state,
stack, stack,
&block, &block,

View file

@ -1,6 +1,6 @@
use std::path::PathBuf; use std::path::PathBuf;
use nu_engine::{eval_block, find_in_dirs_env, redirect_env, CallExt}; use nu_engine::{eval_block_with_early_return, find_in_dirs_env, redirect_env, CallExt};
use nu_protocol::ast::Call; use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EngineState, Stack}; use nu_protocol::engine::{Command, EngineState, Stack};
use nu_protocol::{ use nu_protocol::{
@ -62,7 +62,7 @@ impl Command for SourceEnv {
let block = engine_state.get_block(block_id as usize).clone(); let block = engine_state.get_block(block_id as usize).clone();
let mut callee_stack = caller_stack.gather_captures(&block.captures); let mut callee_stack = caller_stack.gather_captures(&block.captures);
let result = eval_block( let result = eval_block_with_early_return(
engine_state, engine_state,
&mut callee_stack, &mut callee_stack,
&block, &block,

View file

@ -23,3 +23,15 @@ fn early_return_if_false() {
assert_eq!(actual.out, r#"100"#); assert_eq!(actual.out, r#"100"#);
} }
#[test]
fn return_works_in_script_without_def_main() {
let actual = nu!(
cwd: "tests/fixtures/formats", pipeline(
r#"
nu early_return.nu
"#
));
assert!(actual.err.is_empty());
}

View file

@ -314,3 +314,15 @@ fn source_env_const_file() {
assert_eq!(actual.out, "foo"); assert_eq!(actual.out, "foo");
}) })
} }
#[test]
fn source_respects_early_return() {
let actual = nu!(
cwd: "tests/fixtures/formats", pipeline(
r#"
source early_return.nu
"#
));
assert!(actual.err.is_empty());
}

View file

@ -131,6 +131,7 @@ pub(crate) fn read_default_env_file(engine_state: &mut EngineState, stack: &mut
config_file.as_bytes(), config_file.as_bytes(),
"default_env.nu", "default_env.nu",
PipelineData::empty(), PipelineData::empty(),
false,
); );
info!("read_config_file {}:{}:{}", file!(), line!(), column!()); info!("read_config_file {}:{}:{}", file!(), line!(), column!());
@ -167,6 +168,7 @@ fn eval_default_config(
"default_config.nu" "default_config.nu"
}, },
PipelineData::empty(), PipelineData::empty(),
false,
); );
// Merge the environment in case env vars changed in the config // Merge the environment in case env vars changed in the config

View file

@ -0,0 +1,3 @@
echo "a"
return 1
error make {msg: "this should not show"}