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

Fix ls panics when a file or directory not exists (#6148)

Browse Source 
* Fix ls panics when a file or directory not exists

Fixes #6146

Signed-off-by: nibon7 <nibon7@163.com>

* add test

Signed-off-by: nibon7 <nibon7@163.com>
This commit is contained in:
nibon7 2022-07-27 23:53:00 +08:00 committed by GitHub
parent c92211c016
commit 4c6cf36aa5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crates/nu-command/src/filesystem/ls.rs
View File

@ -147,9 +147,13 @@ impl Command for Ls {
Some(glob_options)
};
let (prefix, paths) =
nu_engine::glob_from(&glob_path, &cwd, call_span, glob_options)
.expect("glob failure");
match nu_engine::glob_from(&glob_path, &cwd, call_span, glob_options) {
Ok((prefix, paths)) => (prefix, paths),
Err(e) => {
shell_errors.push(e);
return Vec::from([Value::nothing(call_span)]).into_iter();
}
};
let mut paths_peek = paths.peekable();
if paths_peek.peek().is_none() {
shell_errors.push(ShellError::GenericError(

8
crates/nu-command/tests/commands/ls.rs
View File

@ -527,3 +527,11 @@ fn can_list_system_folder() {
));
assert_eq!(ls_with_filter.err, "");
}
#[test]
fn list_a_directory_not_exists() {
Playground::setup("ls_test_directory_not_exists", |dirs, _sandbox| {
let actual = nu!(cwd: dirs.test(), "ls a_directory_not_exists");
assert!(actual.err.contains("directory not found"));
})
}