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

Fix use of export/alias --help bug (#5332)

Browse Source 
* fix alias --help bug

Signed-off-by: SuYuheng <yuheng.su@motiong.com>

* fix export --help bug

Signed-off-by: SuYuheng <yuheng.su@motiong.com>

Co-authored-by: SuYuheng <yuheng.su@motiong.com>
This commit is contained in:
gipsyh 2022-04-27 00:51:49 +08:00 committed by GitHub
parent 187f2454c8
commit fb8f7b114e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
crates/nu-parser/src/parse_keywords.rs
View File

@ -529,6 +529,18 @@ pub fn parse_alias(
expand_aliases_denylist, expand_aliases_denylist,
); );
if call.has_flag("help") {
return (
Pipeline::from_vec(vec![Expression {
expr: Expr::Call(call),
span: span(spans),
ty: Type::Any,
custom_completion: None,
}]),
None,
);
}
if spans.len() >= 4 { if spans.len() >= 4 {
let alias_name = working_set.get_span_contents(spans[1]); let alias_name = working_set.get_span_contents(spans[1]);

35
crates/nu-parser/src/parser.rs
View File

@ -4539,13 +4539,44 @@ pub fn parse_builtin_commands(
b"module" => parse_module(working_set, &lite_command.parts, expand_aliases_denylist), b"module" => parse_module(working_set, &lite_command.parts, expand_aliases_denylist),
b"use" => parse_use(working_set, &lite_command.parts, expand_aliases_denylist), b"use" => parse_use(working_set, &lite_command.parts, expand_aliases_denylist),
b"source" => parse_source(working_set, &lite_command.parts, expand_aliases_denylist), b"source" => parse_source(working_set, &lite_command.parts, expand_aliases_denylist),
b"export" => ( b"export" => {
if let Some(decl_id) = working_set.find_decl(b"alias") {
let (call, _) = parse_internal_call(
working_set,
lite_command.parts[0],
&lite_command.parts[1..],
decl_id,
expand_aliases_denylist,
);
if call.has_flag("help") {
(
Pipeline::from_vec(vec![Expression {
expr: Expr::Call(call),
span: span(&lite_command.parts),
ty: Type::Any,
custom_completion: None,
}]),
None,
)
} else {
(
garbage_pipeline(&lite_command.parts), garbage_pipeline(&lite_command.parts),
Some(ParseError::UnexpectedKeyword( Some(ParseError::UnexpectedKeyword(
"export".into(), "export".into(),
lite_command.parts[0], lite_command.parts[0],
)), )),
), )
}
} else {
(
garbage_pipeline(&lite_command.parts),
Some(ParseError::UnexpectedKeyword(
"export".into(),
lite_command.parts[0],
)),
)
}
}
b"hide" => parse_hide(working_set, &lite_command.parts, expand_aliases_denylist), b"hide" => parse_hide(working_set, &lite_command.parts, expand_aliases_denylist),
#[cfg(feature = "plugin")] #[cfg(feature = "plugin")]
b"register" => parse_register(working_set, &lite_command.parts, expand_aliases_denylist), b"register" => parse_register(working_set, &lite_command.parts, expand_aliases_denylist),