mirror of
https://github.com/nushell/nushell.git
synced 2025-08-16 16:01:55 +02:00
Rename overlay commands (#6375)
* rename from overlay add to overlay use * rename from overlay remove to overlay hide * rename add to use_
This commit is contained in:
WindSoilder
GitHub
@ -4,7 +4,7 @@ use nu_test_support::{nu, nu_repl_code, pipeline};
|
||||
fn add_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -19,8 +19,8 @@ fn add_overlay() {
|
||||
fn add_overlay_twice() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -35,7 +35,7 @@ fn add_overlay_twice() {
|
||||
fn add_prefixed_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"spam foo"#,
|
||||
];
|
||||
|
||||
@ -50,8 +50,8 @@ fn add_prefixed_overlay() {
|
||||
fn add_prefixed_overlay_twice() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"spam foo"#,
|
||||
];
|
||||
|
||||
@ -66,8 +66,8 @@ fn add_prefixed_overlay_twice() {
|
||||
fn add_prefixed_overlay_mismatch_1() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"overlay use spam"#,
|
||||
];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
@ -82,8 +82,8 @@ fn add_prefixed_overlay_mismatch_1() {
|
||||
fn add_prefixed_overlay_mismatch_2() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
@ -98,9 +98,9 @@ fn add_prefixed_overlay_mismatch_2() {
|
||||
fn prefixed_overlay_keeps_custom_decl() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"def bar [] { "bar" }"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bar"#,
|
||||
];
|
||||
|
||||
@ -115,7 +115,7 @@ fn prefixed_overlay_keeps_custom_decl() {
|
||||
fn add_overlay_env() {
|
||||
let inp = &[
|
||||
r#"module spam { export env FOO { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
|
||||
@ -130,7 +130,7 @@ fn add_overlay_env() {
|
||||
fn add_prefixed_overlay_env_no_prefix() {
|
||||
let inp = &[
|
||||
r#"module spam { export env FOO { "foo" } }"#,
|
||||
r#"overlay add --prefix spam"#,
|
||||
r#"overlay use --prefix spam"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
|
||||
@ -143,7 +143,7 @@ fn add_prefixed_overlay_env_no_prefix() {
|
||||
|
||||
#[test]
|
||||
fn add_overlay_from_file_decl() {
|
||||
let inp = &[r#"overlay add samples/spam.nu"#, r#"foo"#];
|
||||
let inp = &[r#"overlay use samples/spam.nu"#, r#"foo"#];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
|
||||
@ -155,7 +155,7 @@ fn add_overlay_from_file_decl() {
|
||||
// This one tests that the `nu_repl()` loop works correctly
|
||||
#[test]
|
||||
fn add_overlay_from_file_decl_cd() {
|
||||
let inp = &[r#"cd samples"#, r#"overlay add spam.nu"#, r#"foo"#];
|
||||
let inp = &[r#"cd samples"#, r#"overlay use spam.nu"#, r#"foo"#];
|
||||
|
||||
let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
|
||||
|
||||
@ -164,7 +164,7 @@ fn add_overlay_from_file_decl_cd() {
|
||||
|
||||
#[test]
|
||||
fn add_overlay_from_file_alias() {
|
||||
let inp = &[r#"overlay add samples/spam.nu"#, r#"bar"#];
|
||||
let inp = &[r#"overlay use samples/spam.nu"#, r#"bar"#];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
|
||||
@ -175,7 +175,7 @@ fn add_overlay_from_file_alias() {
|
||||
|
||||
#[test]
|
||||
fn add_overlay_from_file_env() {
|
||||
let inp = &[r#"overlay add samples/spam.nu"#, r#"$env.BAZ"#];
|
||||
let inp = &[r#"overlay use samples/spam.nu"#, r#"$env.BAZ"#];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
let actual_repl = nu!(cwd: "tests/overlays", nu_repl_code(inp));
|
||||
@ -188,7 +188,7 @@ fn add_overlay_from_file_env() {
|
||||
fn add_overlay_scoped() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"do { overlay add spam }"#,
|
||||
r#"do { overlay use spam }"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -206,9 +206,9 @@ fn add_overlay_scoped() {
|
||||
fn update_overlay_from_module() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"module spam { export def foo [] { "bar" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -223,9 +223,9 @@ fn update_overlay_from_module() {
|
||||
fn update_overlay_from_module_env() {
|
||||
let inp = &[
|
||||
r#"module spam { export env FOO { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"module spam { export env FOO { "bar" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
|
||||
@ -240,8 +240,8 @@ fn update_overlay_from_module_env() {
|
||||
fn remove_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -259,8 +259,8 @@ fn remove_overlay() {
|
||||
fn remove_last_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay remove"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay hide"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -278,8 +278,8 @@ fn remove_last_overlay() {
|
||||
fn remove_overlay_scoped() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"do { overlay remove spam }"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"do { overlay hide spam }"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -294,8 +294,8 @@ fn remove_overlay_scoped() {
|
||||
fn remove_overlay_env() {
|
||||
let inp = &[
|
||||
r#"module spam { export env FOO { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
|
||||
@ -310,8 +310,8 @@ fn remove_overlay_env() {
|
||||
fn remove_overlay_scoped_env() {
|
||||
let inp = &[
|
||||
r#"module spam { export env FOO { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"do { overlay remove spam }"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"do { overlay hide spam }"#,
|
||||
r#"$env.FOO"#,
|
||||
];
|
||||
|
||||
@ -337,7 +337,7 @@ fn list_default_overlay() {
|
||||
fn list_last_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay list | last"#,
|
||||
];
|
||||
|
||||
@ -352,7 +352,7 @@ fn list_last_overlay() {
|
||||
fn list_overlay_scoped() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"do { overlay list | last }"#,
|
||||
];
|
||||
|
||||
@ -366,9 +366,9 @@ fn list_overlay_scoped() {
|
||||
#[test]
|
||||
fn remove_overlay_discard_decl() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def bagr [] { "bagr" }"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -385,9 +385,9 @@ fn remove_overlay_discard_decl() {
|
||||
#[test]
|
||||
fn remove_overlay_discard_alias() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"alias bagr = "bagr""#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -404,9 +404,9 @@ fn remove_overlay_discard_alias() {
|
||||
#[test]
|
||||
fn remove_overlay_discard_env() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"let-env BAGR = `bagr`"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"$env.BAGR"#,
|
||||
];
|
||||
|
||||
@ -420,9 +420,9 @@ fn remove_overlay_discard_env() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_decl() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def bagr [] { "bagr" }"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -436,9 +436,9 @@ fn remove_overlay_keep_decl() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_alias() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"alias bagr = `bagr`"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -452,9 +452,9 @@ fn remove_overlay_keep_alias() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_env() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"let-env BAGR = `bagr`"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"$env.BAGR"#,
|
||||
];
|
||||
|
||||
@ -468,9 +468,9 @@ fn remove_overlay_keep_env() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_discard_overwritten_decl() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def foo [] { 'bar' }"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -487,9 +487,9 @@ fn remove_overlay_keep_discard_overwritten_decl() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_discard_overwritten_alias() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"alias bar = `baz`"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bar"#,
|
||||
];
|
||||
|
||||
@ -506,9 +506,9 @@ fn remove_overlay_keep_discard_overwritten_alias() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_discard_overwritten_env() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"let-env BAZ = `bagr`"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"$env.BAZ"#,
|
||||
];
|
||||
|
||||
@ -522,11 +522,11 @@ fn remove_overlay_keep_discard_overwritten_env() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_decl_in_latest_overlay() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def bagr [] { 'bagr' }"#,
|
||||
r#"module eggs { }"#,
|
||||
r#"overlay add eggs"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay use eggs"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -540,11 +540,11 @@ fn remove_overlay_keep_decl_in_latest_overlay() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_alias_in_latest_overlay() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"alias bagr = `bagr`"#,
|
||||
r#"module eggs { }"#,
|
||||
r#"overlay add eggs"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay use eggs"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"bagr"#,
|
||||
];
|
||||
|
||||
@ -558,11 +558,11 @@ fn remove_overlay_keep_alias_in_latest_overlay() {
|
||||
#[test]
|
||||
fn remove_overlay_keep_env_in_latest_overlay() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"let-env BAGR = `bagr`"#,
|
||||
r#"module eggs { }"#,
|
||||
r#"overlay add eggs"#,
|
||||
r#"overlay remove --keep-custom spam"#,
|
||||
r#"overlay use eggs"#,
|
||||
r#"overlay hide --keep-custom spam"#,
|
||||
r#"$env.BAGR"#,
|
||||
];
|
||||
|
||||
@ -576,10 +576,10 @@ fn remove_overlay_keep_env_in_latest_overlay() {
|
||||
#[test]
|
||||
fn preserve_overrides() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def foo [] { "new-foo" }"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -593,10 +593,10 @@ fn preserve_overrides() {
|
||||
#[test]
|
||||
fn reset_overrides() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"def foo [] { "new-foo" }"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay add samples/spam.nu"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"overlay use samples/spam.nu"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -623,7 +623,7 @@ fn overlay_keep_pwd() {
|
||||
let inp = &[
|
||||
r#"overlay new spam"#,
|
||||
r#"cd samples"#,
|
||||
r#"overlay remove --keep-env [ PWD ] spam"#,
|
||||
r#"overlay hide --keep-env [ PWD ] spam"#,
|
||||
r#"$env.PWD | path basename"#,
|
||||
];
|
||||
|
||||
@ -636,7 +636,7 @@ fn overlay_keep_pwd() {
|
||||
|
||||
#[test]
|
||||
fn overlay_wrong_rename_type() {
|
||||
let inp = &[r#"module spam {}"#, r#"overlay add spam as { echo foo }"#];
|
||||
let inp = &[r#"module spam {}"#, r#"overlay use spam as { echo foo }"#];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
|
||||
@ -647,7 +647,7 @@ fn overlay_wrong_rename_type() {
|
||||
fn overlay_add_renamed() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam as eggs --prefix"#,
|
||||
r#"overlay use spam as eggs --prefix"#,
|
||||
r#"eggs foo"#,
|
||||
];
|
||||
|
||||
@ -661,7 +661,7 @@ fn overlay_add_renamed() {
|
||||
#[test]
|
||||
fn overlay_add_renamed_from_file() {
|
||||
let inp = &[
|
||||
r#"overlay add samples/spam.nu as eggs --prefix"#,
|
||||
r#"overlay use samples/spam.nu as eggs --prefix"#,
|
||||
r#"eggs foo"#,
|
||||
];
|
||||
|
||||
@ -676,9 +676,9 @@ fn overlay_add_renamed_from_file() {
|
||||
fn overlay_cant_rename_existing_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam"#,
|
||||
r#"overlay remove spam"#,
|
||||
r#"overlay add spam as eggs"#,
|
||||
r#"overlay use spam"#,
|
||||
r#"overlay hide spam"#,
|
||||
r#"overlay use spam as eggs"#,
|
||||
];
|
||||
|
||||
let actual = nu!(cwd: "tests/overlays", pipeline(&inp.join("; ")));
|
||||
@ -692,8 +692,8 @@ fn overlay_cant_rename_existing_overlay() {
|
||||
fn overlay_can_add_renamed_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam as eggs --prefix"#,
|
||||
r#"overlay add spam --prefix"#,
|
||||
r#"overlay use spam as eggs --prefix"#,
|
||||
r#"overlay use spam --prefix"#,
|
||||
r#"(spam foo) + (eggs foo)"#,
|
||||
];
|
||||
|
||||
@ -708,8 +708,8 @@ fn overlay_can_add_renamed_overlay() {
|
||||
fn overlay_remove_renamed_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam as eggs"#,
|
||||
r#"overlay remove eggs"#,
|
||||
r#"overlay use spam as eggs"#,
|
||||
r#"overlay hide eggs"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
@ -724,9 +724,9 @@ fn overlay_remove_renamed_overlay() {
|
||||
fn overlay_remove_and_add_renamed_overlay() {
|
||||
let inp = &[
|
||||
r#"module spam { export def foo [] { "foo" } }"#,
|
||||
r#"overlay add spam as eggs"#,
|
||||
r#"overlay remove eggs"#,
|
||||
r#"overlay add eggs"#,
|
||||
r#"overlay use spam as eggs"#,
|
||||
r#"overlay hide eggs"#,
|
||||
r#"overlay use eggs"#,
|
||||
r#"foo"#,
|
||||
];
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@ fn parse_file_relative_to_parsed_file() {
|
||||
r#"
|
||||
source ../../foo.nu
|
||||
use ../lol_shell.nu
|
||||
overlay add ../../lol/lol_shell.nu
|
||||
overlay use ../../lol/lol_shell.nu
|
||||
|
||||
$'($env.FOO) (lol_shell ls) (ls)'
|
||||
"#,
|
||||
|
||||
Reference in New Issue
Block a user