mirror of
https://github.com/nushell/nushell
synced 2024-12-28 22:13:10 +00:00
0a990ed105
Prior to this change we would recover the names for known externals by looking up the span in the engine state. This would fail when using an alias for two reasons: 1. In cases where we don't have a subcommand, like this: ``` >>> extern bat [filename: string] >>> alias b = bat >>> bat some_file 'b' is not recognized as an internal or external command, operable program or batch file. ``` The problem is that after alias expansion, we replace the span of the expanded name with the original alias (this is done to alleviate non-related issues). The span contents we look up therefore contain `b`, the alias, instead of the expanded command name. 2. In cases where there's a subcommand: ``` >>> alias g = git >>> g push thread 'main' panicked at 'internal error: span missing in file contents cache', crates\nu-protocol\src\engine\engine_state.rs:474:9 note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace ``` In this case, the span in call starts where the expansion for the `g` alias is defined and end after `push` on the last command entered. This is not a proper span and causes a panic when we try to look it up. Note that this is the case for all expanded aliases that involve a subcommand, but we never actually try to retrieve the contents for that span in other cases. Anyway, the new way of looking up the name is arguably cleaner regardless of the issues mentioned above. But it's nice that it fixes them too. Co-authored-by: Hristo Filaretov <h.filaretov@protonmail.com>
122 lines
3.5 KiB
Rust
122 lines
3.5 KiB
Rust
use nu_protocol::engine::{EngineState, Stack};
|
|
use nu_protocol::{
|
|
ast::{Argument, Call, Expr, Expression},
|
|
engine::Command,
|
|
ShellError, Signature,
|
|
};
|
|
use nu_protocol::{PipelineData, Spanned, Type};
|
|
|
|
#[derive(Clone)]
|
|
pub struct KnownExternal {
|
|
pub name: String,
|
|
pub signature: Box<Signature>,
|
|
pub usage: String,
|
|
}
|
|
|
|
impl Command for KnownExternal {
|
|
fn name(&self) -> &str {
|
|
&self.name
|
|
}
|
|
|
|
fn signature(&self) -> Signature {
|
|
*self.signature.clone()
|
|
}
|
|
|
|
fn usage(&self) -> &str {
|
|
&self.usage
|
|
}
|
|
|
|
fn is_known_external(&self) -> bool {
|
|
true
|
|
}
|
|
|
|
fn run(
|
|
&self,
|
|
engine_state: &EngineState,
|
|
stack: &mut Stack,
|
|
call: &Call,
|
|
input: PipelineData,
|
|
) -> Result<PipelineData, ShellError> {
|
|
let call_span = call.span();
|
|
let head_span = call.head;
|
|
let decl_id = engine_state
|
|
.find_decl("run-external".as_bytes())
|
|
.ok_or(ShellError::ExternalNotSupported(head_span))?;
|
|
|
|
let command = engine_state.get_decl(decl_id);
|
|
|
|
let mut extern_call = Call::new(head_span);
|
|
|
|
let extern_name = engine_state.get_decl(call.decl_id).name();
|
|
|
|
let extern_name: Vec<_> = extern_name.split(' ').collect();
|
|
|
|
let arg_extern_name = Expression {
|
|
expr: Expr::String(extern_name[0].to_string()),
|
|
span: call.head,
|
|
ty: Type::String,
|
|
custom_completion: None,
|
|
};
|
|
|
|
extern_call.add_positional(arg_extern_name);
|
|
|
|
for subcommand in extern_name.into_iter().skip(1) {
|
|
extern_call.add_positional(Expression {
|
|
expr: Expr::String(subcommand.to_string()),
|
|
span: call.head,
|
|
ty: Type::String,
|
|
custom_completion: None,
|
|
});
|
|
}
|
|
|
|
for arg in &call.arguments {
|
|
match arg {
|
|
Argument::Positional(positional) => extern_call.add_positional(positional.clone()),
|
|
Argument::Named(named) => {
|
|
if let Some(short) = &named.1 {
|
|
extern_call.add_positional(Expression {
|
|
expr: Expr::String(format!("-{}", short.item)),
|
|
span: named.0.span,
|
|
ty: Type::String,
|
|
custom_completion: None,
|
|
});
|
|
} else {
|
|
extern_call.add_positional(Expression {
|
|
expr: Expr::String(format!("--{}", named.0.item)),
|
|
span: named.0.span,
|
|
ty: Type::String,
|
|
custom_completion: None,
|
|
});
|
|
}
|
|
if let Some(arg) = &named.2 {
|
|
extern_call.add_positional(arg.clone());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
if call.redirect_stdout {
|
|
extern_call.add_named((
|
|
Spanned {
|
|
item: "redirect-stdout".into(),
|
|
span: call_span,
|
|
},
|
|
None,
|
|
None,
|
|
))
|
|
}
|
|
|
|
if call.redirect_stderr {
|
|
extern_call.add_named((
|
|
Spanned {
|
|
item: "redirect-stderr".into(),
|
|
span: call_span,
|
|
},
|
|
None,
|
|
None,
|
|
))
|
|
}
|
|
|
|
command.run(engine_state, stack, &extern_call, input)
|
|
}
|
|
}
|