Customization/powerlevel10k
1
0
Fork 0
mirror of https://github.com/romkatv/powerlevel10k.git synced 2024-11-16 17:50:09 +00:00
Code Releases Activity

fix a bug in initialization of 'd'; use '_p9k_prompt_length $d' as the default value of POWERLEVEL9K_SHORTEN_DELIMITER_LENGTH

Browse source
This commit is contained in:
romkatv 2019-05-27 17:21:30 +02:00
parent 8956e47698
commit 3be988cae8
1 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
powerlevel9k.zsh-theme
View file

@ -759,6 +759,12 @@ set_default POWERLEVEL9K_DIR_PATH_SEPARATOR_FOREGROUND ""
# Individual elements are patterns. They are expanded with the options set by `emulate zsh`. # Individual elements are patterns. They are expanded with the options set by `emulate zsh`.
set_default -a POWERLEVEL9K_DIR_PACKAGE_FILES package.json composer.json set_default -a POWERLEVEL9K_DIR_PACKAGE_FILES package.json composer.json
function _p9k_shorten_delim_len() {
local def=$1
_P9K_RETVAL=${POWERLEVEL9K_SHORTEN_DELIMITER_LENGTH:--1}
(( _P9K_RETVAL >= 0 )) || _p9k_prompt_length $1
}
################################################################ ################################################################
# Dir: current working directory # Dir: current working directory
prompt_dir() { prompt_dir() {
@ -791,25 +797,27 @@ prompt_dir() {
local -i fake_first=0 local -i fake_first=0
local delim=${POWERLEVEL9K_SHORTEN_DELIMITER-$'\u2026'} local delim=${POWERLEVEL9K_SHORTEN_DELIMITER-$'\u2026'}
local -i shortenlen=${POWERLEVEL9K_SHORTEN_DIR_LENGTH:--1} local -i shortenlen=${POWERLEVEL9K_SHORTEN_DIR_LENGTH:--1}
local -i d=${POWERLEVEL9K_SHORTEN_DELIMITER_LENGTH:-$#POWERLEVEL9K_SHORTEN_DELIMITER}
case $POWERLEVEL9K_SHORTEN_STRATEGY in case $POWERLEVEL9K_SHORTEN_STRATEGY in
truncate_absolute|truncate_absolute_chars) truncate_absolute|truncate_absolute_chars)
if (( shortenlen > 0 && $#p > shortenlen + d )); then if (( shortenlen > 0 && $#p > shortenlen )); then
local -i n=shortenlen _p9k_shorten_delim_len $delim
local -i i=$#parts if (( $#p > shortenlen + $_P9K_RETVAL )); then
while true; do local -i n=shortenlen
local dir=$parts[i] local -i i=$#parts
local -i len=$(( $#dir + (i > 1) )) while true; do
if (( len <= n )); then local dir=$parts[i]
(( n -= len )) local -i len=$(( $#dir + (i > 1) ))
(( --i )) if (( len <= n )); then
else (( n -= len ))
parts[i]=$'\0'$dir[-n,-1] (( --i ))
parts[1,i-1]=() else
break parts[i]=$'\0'$dir[-n,-1]
fi parts[1,i-1]=()
done break
fi
done
fi
fi fi
;; ;;
truncate_with_package_name|truncate_middle|truncate_from_right) truncate_with_package_name|truncate_middle|truncate_from_right)
@ -832,7 +840,8 @@ prompt_dir() {
done done
} }
if (( shortenlen > 0 )); then if (( shortenlen > 0 )); then
local -i pref=$shortenlen suf=0 i=2 _p9k_shorten_delim_len $delim
local -i d=_P9K_RETVAL pref=shortenlen suf=0 i=2
[[ $POWERLEVEL9K_SHORTEN_STRATEGY == truncate_middle ]] && suf=pref [[ $POWERLEVEL9K_SHORTEN_STRATEGY == truncate_middle ]] && suf=pref
for (( ; i < $#parts; ++i )); do for (( ; i < $#parts; ++i )); do
local dir=$parts[i] local dir=$parts[i]
@ -860,6 +869,8 @@ prompt_dir() {
local -i i=2 n=1 local -i i=2 n=1
[[ $p == /* ]] && (( ++i )) [[ $p == /* ]] && (( ++i ))
delim=${POWERLEVEL9K_SHORTEN_DELIMITER-'*'} delim=${POWERLEVEL9K_SHORTEN_DELIMITER-'*'}
_p9k_shorten_delim_len $delim
local -i d=_P9K_RETVAL
shortenlen=${POWERLEVEL9K_SHORTEN_DIR_LENGTH:-1} shortenlen=${POWERLEVEL9K_SHORTEN_DIR_LENGTH:-1}
(( shortenlen >= 0 )) && n=shortenlen (( shortenlen >= 0 )) && n=shortenlen
local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-'(.bzr|CVS|.git|.hg|.svn|.citc)'} local pat=${POWERLEVEL9K_SHORTEN_FOLDER_MARKER-'(.bzr|CVS|.git|.hg|.svn|.citc)'}