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

Rename overlay commands (#6375)

Browse Source 
* rename from overlay add to overlay use

* rename from overlay remove to overlay hide

* rename add to use_
This commit is contained in:
WindSoilder
2022-08-21 22:27:56 +08:00
committed by GitHub
parent c5ca839294
commit 9c4bbe3c63
10 changed files with 138 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-parser/src/errors.rs
View File

@ -152,13 +152,13 @@ pub enum ParseError {
)]
CantRemoveLastOverlay(#[label = "this is the last overlay, can't remove it"] Span),
#[error("Cannot remove default overlay.")]
#[error("Cannot hide default overlay.")]
#[diagnostic(
code(nu::parser::cant_remove_default_overlay),
code(nu::parser::cant_hide_default_overlay),
url(docsrs),
help("'{0}' is a default overlay. Default overlays cannot be removed.")
help("'{0}' is a default overlay. Default overlays cannot be hidden.")
)]
CantRemoveDefaultOverlay(String, #[label = "can't remove overlay"] Span),
CantHideDefaultOverlay(String, #[label = "can't hide overlay"] Span),
#[error("Cannot add overlay.")]
#[diagnostic(code(nu::parser::cant_add_overlay_help), url(docsrs), help("{0}"))]
@ -345,7 +345,7 @@ impl ParseError {
ParseError::ActiveOverlayNotFound(s) => *s,
ParseError::OverlayPrefixMismatch(_, _, s) => *s,
ParseError::CantRemoveLastOverlay(s) => *s,
ParseError::CantRemoveDefaultOverlay(_, s) => *s,
ParseError::CantHideDefaultOverlay(_, s) => *s,
ParseError::CantAddOverlayHelp(_, s) => *s,
ParseError::NotFound(s) => *s,
ParseError::DuplicateCommandDef(s) => *s,

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

@ -1823,8 +1823,8 @@ pub fn parse_overlay(
let subcommand = working_set.get_span_contents(spans[1]);
match subcommand {
b"add" => {
return parse_overlay_add(working_set, spans, expand_aliases_denylist);
b"use" => {
return parse_overlay_use(working_set, spans, expand_aliases_denylist);
}
b"list" => {
// TODO: Abstract this code blob, it's repeated all over the place:
@ -1884,8 +1884,8 @@ pub fn parse_overlay(
b"new" => {
return parse_overlay_new(working_set, spans, expand_aliases_denylist);
}
b"remove" => {
return parse_overlay_remove(working_set, spans, expand_aliases_denylist);
b"hide" => {
return parse_overlay_hide(working_set, spans, expand_aliases_denylist);
}
_ => { /* continue parsing overlay */ }
}
@ -2045,23 +2045,23 @@ pub fn parse_overlay_new(
(pipeline, None)
}
pub fn parse_overlay_add(
pub fn parse_overlay_use(
working_set: &mut StateWorkingSet,
spans: &[Span],
expand_aliases_denylist: &[usize],
) -> (Pipeline, Option<ParseError>) {
if spans.len() > 1 && working_set.get_span_contents(span(&spans[0..2])) != b"overlay add" {
if spans.len() > 1 && working_set.get_span_contents(span(&spans[0..2])) != b"overlay use" {
return (
garbage_pipeline(spans),
Some(ParseError::UnknownState(
"internal error: Wrong call name for 'overlay add' command".into(),
"internal error: Wrong call name for 'overlay use' command".into(),
span(spans),
)),
);
}
// TODO: Allow full import pattern as argument (requires custom naming of module/overlay)
let (call, call_span) = match working_set.find_decl(b"overlay add", &Type::Any) {
let (call, call_span) = match working_set.find_decl(b"overlay use", &Type::Any) {
Some(decl_id) => {
let ParsedInternalCall {
call,
@ -2097,7 +2097,7 @@ pub fn parse_overlay_add(
return (
garbage_pipeline(spans),
Some(ParseError::UnknownState(
"internal error: 'overlay add' declaration not found".into(),
"internal error: 'overlay use' declaration not found".into(),
span(spans),
)),
)
@ -2321,22 +2321,22 @@ pub fn parse_overlay_add(
(pipeline, error)
}
pub fn parse_overlay_remove(
pub fn parse_overlay_hide(
working_set: &mut StateWorkingSet,
spans: &[Span],
expand_aliases_denylist: &[usize],
) -> (Pipeline, Option<ParseError>) {
if spans.len() > 1 && working_set.get_span_contents(span(&spans[0..2])) != b"overlay remove" {
if spans.len() > 1 && working_set.get_span_contents(span(&spans[0..2])) != b"overlay hide" {
return (
garbage_pipeline(spans),
Some(ParseError::UnknownState(
"internal error: Wrong call name for 'overlay remove' command".into(),
"internal error: Wrong call name for 'overlay hide' command".into(),
span(spans),
)),
);
}
let call = match working_set.find_decl(b"overlay remove", &Type::Any) {
let call = match working_set.find_decl(b"overlay hide", &Type::Any) {
Some(decl_id) => {
let ParsedInternalCall {
call,
@ -2372,7 +2372,7 @@ pub fn parse_overlay_remove(
return (
garbage_pipeline(spans),
Some(ParseError::UnknownState(
"internal error: 'overlay remove' declaration not found".into(),
"internal error: 'overlay hide' declaration not found".into(),
span(spans),
)),
)
@ -2410,7 +2410,7 @@ pub fn parse_overlay_remove(
if overlay_name == DEFAULT_OVERLAY_NAME {
return (
pipeline,
Some(ParseError::CantRemoveDefaultOverlay(
Some(ParseError::CantHideDefaultOverlay(
overlay_name,
overlay_name_span,
)),