extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-03-13 06:58:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Include symlinks in directory completions (#15268)

Browse Source 
Fixes #15077

# Description

Symlinks are currently not shown in directory completions. #14667
modified completions so that symlinks wouldn't be suggested with
trailing slashes, but it did this by treating symlinks as files. This PR
includes symlinks to directories when completing directories, but still
suggests them without trailing slashes.

# User-Facing Changes

Directory completions will once again include symlinks.

# Tests + Formatting

# After Submitting
This commit is contained in:
Yash Thakur 2025-03-12 09:13:41 -04:00 committed by GitHub
parent 430b2746b8
commit a17ffdfe56
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/nu-cli/src/completions/completion_common.rs
View File

@ -65,10 +65,11 @@ fn complete_rec(
for entry in result.filter_map(|e| e.ok()) {
let entry_name = entry.file_name().to_string_lossy().into_owned();
let entry_isdir = entry.path().is_dir() && !entry.path().is_symlink();
let entry_isdir = entry.path().is_dir();
let mut built = built.clone();
built.parts.push(entry_name.clone());
built.isdir = entry_isdir;
// Symlinks to directories shouldn't have a trailing slash (#13275)
built.isdir = entry_isdir && !entry.path().is_symlink();
if !want_directory || entry_isdir {
matcher.add(entry_name.clone(), (entry_name, built));

21
crates/nu-cli/tests/completions/mod.rs
View File

@ -307,7 +307,12 @@ fn custom_arguments_and_subcommands() {
let completion_str = "foo test";
let suggestions = completer.complete(completion_str, completion_str.len());
// including both subcommand and directory completions
let expected = ["foo test bar".into(), folder("test_a"), folder("test_b")];
let expected = [
"foo test bar".into(),
folder("test_a"),
file("test_a_symlink"),
folder("test_b"),
];
match_suggestions_by_string(&expected, &suggestions);
}
@ -1492,6 +1497,7 @@ fn folder_with_directorycompletions() {
folder(dir.join("another")),
folder(dir.join("directory_completion")),
folder(dir.join("test_a")),
file(dir.join("test_a_symlink")),
folder(dir.join("test_b")),
folder(dir.join(".hidden_folder")),
];
@ -1594,6 +1600,12 @@ fn folder_with_directorycompletions_with_three_trailing_dots() {
.join("...")
.join("test_a"),
),
file(
dir.join("directory_completion")
.join("folder_inside_folder")
.join("...")
.join("test_a_symlink"),
),
folder(
dir.join("directory_completion")
.join("folder_inside_folder")
@ -1666,6 +1678,13 @@ fn folder_with_directorycompletions_do_not_collapse_dots() {
.join("..")
.join("test_a"),
),
file(
dir.join("directory_completion")
.join("folder_inside_folder")
.join("..")
.join("..")
.join("test_a_symlink"),
),
folder(
dir.join("directory_completion")
.join("folder_inside_folder")