Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-25 13:30:07 +00:00
Code Releases Activity

Fixed truncate_from_right to incl length of delim

Browse source 
Updated length test to include delimiter length.
Added comments
This commit is contained in:
Christo Kotze 2018-02-17 18:54:43 +04:00
parent 29620f3d81
commit b73af072c1
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
powerlevel9k.zsh-theme
View file

@ -725,7 +725,7 @@ set_default POWERLEVEL9K_DIR_PATH_HIGHLIGHT_BOLD false
prompt_dir() { prompt_dir() {
local current_dir="$(print -P "%~")" local current_dir="$(print -P "%~")"
local paths local paths
[[ current_dir != "/" ]] && paths=(${(s:/:)current_dir}) [[ current_dir != "/" ]] && paths=(${(s:/:)current_dir}) # only split if not root folder
local cur_path cur_short_path directory dir_length cur_dir local cur_path cur_short_path directory dir_length cur_dir
if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then if [[ -n "$POWERLEVEL9K_SHORTEN_DIR_LENGTH" || "$POWERLEVEL9K_SHORTEN_STRATEGY" == "truncate_with_folder_marker" ]]; then
@ -733,37 +733,37 @@ prompt_dir() {
case "$POWERLEVEL9K_SHORTEN_STRATEGY" in case "$POWERLEVEL9K_SHORTEN_STRATEGY" in
truncate_middle) truncate_middle)
if [[ $current_dir != "/" ]]; then if [[ $current_dir != "/" ]]; then # root is an exception and won't have paths
[[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' [[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' # if we are in the $HOME folder, we don't need starting /
local last_pos local last_pos
local max_length=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH * 2 )) local max_length=$(( $POWERLEVEL9K_SHORTEN_DIR_LENGTH * 2 )) # has to be double the length for beginning / end count
for directory in ${paths[@]} for directory in ${paths[@]} # go through all the paths
do do
cur_dir=$directory cur_dir=$directory
dir_length=${#cur_dir} dir_length=${#cur_dir}
if (( $dir_length > $max_length )) && [[ $cur_dir != $paths[${#paths}] ]]; then if (( $dir_length > $max_length )) && [[ $cur_dir != $paths[${#paths}] ]]; then # only shorten if long enough and not last path
last_pos=$(( $dir_length - $POWERLEVEL9K_SHORTEN_DIR_LENGTH )) last_pos=$(( $dir_length - $POWERLEVEL9K_SHORTEN_DIR_LENGTH ))
cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$POWERLEVEL9K_SHORTEN_DELIMITER${cur_dir:$last_pos:$dir_length} cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$POWERLEVEL9K_SHORTEN_DELIMITER${cur_dir:$last_pos:$dir_length}
fi fi
cur_short_path+="$cur_dir/" cur_short_path+="$cur_dir/"
done done
current_path="${cur_short_path: : -1}" current_path="${cur_short_path: : -1}" # remove trailing slash
else else
current_path="/" current_path="/"
fi fi
;; ;;
truncate_from_right) truncate_from_right)
if [[ $current_dir != "/" ]]; then if [[ $current_dir != "/" ]]; then # root is an exception and won't have paths
[[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' [[ $current_dir == '~'* ]] && cur_short_path='' || cur_short_path='/' # if we are in the $HOME folder, we don't need starting /
for directory in ${paths[@]} for directory in ${paths[@]}
do do
cur_dir=$directory cur_dir=$directory
if (( ${#cur_dir} > $POWERLEVEL9K_SHORTEN_DIR_LENGTH )) && [[ $cur_dir != $paths[${#paths}] ]]; then if (( ${#cur_dir} > $POWERLEVEL9K_SHORTEN_DIR_LENGTH + ${#POWERLEVEL9K_SHORTEN_DELIMITER} )) && [[ $cur_dir != $paths[${#paths}] ]]; then # only shorten if long enough and not last path
cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$POWERLEVEL9K_SHORTEN_DELIMITER cur_dir=${cur_dir:0:$POWERLEVEL9K_SHORTEN_DIR_LENGTH}$POWERLEVEL9K_SHORTEN_DELIMITER
fi fi
cur_short_path+="$cur_dir/" cur_short_path+="$cur_dir/"
done done
current_path="${cur_short_path: : -1}" current_path="${cur_short_path: : -1}" # remove trailing slash
else else
current_path="/" current_path="/"
fi fi