mingzailao
/
powerlevel10k
mirror of https://github.com/romkatv/powerlevel10k.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixes multiple truncate_to_unique inconsistencies 

1. also truncate first dir
2. length of `POWERLEVEL9K_SHORTEN_DELIMITER` is now taken into account
3. set `POWERLEVEL9K_SHORTEN_DIR_LENGTH=0` to truncate even the last dir
pull/73/head
Syphdias 2019-05-25 21:05:42 +02:00
parent bbebf516ab
commit 6c61fb5c20
No known key found for this signature in database
GPG Key ID: 6F62E6FB3E67F92D
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
powerlevel9k.zsh-theme
View File

@ -836,8 +836,8 @@ prompt_dir() {
;; ;;
truncate_to_unique) truncate_to_unique)
local -i i=2 n=1 local -i i=2 n=1
[[ $p == /* ]] && (( ++i )) delim=${POWERLEVEL9K_SHORTEN_DELIMITER-'*'}
(( POWERLEVEL9K_SHORTEN_DIR_LENGTH > 0 )) && n=POWERLEVEL9K_SHORTEN_DIR_LENGTH (( POWERLEVEL9K_SHORTEN_DIR_LENGTH >= 0 )) && n=POWERLEVEL9K_SHORTEN_DIR_LENGTH
local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-'(.bzr|CVS|.git|.hg|.svn|.citc)'} local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-'(.bzr|CVS|.git|.hg|.svn|.citc)'}
local parent="${PWD%/${(pj./.)parts[i,-1]}}" local parent="${PWD%/${(pj./.)parts[i,-1]}}"
for (( ; i <= $#parts - n; ++i )); do for (( ; i <= $#parts - n; ++i )); do
@ -850,14 +850,13 @@ prompt_dir() {
fi fi
fi fi
local -i j=1 local -i j=1
for (( ; j < $#dir; ++j )); do for (( ; j + $#delim < $#dir; ++j )); do
local -a matching=($parent/$dir[1,j]*/(N)) local -a matching=($parent/$dir[1,j]*/(N))
(( $#matching == 1 )) && break (( $#matching == 1 )) && break
done done
(( j == $#dir )) || parts[i]=$dir[1,j]$'\0' (( j + $#delim >= $#dir )) || parts[i]=$dir[1,j]$'\0'
parent+=/$dir parent+=/$dir
done done
delim=${POWERLEVEL9K_SHORTEN_DELIMITER-'*'}
;; ;;
truncate_with_folder_marker) truncate_with_folder_marker)
local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-.shorten_folder_marker} local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-.shorten_folder_marker}