Skip to content
This repository has been archived by the owner on Apr 24, 2020. It is now read-only.

Fixed home abbreviation not being exclusive with circular navigation #773

Merged
merged 3 commits into from
Apr 14, 2018
Merged

Fixed home abbreviation not being exclusive with circular navigation #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a761e3c
Fixed home abbreviation not being exclusive with circular navigation
conradhaupt Mar 12, 2018
83ad5b5
Add test for wrong truncation if switching back to home folder
dritter Mar 20, 2018
d43f128
Merge branch 'dritter-fix_dir_home_issue' into fix_dir_nav
conradhaupt Mar 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion powerlevel9k.zsh-theme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,9 @@ prompt_dir() {
current_path="${cur_short_path: : -1}"
;;
*)
current_path="$(print -P "%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c")"
if [[ $current_path != "~" ]]; then
current_path="$(print -P "%$((POWERLEVEL9K_SHORTEN_DIR_LENGTH+1))(c:$POWERLEVEL9K_SHORTEN_DELIMITER/:)%${POWERLEVEL9K_SHORTEN_DIR_LENGTH}c")"
fi
;;
esac
fi
Expand Down
21 changes: 21 additions & 0 deletions test/segments/dir.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,27 @@ function testTruncateFoldersWorks() {
unset POWERLEVEL9K_SHORTEN_STRATEGY
}

function testTruncateFolderWithHomeDirWorks() {
POWERLEVEL9K_SHORTEN_DIR_LENGTH=1
CURRENT_DIR=$(pwd)

cd ~
FOLDER="powerlevel9k-test-${RANDOM}"
mkdir -p $FOLDER
cd $FOLDER
# Switch back to home folder as this causes the problem.
cd ..

assertEquals "%K{blue} %F{black}~ %k%F{blue}%f " "$(build_left_prompt)"

rmdir $FOLDER
cd ${CURRENT_DIR}

unset CURRENT_DIR
unset FOLDER
unset POWERLEVEL9K_SHORTEN_DIR_LENGTH
}

function testTruncateMiddleWorks() {
POWERLEVEL9K_SHORTEN_DIR_LENGTH=2
POWERLEVEL9K_SHORTEN_STRATEGY='truncate_middle'
Expand Down