extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-02-17 02:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

ls .file and ls **/.* show hidden files (#2379)

Browse Source
This commit is contained in:
Matt Clarke 2020-08-22 03:49:34 +02:00 committed by GitHub
parent 8f568f4fc5
commit d65a38dd41
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-cli/src/shell/filesystem_shell.rs
View File

@ -125,6 +125,8 @@ impl Shell for FilesystemShell {
}
};
let hidden_dir_specified = is_hidden_dir(&path);
let mut paths = glob::glob(&path.to_string_lossy())
.map_err(|e| ShellError::labeled_error(e.to_string(), "invalid pattern", &p_tag))?
.peekable();
@ -145,7 +147,7 @@ impl Shell for FilesystemShell {
Err(err) => return Some(Err(err)),
};
if !all && is_hidden_dir(&path) {
if !all && !hidden_dir_specified && is_hidden_dir(&path) {
return None;
}

59
crates/nu-cli/tests/commands/ls.rs
View File

@ -155,6 +155,65 @@ fn list_files_from_two_parents_up_using_multiple_dots() {
})
}
#[test]
fn lists_hidden_file_when_explicitly_specified() {
Playground::setup("ls_test_7", |dirs, sandbox| {
sandbox.with_files(vec![
EmptyFile("los.txt"),
EmptyFile("tres.txt"),
EmptyFile("amigos.txt"),
EmptyFile("arepas.clu"),
EmptyFile(".testdotfile"),
]);
let actual = nu!(
cwd: dirs.test(), pipeline(
r#"
ls .testdotfile
| count
| echo $it
"#
));
assert_eq!(actual.out, "1");
})
}
#[test]
fn lists_all_hidden_files_when_glob_contains_dot() {
Playground::setup("ls_test_8", |dirs, sandbox| {
sandbox
.with_files(vec![
EmptyFile("root1.txt"),
EmptyFile("root2.txt"),
EmptyFile(".dotfile1"),
])
.within("dir_a")
.with_files(vec![
EmptyFile("yehuda.10.txt"),
EmptyFile("jonathan.10.txt"),
EmptyFile(".dotfile2"),
])
.within("dir_b")
.with_files(vec![
EmptyFile("andres.10.txt"),
EmptyFile("chicken_not_to_be_picked_up.100.txt"),
EmptyFile(".dotfile3"),
]);
let actual = nu!(
cwd: dirs.test(), pipeline(
r#"
ls **/.*
| count
| echo $it
"#
));
assert_eq!(actual.out, "3");
})
}
#[test]
fn list_all_columns() {
Playground::setup(