From 5e978edd0ff6f6b82597c2538fa06ea406d73132 Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Tue, 3 Apr 2012 16:18:02 +0100
Subject: [PATCH] Allow multiple prompt values with arrays

---
 plugins/git/functions/git-info  | 20 +++++++-------------
 themes/sorin/prompt_sorin_setup |  9 +++++----
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/plugins/git/functions/git-info b/plugins/git/functions/git-info
index b5cfd33f..b272a160 100644
--- a/plugins/git/functions/git-info
+++ b/plugins/git/functions/git-info
@@ -146,6 +146,7 @@ function git-info {
   local position_format
   local position_formatted
   local prompt_format
+  local prompt_formats
   local remote
   local remote_cmd
   local remote_format
@@ -153,7 +154,6 @@ function git-info {
   local renamed=0
   local renamed_format
   local renamed_formatted
-  local rprompt_format
   local stashed=0
   local stashed_format
   local stashed_formatted
@@ -164,12 +164,11 @@ function git-info {
   local untracked=0
   local untracked_format
   local untracked_formatted
-  local -A git_info_vars
-  local git_info_var
+  typeset -A prompt_formats
 
   # Clean up previous git-info.
   unset git_prompt_info
-  unset git_rprompt_info
+  typeset -Ag git_prompt_info
 
   # Return if not inside a Git repository work tree.
   if ! is-true "$(git rev-parse --is-inside-work-tree 2> /dev/null)"; then
@@ -329,16 +328,10 @@ function git-info {
   fi
 
   # Format prompts.
-  zstyle -s ':omz:plugin:git:prompt' prompt 'prompt_format'
-  zstyle -s ':omz:plugin:git:prompt' rprompt 'rprompt_format'
+  zstyle -a ':omz:plugin:git:prompt' prompts 'prompt_formats'
 
-  git_info_vars=(
-    git_prompt_info "$prompt_format"
-    git_rprompt_info "$rprompt_format"
-  )
-
-  for git_info_var in ${(k)git_info_vars}; do
-    zformat -f "$git_info_var" "$git_info_vars[$git_info_var]" \
+  for prompt_format in ${(k)prompt_formats}; do
+    zformat -f REPLY "$prompt_formats[$prompt_format]" \
       "A:$ahead_formatted" \
       "B:$behind_formatted" \
       "D:$dirty_formatted" \
@@ -354,6 +347,7 @@ function git-info {
       "r:$renamed_formatted" \
       "s:$action_formatted" \
       "u:$untracked_formatted"
+    git_prompt_info[$prompt_format]="$REPLY"
   done
 
   unset _git_info_executing
diff --git a/themes/sorin/prompt_sorin_setup b/themes/sorin/prompt_sorin_setup
index 7565cbdf..5e5441cc 100644
--- a/themes/sorin/prompt_sorin_setup
+++ b/themes/sorin/prompt_sorin_setup
@@ -41,11 +41,12 @@ function prompt_sorin_setup {
   zstyle ':omz:plugin:git:prompt' stashed ' %%B%F{cyan}✭%f%%b'
   zstyle ':omz:plugin:git:prompt' unmerged ' %%B%F{yellow}═%f%%b'
   zstyle ':omz:plugin:git:prompt' untracked ' %%B%F{white}◼%f%%b'
-  zstyle ':omz:plugin:git:prompt' prompt ' %F{blue}git%f$(coalesce "%b" "%p" "%c")%s'
-  zstyle ':omz:plugin:git:prompt' rprompt '%A%B%S%a%d%m%r%U%u'
+  zstyle ':omz:plugin:git:prompt' prompts \
+    'prompt'  ' %F{blue}git%f$(coalesce "%b" "%p" "%c")%s' \
+    'rprompt' '%A%B%S%a%d%m%r%U%u'
 
-  PROMPT='%F{cyan}%1~%f${(e)git_prompt_info} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
-  RPROMPT='${vi_prompt_info}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_rprompt_info}'
+  PROMPT='%F{cyan}%1~%f${(e)git_prompt_info[prompt]} %(!.%B%F{red}#%f%b.%B%F{green}❯%f%b) '
+  RPROMPT='${vi_prompt_info}%(?:: %F{red}⏎%f)${VIM:+" %B%F{green}V%f%b"}${git_prompt_info[rprompt]}'
   SPROMPT='zsh: correct %F{red}%R%f to %F{green}%r%f [nyae]? '
 }