mirror of
https://github.com/nushell/nushell.git
synced 2025-08-15 10:13:13 +02:00
Fix file lookup in parser keywords; Refactor nu_repl (#6185)
* Fix file lookup in parser keywords * Make nu_repl a testbin; Fix wrong cwd test error
This commit is contained in:
@ -177,6 +177,7 @@ fn main() -> Result<()> {
|
||||
"nonu" => test_bins::nonu(),
|
||||
"chop" => test_bins::chop(),
|
||||
"repeater" => test_bins::repeater(),
|
||||
"nu_repl" => test_bins::nu_repl(),
|
||||
_ => std::process::exit(1),
|
||||
}
|
||||
std::process::exit(0)
|
||||
|
128
src/test_bins.rs
128
src/test_bins.rs
@ -1,5 +1,13 @@
|
||||
use std::io::{self, BufRead, Write};
|
||||
|
||||
use nu_cli::{eval_env_change_hook, eval_hook};
|
||||
use nu_command::create_default_context;
|
||||
use nu_engine::eval_block;
|
||||
use nu_parser::parse;
|
||||
use nu_protocol::engine::{EngineState, Stack, StateWorkingSet};
|
||||
use nu_protocol::{CliError, PipelineData, Span, Value};
|
||||
// use nu_test_support::fs::in_directory;
|
||||
|
||||
/// Echo's value of env keys from args
|
||||
/// Example: nu --testbin env_echo FOO BAR
|
||||
/// If it it's not present echo's nothing
|
||||
@ -112,6 +120,126 @@ pub fn chop() {
|
||||
std::process::exit(0);
|
||||
}
|
||||
|
||||
fn outcome_err(
|
||||
engine_state: &EngineState,
|
||||
error: &(dyn miette::Diagnostic + Send + Sync + 'static),
|
||||
) -> ! {
|
||||
let working_set = StateWorkingSet::new(engine_state);
|
||||
|
||||
eprintln!("Error: {:?}", CliError(error, &working_set));
|
||||
|
||||
std::process::exit(1);
|
||||
}
|
||||
|
||||
fn outcome_ok(msg: String) -> ! {
|
||||
println!("{}", msg);
|
||||
|
||||
std::process::exit(0);
|
||||
}
|
||||
|
||||
pub fn nu_repl() {
|
||||
//cwd: &str, source_lines: &[&str]) {
|
||||
let cwd = std::env::current_dir().expect("Could not get current working directory.");
|
||||
let source_lines = args();
|
||||
|
||||
let mut engine_state = create_default_context();
|
||||
let mut stack = Stack::new();
|
||||
|
||||
stack.add_env_var(
|
||||
"PWD".to_string(),
|
||||
Value::String {
|
||||
val: cwd.to_string_lossy().to_string(),
|
||||
span: Span::test_data(),
|
||||
},
|
||||
);
|
||||
|
||||
let mut last_output = String::new();
|
||||
|
||||
for (i, line) in source_lines.iter().enumerate() {
|
||||
let cwd = match nu_engine::env::current_dir(&engine_state, &stack) {
|
||||
Ok(d) => d,
|
||||
Err(err) => {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
};
|
||||
|
||||
// Before doing anything, merge the environment from the previous REPL iteration into the
|
||||
// permanent state.
|
||||
if let Err(err) = engine_state.merge_env(&mut stack, &cwd) {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
|
||||
// Check for pre_prompt hook
|
||||
let config = engine_state.get_config();
|
||||
if let Some(hook) = config.hooks.pre_prompt.clone() {
|
||||
if let Err(err) = eval_hook(&mut engine_state, &mut stack, vec![], &hook) {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
}
|
||||
|
||||
// Check for env change hook
|
||||
let config = engine_state.get_config();
|
||||
if let Err(err) = eval_env_change_hook(
|
||||
config.hooks.env_change.clone(),
|
||||
&mut engine_state,
|
||||
&mut stack,
|
||||
) {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
|
||||
// Check for pre_execution hook
|
||||
let config = engine_state.get_config();
|
||||
if let Some(hook) = config.hooks.pre_execution.clone() {
|
||||
if let Err(err) = eval_hook(&mut engine_state, &mut stack, vec![], &hook) {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
}
|
||||
|
||||
// Eval the REPL line
|
||||
let (block, delta) = {
|
||||
let mut working_set = StateWorkingSet::new(&engine_state);
|
||||
let (block, err) = parse(
|
||||
&mut working_set,
|
||||
Some(&format!("line{}", i)),
|
||||
line.as_bytes(),
|
||||
false,
|
||||
&[],
|
||||
);
|
||||
|
||||
if let Some(err) = err {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
(block, working_set.render())
|
||||
};
|
||||
|
||||
if let Err(err) = engine_state.merge_delta(delta) {
|
||||
outcome_err(&engine_state, &err);
|
||||
}
|
||||
|
||||
let input = PipelineData::new(Span::test_data());
|
||||
let config = engine_state.get_config();
|
||||
|
||||
match eval_block(&engine_state, &mut stack, &block, input, false, false) {
|
||||
Ok(pipeline_data) => match pipeline_data.collect_string("", config) {
|
||||
Ok(s) => last_output = s,
|
||||
Err(err) => outcome_err(&engine_state, &err),
|
||||
},
|
||||
Err(err) => outcome_err(&engine_state, &err),
|
||||
}
|
||||
|
||||
if let Some(cwd) = stack.get_env_var(&engine_state, "PWD") {
|
||||
let path = match cwd.as_string() {
|
||||
Ok(p) => p,
|
||||
Err(err) => outcome_err(&engine_state, &err),
|
||||
};
|
||||
let _ = std::env::set_current_dir(path);
|
||||
engine_state.add_env_var("PWD".into(), cwd);
|
||||
}
|
||||
}
|
||||
|
||||
outcome_ok(last_output)
|
||||
}
|
||||
|
||||
fn did_chop_arguments() -> bool {
|
||||
let args: Vec<String> = args();
|
||||
|
||||
|
Reference in New Issue
Block a user