extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-05-30 06:39:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(completion): ls_color for ~/xxx symlinks (#15403)

Browse Source 
# Description

Get style with expanded real path, so that symlinks get highlighted
correctly.

# User-Facing Changes

Before:

<img width="255" alt="image"
src="https://github.com/user-attachments/assets/b1a11cb8-e3d3-4287-bb3b-7d0ec36ba51f"
/>

After:

<img width="255" alt="image"
src="https://github.com/user-attachments/assets/71476b2c-6a31-4d37-8d25-b187a6b4e4d5"
/>


# Tests + Formatting

# After Submitting
This commit is contained in:
zc he 2025-03-24 20:50:38 +08:00 committed by GitHub
parent 6aed1b42ae
commit bf1f2d5ebd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,10 +199,9 @@ pub fn complete_item(
let ls_colors = (engine_state.config.completions.use_ls_colors let ls_colors = (engine_state.config.completions.use_ls_colors
&& engine_state.config.use_ansi_coloring.get(engine_state)) && engine_state.config.use_ansi_coloring.get(engine_state))
.then(|| { .then(|| {
let ls_colors_env_str = match stack.get_env_var(engine_state, "LS_COLORS") { let ls_colors_env_str = stack
Some(v) => env_to_string("LS_COLORS", v, engine_state, stack).ok(), .get_env_var(engine_state, "LS_COLORS")
None => None, .and_then(|v| env_to_string("LS_COLORS", v, engine_state, stack).ok());
};
get_ls_colors(ls_colors_env_str) get_ls_colors(ls_colors_env_str)
}); });
@ -264,15 +263,12 @@ pub fn complete_item(
} }
let is_dir = p.isdir; let is_dir = p.isdir;
let path = original_cwd.apply(p, path_separator); let path = original_cwd.apply(p, path_separator);
let real_path = expand_to_real_path(&path);
let metadata = std::fs::symlink_metadata(&real_path).ok();
let style = ls_colors.as_ref().map(|lsc| { let style = ls_colors.as_ref().map(|lsc| {
lsc.style_for_path_with_metadata( lsc.style_for_path_with_metadata(&real_path, metadata.as_ref())
&path, .map(lscolors::Style::to_nu_ansi_term_style)
std::fs::symlink_metadata(expand_to_real_path(&path)) .unwrap_or_default()
.ok()
.as_ref(),
)
.map(lscolors::Style::to_nu_ansi_term_style)
.unwrap_or_default()
}); });
FileSuggestion { FileSuggestion {
span, span,