Remove transient prompt option

[admone.git] / admone.zsh

diff --git a/admone.zsh b/admone.zsh
index 89d1c52b662bc27a3644de25060478dad06a4801..7f01fd4f5ff7e97d5c0fe8727a3b321a5843dd4d 100644 (file)
--- a/admone.zsh
+++ b/admone.zsh
@@ -1,5 +1,5 @@
 # Admone Zsh prompt
-# Copyright Armaan Bhojwani 2020 <code@armaanb.net>
+# Copyright Armaan Bhojwani 2021 <me@armaanb.net>
 # MIT licensed, see the LICENSE file for more information.
 
 #######################################################################
@@ -23,13 +23,13 @@ BLOCK_LEFT="["
 BLOCK_RIGHT="]"
   # BLOCK_LEFT="("
   # BLOCK_RIGHT=")"
-SHOW_0_EXIT_CODE="0"
+SHOW_0_EXIT_CODE="1"
 INCLUDE="admone-pwd;admone-vcs;admone-exit-code"
 FORMAT_LOWER="%B%F{%(?.cyan.red)}"
 
-TRANSIENT_PROMPT="0" # This is buggy
 SHORT_PROMPT="➤"
 FORMAT_SHORT="%B%F{%(?.cyan.red)}"
+TWO_LINE="0"
 
 zstyle ':vcs_info:git:*' formats '%b%u%c'
 zstyle ':vcs_info:git:*' actionformats '%b|%a%u%c'
@@ -80,15 +80,16 @@ function zle-keymap-select zle-line-init zle-line-finish {
   zle -R
 }
 
-set-prompt() {
+NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
+THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
+[[ -v PS1_NL ]] && echo || PS1_NL=
+
+set-twoline-prompt() {
   # Reset prompts
   upper="${PRE_UPPER}"
   lower="${PRE_LOWER}${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
 
   # Add in functions as defined above
-  NUM_FUNCS="$(echo $INCLUDE | grep -o ';' | wc -l)"
-
-  THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f 1)"
   upper+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
 
   for (( i = 0; i < $NUM_FUNCS; i++ )); do
@@ -97,29 +98,26 @@ set-prompt() {
   done
 
   # Add line above
-  [[ -v PS1_NL ]] && echo || PS1_NL=
-
   PROMPT=$upper$'\n'$lower
 }
 
+set-oneline-prompt() {
+  PROMPT="${FORMAT_LOWER}${PROMPT_CHAR}%f%b "
+  RPROMPT=""
 
+  for (( i = 0; i <= $NUM_FUNCS; i++ )); do
+    THE_COMMAND="$(echo $INCLUDE | cut -d ';' -f $(($i + 1)))"
+    RPROMPT+="$BLOCK_LEFT$($THE_COMMAND)$BLOCK_RIGHT"
+  done
+}
 # Set everything!
-if [[ $TRANSIENT_PROMPT == "1" ]]; then
-  SHORT_PROMPT=$FORMAT_SHORT$SHORT_PROMPT' '%f%b
-
-  set-transient-prompt() {
-    if [[ $PROMPT != $SHORT_PROMPT ]]; then
-      PROMPT=$SHORT_PROMPT
-      zle .reset-prompt
-    fi
-  }
-
-  zle-line-finish() {
-    set-transient-prompt
-  }
-
-  trap 'set-transient-prompt; return 130' INT
-fi
+set-prompt() {
+  if [[ $TWO_LINE == "1" ]]; then
+    set-twoline-prompt
+  else
+    set-oneline-prompt
+  fi
+}
 
 if [[ ! $(echo $INCLUDE | grep -q "vcs") ]]; then
   zstyle ':vcs_info:*' check-for-changes true