mirror of
https://github.com/nushell/nushell.git
synced 2025-08-09 20:47:44 +02:00
ls, rm, cp, open, touch, mkdir: Don't expand tilde if input path is quoted string or a variable. (#12232)
# Description Fixes: #11887 Fixes: #11626 This pr unify the tilde expand behavior over several filesystem relative commands. It follows the same rule with glob expansion: | command | result | | ----------- | ------ | | ls ~/aaa | expand tilde | ls "~/aaa" | don't expand tilde | let f = "~/aaa"; ls $f | don't expand tilde, if you want to: use `ls ($f \| path expand)` | let f: glob = "~/aaa"; ls $f | expand tilde, they don't expand on `mkdir`, `touch` comamnd. Actually I'm not sure for 4th item, currently it's expanding is just because it followes the same rule with glob expansion. ### About the change It changes `expand_path_with` to accept a new argument called `expand_tilde`, if it's true, expand it, if not, just keep it as `~` itself. # User-Facing Changes After this change, `ls "~/aaa"` won't expand tilde. # Tests + Formatting Done
This commit is contained in:
@ -711,3 +711,25 @@ fn list_empty_string() {
|
||||
assert!(actual.err.contains("does not exist"));
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn list_with_tilde() {
|
||||
Playground::setup("ls_tilde", |dirs, sandbox| {
|
||||
sandbox
|
||||
.within("~tilde")
|
||||
.with_files(vec![EmptyFile("f1.txt"), EmptyFile("f2.txt")]);
|
||||
|
||||
let actual = nu!(cwd: dirs.test(), "ls '~tilde'");
|
||||
assert!(actual.out.contains("f1.txt"));
|
||||
assert!(actual.out.contains("f2.txt"));
|
||||
assert!(actual.out.contains("~tilde"));
|
||||
let actual = nu!(cwd: dirs.test(), "ls ~tilde");
|
||||
assert!(actual.err.contains("does not exist"));
|
||||
|
||||
// pass variable
|
||||
let actual = nu!(cwd: dirs.test(), "let f = '~tilde'; ls $f");
|
||||
assert!(actual.out.contains("f1.txt"));
|
||||
assert!(actual.out.contains("f2.txt"));
|
||||
assert!(actual.out.contains("~tilde"));
|
||||
})
|
||||
}
|
||||
|
Reference in New Issue
Block a user