mirror of
https://github.com/nushell/nushell.git
synced 2024-11-22 00:13:21 +01:00
Fix Default Prompt Tilde Insertion Logic (#10539)
This pr closes #10521. # Description The default prompt by nushell will replace `$nu.home-path` with `~`. E.g. for a user named `user`, `/home/user` would become `~`. This also works with sub paths, e.g. `/home/user/docs` would become `~/docs`. The issue is that this replacement was a tad overzealous. A path like `/home/user-with-suffix` would become `~-with-suffix`. This PR fixes the issue by updating the home path detection logic. # User-Facing Changes The bugged behavior no longer occurs. # Tests + Formatting * `cargo` checks were not performed as this does not touch rust. * The updated logic was tested against [elvish](https://github.com/elves/elvish)'s path replacement logic, for ~10,000 randomly selected folders on a linux server. All paths were processed the same.
This commit is contained in:
parent
80a183dde2
commit
d6b9153ac5
@ -5,10 +5,21 @@
|
||||
def create_left_prompt [] {
|
||||
let home = $nu.home-path
|
||||
|
||||
let dir = ([
|
||||
($env.PWD | str substring 0..($home | str length) | str replace $home "~"),
|
||||
($env.PWD | str substring ($home | str length)..)
|
||||
] | str join)
|
||||
# Perform tilde substitution on dir
|
||||
# To determine if the prefix of the path matches the home dir, we split the current path into
|
||||
# segments, and compare those with the segments of the home dir. In cases where the current dir
|
||||
# is a parent of the home dir (e.g. `/home`, homedir is `/home/user`), this comparison will
|
||||
# also evaluate to true. Inside the condition, we attempt to str replace `$home` with `~`.
|
||||
# Inside the condition, either:
|
||||
# 1. The home prefix will be replaced
|
||||
# 2. The current dir is a parent of the home dir, so it will be uneffected by the str replace
|
||||
let dir = (
|
||||
if ($env.PWD | path split | zip ($home | path split) | all { $in.0 == $in.1 }) {
|
||||
($env.PWD | str replace $home "~")
|
||||
} else {
|
||||
$env.PWD
|
||||
}
|
||||
)
|
||||
|
||||
let path_color = (if (is-admin) { ansi red_bold } else { ansi green_bold })
|
||||
let separator_color = (if (is-admin) { ansi light_red_bold } else { ansi light_green_bold })
|
||||
|
Loading…
Reference in New Issue
Block a user