holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Collapse some help commands columns into a single column (#7052)

Browse Source
This commit is contained in:
Dan Davison 2022-11-09 20:44:32 -05:00 committed by GitHub
parent 24d72ca43c
commit fe14e52e77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
crates/nu-command/src/core_commands/help.rs
View File

@ -136,21 +136,9 @@ fn help(
span: head, span: head,
}); });
cols.push("is_plugin".into()); cols.push("command_type".into());
vals.push(Value::Bool { vals.push(Value::String {
val: decl.is_plugin().is_some(), val: format!("{:?}", decl.command_type()).to_lowercase(),
span: head,
});
cols.push("is_custom".into());
vals.push(Value::Bool {
val: decl.is_custom_command(),
span: head,
});
cols.push("is_keyword".into());
vals.push(Value::Bool {
val: decl.is_parser_keyword(),
span: head, span: head,
}); });
@ -247,21 +235,9 @@ fn help(
span: head, span: head,
}); });
cols.push("is_plugin".into()); cols.push("command_type".into());
vals.push(Value::Bool { vals.push(Value::String {
val: decl.is_plugin().is_some(), val: format!("{:?}", decl.command_type()).to_lowercase(),
span: head,
});
cols.push("is_custom".into());
vals.push(Value::Bool {
val: decl.is_custom_command(),
span: head,
});
cols.push("is_keyword".into());
vals.push(Value::Bool {
val: decl.is_parser_keyword(),
span: head, span: head,
}); });

24
crates/nu-protocol/src/engine/command.rs
View File

@ -4,6 +4,15 @@ use crate::{ast::Call, BlockId, Example, PipelineData, ShellError, Signature};
use super::{EngineState, Stack}; use super::{EngineState, Stack};
#[derive(Debug)]
pub enum CommandType {
Builtin,
Custom,
Keyword,
Plugin,
Other,
}
pub trait Command: Send + Sync + CommandClone { pub trait Command: Send + Sync + CommandClone {
fn name(&self) -> &str; fn name(&self) -> &str;
@ -71,6 +80,21 @@ pub trait Command: Send + Sync + CommandClone {
fn search_terms(&self) -> Vec<&str> { fn search_terms(&self) -> Vec<&str> {
vec![] vec![]
} }
fn command_type(&self) -> CommandType {
match (
self.is_builtin(),
self.is_custom_command(),
self.is_parser_keyword(),
self.is_plugin().is_some(),
) {
(true, false, false, false) => CommandType::Builtin,
(false, true, false, false) => CommandType::Custom,
(_, false, true, false) => CommandType::Keyword,
(false, false, false, true) => CommandType::Plugin,
_ => CommandType::Other,
}
}
} }
pub trait CommandClone { pub trait CommandClone {