Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-09-20 22:52:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Change how to identify custom comamnd (#6187)

Browse source 
Co-authored-by: Frank <v-frankz@microsoft.com>
This commit is contained in:
Kangaxx-0 2022-08-02 16:40:07 -07:00 committed by GitHub
parent ce6df93d05
commit ebf845f431
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crates/nu-command/src/core_commands/help.rs
View file

@ -142,7 +142,7 @@ fn help(
cols.push("is_custom".into());
vals.push(Value::Bool {
val: decl.get_block_id().is_some(),
val: decl.is_custom_command(),
span: head,
});
@ -243,7 +243,7 @@ fn help(
cols.push("is_custom".into());
vals.push(Value::Bool {
val: decl.get_block_id().is_some(),
val: decl.is_custom_command(),
span: head,
});

2
crates/nu-command/src/system/which_.rs
View file

@ -95,7 +95,7 @@ fn get_entry_in_aliases(engine_state: &EngineState, name: &str, span: Span) -> O
fn get_entry_in_commands(engine_state: &EngineState, name: &str, span: Span) -> Option<Value> {
if let Some(decl_id) = engine_state.find_decl(name.as_bytes(), &[]) {
let (msg, is_builtin) = if engine_state.get_decl(decl_id).get_block_id().is_some() {
let (msg, is_builtin) = if engine_state.get_decl(decl_id).is_custom_command() {
("Nushell custom command", false)
} else {
("Nushell built-in command", true)

4
crates/nu-engine/src/eval.rs
View file

@ -1101,7 +1101,7 @@ pub fn create_scope(
cols.push("is_builtin".to_string());
// we can only be a is_builtin or is_custom, not both
vals.push(Value::Bool {
val: decl.get_block_id().is_none(),
val: !decl.is_custom_command(),
span,
});
@ -1119,7 +1119,7 @@ pub fn create_scope(
cols.push("is_custom".to_string());
vals.push(Value::Bool {
val: decl.get_block_id().is_some(),
val: decl.is_custom_command(),
span,
});

4
crates/nu-parser/src/known_external.rs
View file

@ -30,6 +30,10 @@ impl Command for KnownExternal {
true
}
fn is_builtin(&self) -> bool {
false
}
fn run(
&self,
engine_state: &EngineState,

10
crates/nu-protocol/src/engine/command.rs
View file

@ -37,6 +37,16 @@ pub trait Command: Send + Sync + CommandClone {
false
}
// This is an enhanced method to determine if a command is custom command or not
// since extern "foo" [] and def "foo" [] behaves differently
fn is_custom_command(&self) -> bool {
if self.get_block_id().is_some() {
true
} else {
self.is_known_external()
}
}
// Is a sub command
fn is_sub(&self) -> bool {
self.name().contains(' ')