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

Adapt tk's work for a source command

Browse Source
This commit is contained in:
JT
2021-10-06 15:29:05 +13:00
parent d481d5ca96
commit 7eb022b58c
4 changed files with 18 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

98
crates/nu-command/src/core_commands/source.rs
View File

@ -1,7 +1,4 @@
use std::borrow::Borrow;
use std::path::Path;
use nu_engine::{eval_block, eval_expression};
use nu_engine::{eval_block, CallExt};
use nu_protocol::ast::Call;
use nu_protocol::engine::{Command, EvaluationContext};
use nu_protocol::{ShellError, Signature, SyntaxShape, Value};
@ -28,92 +25,19 @@ impl Command for Source {
fn run(
&self,
_context: &EvaluationContext,
context: &EvaluationContext,
call: &Call,
input: Value,
) -> Result<Value, ShellError> {
let block = &call.positional[0];
// Note: this hidden positional is the block_id that corresponded to the 0th position
// it is put here by the parser
let block_id: i64 = call.req(context, 1)?;
Ok(eval_expression(_context, block)?)
let block = context
.engine_state
.borrow()
.get_block(block_id as usize)
.clone();
eval_block(context, &block, input)
}
}
// pub fn source(ctx: &EvaluationContext, call: &Call, input: Value) -> Result<Value, ShellError> {
// let filename = call.positional[0]
// .as_string()
// .expect("internal error: missing file name");
// let source_file = Path::new(&filename);
// // This code is in the current Nushell version
// // ...Not entirely sure what it's doing or if there's an equivalent in engine-q
// // Note: this is a special case for setting the context from a command
// // In this case, if we don't set it now, we'll lose the scope that this
// // variable should be set into.
// // let lib_dirs = &ctx
// // .configs()
// // .lock()
// // .global_config
// // .as_ref()
// // .map(|configuration| match configuration.var("lib_dirs") {
// // Some(paths) => paths
// // .table_entries()
// // .cloned()
// // .map(|path| path.as_string())
// // .collect(),
// // None => vec![],
// // });
// // if let Some(dir) = lib_dirs {
// // for lib_path in dir {
// // match lib_path {
// // Ok(name) => {
// // let path = PathBuf::from(name).join(source_file);
// // if let Ok(contents) =
// // std::fs::read_to_string(&expand_path(Cow::Borrowed(path.as_path())))
// // {
// // let result = script::run_script_standalone(contents, true, ctx, false);
// // if let Err(err) = result {
// // ctx.error(err);
// // }
// // return Ok(OutputStream::empty());
// // }
// // }
// // Err(reason) => {
// // ctx.error(reason.clone());
// // }
// // }
// // }
// // }
// // This is to stay consistent w/ the code taken from nushell
// let path = source_file;
// let contents = std::fs::read(path);
// match contents {
// Ok(contents) => {
// let engine_state = EngineState::new();
// let mut working_set = StateWorkingSet::new(&engine_state);
// let (block, err) = parse(&mut working_set, None, &contents, true);
// if let Some(e) = err {
// // Be more specific here: need to convert parse error to string
// Err(e.into())
// } else {
// let result = eval_block(ctx, &block, input);
// match result {
// Err(e) => Err(e),
// _ => Ok(Value::nothing()),
// }
// }
// }
// Err(_) => Err(ShellError::InternalError(
// "Can't load file to source".to_string(),
// )),
// }
// }