feat(tag): supports symbol, color is configurable, follows upstream

olets · Apr 21, 2020 · 5449251 · 5449251
1 parent eb1bd4c
commit 5449251
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/porcelain-prompt.zsh b/porcelain-prompt.zsh
@@ -29,6 +29,7 @@ PORCELAIN_PROMPT_SYMBOL_MODIFIED=${PORCELAIN_PROMPT_SYMBOL_MODIFIED-_M}
 PORCELAIN_PROMPT_SYMBOL_MODIFIED_STAGED=${PORCELAIN_PROMPT_SYMBOL_MODIFIED_STAGED-M_}
 PORCELAIN_PROMPT_SYMBOL_SKIP_WORKTREE=${PORCELAIN_PROMPT_SYMBOL_SKIP_WORKTREE-⤳ }
 PORCELAIN_PROMPT_SYMBOL_STASH=${PORCELAIN_PROMPT_SYMBOL_STASH-⇲ }
+PORCELAIN_PROMPT_SYMBOL_TAG=${PORCELAIN_PROMPT_SYMBOL_TAG:-}
 
 # Configurable colors
 PORCELAIN_PROMPT_COLOR_ACTION=${PORCELAIN_PROMPT_COLOR_ACTION:-199}
@@ -43,6 +44,7 @@ PORCELAIN_PROMPT_COLOR_REMOTE=${PORCELAIN_PROMPT_COLOR_REMOTE:-216}
 PORCELAIN_PROMPT_COLOR_SKIP_WORKTREE=${PORCELAIN_PROMPT_COLOR_SKIP_WORKTREE:-81}
 PORCELAIN_PROMPT_COLOR_STASH=${PORCELAIN_PROMPT_COLOR_STASH:-81}
 PORCELAIN_PROMPT_COLOR_SUCCESS=${PORCELAIN_PROMPT_COLOR_SUCCESS:-76}
+PORCELAIN_PROMPT_COLOR_TAG=${PORCELAIN_PROMPT_COLOR_TAG:-140}
 PORCELAIN_PROMPT_COLOR_USER=${PORCELAIN_PROMPT_COLOR_USER:-109}
 PORCELAIN_PROMPT_COLOR_WHERE=${PORCELAIN_PROMPT_COLOR_WHERE:-140}
 
@@ -128,8 +130,6 @@ function gitstatus_prompt_update() {
   fi
   w+="$ref "
 
-  [[ -n $VCS_STATUS_TAG ]] && w+="$PORCELAIN_PROMPT_SYMBOL_TAG$VCS_STATUS_TAG "
-
   w+="%${PORCELAIN_PROMPT_COLOR_INACTIVE}F"
   if [[ -z $VCS_STATUS_REMOTE_BRANCH ]]; then
     w+="${PORCELAIN_PROMPT_COLOR_REMOTE}local"
@@ -154,6 +154,9 @@ function gitstatus_prompt_update() {
     fi
   fi
 
+  w+="%${PORCELAIN_PROMPT_COLOR_INACTIVE}F"
+  [[ -n $VCS_STATUS_TAG ]] && w+="%${PORCELAIN_PROMPT_COLOR_TAG}F$PORCELAIN_PROMPT_SYMBOL_TAG$VCS_STATUS_TAG "
+
   if (( PORCELAIN_PROMPT_GIT_REF_ON_DIR_LINE )); then
     WHERE="${w}%f"
   else