mirror of
https://github.com/IlanCosman/tide.git
synced 2024-09-11 09:05:37 +03:00
Minor improvements to pwd
This commit is contained in:
parent
51fb1db7c3
commit
a110101b4e
@ -1,16 +1,14 @@
|
||||
function _tide_pwd
|
||||
set -l color_dirs (set_color $tide_pwd_color_dirs || echo)
|
||||
set -l color_anchors (set_color -o $tide_pwd_color_anchors || echo)
|
||||
set -l keep_background_color (set_color normal -b $tide_pwd_bg_color || echo)
|
||||
set -l color_truncated_dirs (set_color $tide_pwd_color_truncated_dirs || echo)
|
||||
set -l reset_to_color_dirs (set_color normal -b $tide_pwd_bg_color; set_color $tide_pwd_color_dirs)
|
||||
|
||||
set -l split_pwd (string replace -- $HOME '~' $PWD | string split /)
|
||||
set -l split_pwd_for_length $split_pwd
|
||||
set -l split_pwd_for_output $split_pwd
|
||||
|
||||
# Anchor first and last directories
|
||||
set split_pwd_for_output[1] $color_anchors$split_pwd[1]$keep_background_color$color_dirs
|
||||
set split_pwd_for_output[-1] $color_anchors$split_pwd[-1]$keep_background_color$color_dirs
|
||||
# Anchor first and last directories (which may be the same)
|
||||
set -l split_pwd_for_output $color_anchors$split_pwd[1]$reset_to_color_dirs $split_pwd[2..]
|
||||
set split_pwd_for_output[-1] $color_anchors$split_pwd[-1]$reset_to_color_dirs
|
||||
|
||||
set -l icon $tide_pwd_icon_dir' '
|
||||
if not test -w $PWD
|
||||
@ -22,24 +20,24 @@ function _tide_pwd
|
||||
set -g pwd_length (string length "$icon"(string join / $split_pwd_for_length))
|
||||
|
||||
i=1 for dir_section in $split_pwd[2..-2]
|
||||
set -l parent_dir (string join -- / $split_pwd[1..$i] | string replace '~' $HOME) # Use i from before increment
|
||||
set -l parent_dir (string join -- / $split_pwd[..$i] | string replace '~' $HOME) # Uses i before increment
|
||||
|
||||
set i (math $i + 1)
|
||||
|
||||
# Returns true if any markers exist in dir_section
|
||||
if test -z false (string split --max 2 " " -- "-o -e "$parent_dir/$dir_section/$tide_pwd_markers)
|
||||
set split_pwd_for_output[$i] $color_anchors$dir_section$keep_background_color$color_dirs
|
||||
set split_pwd_for_output[$i] $color_anchors$dir_section$reset_to_color_dirs
|
||||
else if test $pwd_length -gt $dist_btwn_sides
|
||||
while set -l truncation_length (math $truncation_length + 1) &&
|
||||
set -l truncated (string sub --length $truncation_length -- $dir_section) &&
|
||||
test $truncated != $dir_section -a (count $parent_dir/$truncated*/) -gt 1
|
||||
end
|
||||
set split_pwd_for_length[$i] $truncated
|
||||
set split_pwd_for_output[$i] $color_truncated_dirs$truncated$keep_background_color$color_dirs
|
||||
set split_pwd_for_output[$i] $color_truncated_dirs$truncated$reset_to_color_dirs
|
||||
set pwd_length (string length "$icon"(string join / $split_pwd_for_length)) # Update length
|
||||
end
|
||||
end
|
||||
|
||||
printf '%s' $color_dirs $icon
|
||||
printf '%s' $reset_to_color_dirs $icon
|
||||
string join -- / $split_pwd_for_output
|
||||
end
|
||||
|
Loading…
Reference in New Issue
Block a user