Llewellyn/starship
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/starship.git synced 2025-02-03 20:48:30 +00:00
Code Issues Releases Activity

fix: fish_pwd option handles repeated directories properly (#399)

Browse Source
This commit is contained in:
Neil Kistner 2019-09-20 09:37:55 -05:00 committed by Matan Kushner
parent ac151f0ae8
commit cd892ebb60
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/directory.rs
View File

@ -145,7 +145,7 @@ fn truncate(dir_string: String, length: usize) -> String {
/// Contracted Path: `in_a/repo/but_nested` /// Contracted Path: `in_a/repo/but_nested`
/// With Fish Style: `/s/P/n/in_a/repo/but_nested` /// With Fish Style: `/s/P/n/in_a/repo/but_nested`
fn to_fish_style(pwd_dir_length: usize, dir_string: String, truncated_dir_string: &str) -> String { fn to_fish_style(pwd_dir_length: usize, dir_string: String, truncated_dir_string: &str) -> String {
let replaced_dir_string = dir_string.replace(truncated_dir_string, ""); let replaced_dir_string = dir_string.trim_end_matches(truncated_dir_string).to_owned();
let components = replaced_dir_string.split('/').collect::<Vec<&str>>(); let components = replaced_dir_string.split('/').collect::<Vec<&str>>();
if components.is_empty() { if components.is_empty() {
@ -283,4 +283,11 @@ mod tests {
let output = to_fish_style(2, path.to_string(), "repo/but_nested"); let output = to_fish_style(2, path.to_string(), "repo/but_nested");
assert_eq!(output, "/ab/Pa/no/in/"); assert_eq!(output, "/ab/Pa/no/in/");
} }
#[test]
fn fish_style_with_duplicate_directories() {
let path = "~/starship/tmp/C++/C++/C++";
let output = to_fish_style(1, path.to_string(), "C++");
assert_eq!(output, "~/s/t/C/C/");
}
} }