mirror of
https://github.com/romkatv/powerlevel10k.git
synced 2024-11-17 18:20:07 +00:00
Merge pull request #568 from dritter/fix_empty_delimiter
Fix empty delimiter
This commit is contained in:
commit
45fc45223c
2 changed files with 21 additions and 1 deletions
|
@ -212,7 +212,7 @@ function segmentShouldBeJoined() {
|
||||||
# Given a directory path, truncate it according to the settings for
|
# Given a directory path, truncate it according to the settings for
|
||||||
# `truncate_from_right`
|
# `truncate_from_right`
|
||||||
function truncatePathFromRight() {
|
function truncatePathFromRight() {
|
||||||
local delim_len=${#POWERLEVEL9K_SHORTEN_DELIMITER}
|
local delim_len=${#POWERLEVEL9K_SHORTEN_DELIMITER:-1}
|
||||||
echo $1 | sed $SED_EXTENDED_REGEX_PARAMETER \
|
echo $1 | sed $SED_EXTENDED_REGEX_PARAMETER \
|
||||||
"s@(([^/]{$((POWERLEVEL9K_SHORTEN_DIR_LENGTH))})([^/]{$delim_len}))[^/]+/@\2$POWERLEVEL9K_SHORTEN_DELIMITER/@g"
|
"s@(([^/]{$((POWERLEVEL9K_SHORTEN_DIR_LENGTH))})([^/]{$delim_len}))[^/]+/@\2$POWERLEVEL9K_SHORTEN_DELIMITER/@g"
|
||||||
}
|
}
|
||||||
|
|
|
@ -72,6 +72,26 @@ function testTruncationFromRightWorks() {
|
||||||
unset POWERLEVEL9K_SHORTEN_STRATEGY
|
unset POWERLEVEL9K_SHORTEN_STRATEGY
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testTruncationFromRightWithEmptyDelimiter() {
|
||||||
|
POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
|
||||||
|
POWERLEVEL9K_SHORTEN_DELIMITER=""
|
||||||
|
POWERLEVEL9K_SHORTEN_STRATEGY='truncate_from_right'
|
||||||
|
|
||||||
|
FOLDER=/tmp/powerlevel9k-test/1/12/123/1234/12345/123456/1234567/12345678/123456789
|
||||||
|
mkdir -p $FOLDER
|
||||||
|
cd $FOLDER
|
||||||
|
|
||||||
|
assertEquals "%K{blue} %F{black}/tmp/po/1/12/123/12/12/12/12/12/123456789 %k%F{blue}%f " "$(build_left_prompt)"
|
||||||
|
|
||||||
|
cd -
|
||||||
|
rm -fr /tmp/powerlevel9k-test
|
||||||
|
|
||||||
|
unset FOLDER
|
||||||
|
unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
|
||||||
|
unset POWERLEVEL9K_SHORTEN_DELIMITER
|
||||||
|
unset POWERLEVEL9K_SHORTEN_STRATEGY
|
||||||
|
}
|
||||||
|
|
||||||
function testTruncateWithFolderMarkerWorks() {
|
function testTruncateWithFolderMarkerWorks() {
|
||||||
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
|
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(dir)
|
||||||
POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
|
POWERLEVEL9K_SHORTEN_STRATEGY="truncate_with_folder_marker"
|
||||||
|
|
Loading…
Reference in a new issue