76fb7a258be3cfd21d2e03a5c612b6d3bce18eca

Author
chieping <takashi.honda.01@gmail.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

rbenv: fix rbenv_prompt_info prefix and suffix (#3764)

Closes #3764

Diff

 1diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh
 2index ed46d355b3f9668ce16bf3bc8012fbda0c2c8c6e..b446b636332c5aef267b868248a4b3773f436ac1 100644
 3--- a/plugins/rbenv/rbenv.plugin.zsh
 4+++ b/plugins/rbenv/rbenv.plugin.zsh
 5@@ -47,11 +47,10 @@ if [[ $FOUND_RBENV -eq 1 ]]; then
 6     }
 7 
 8     function rbenv_prompt_info() {
 9-        if [[ -n $(current_gemset) ]] ; then
10-            echo "$(current_ruby)@$(current_gemset)"
11-        else
12-            echo "$(current_ruby)"
13-        fi
14+        local ruby=$(current_ruby) gemset=$(current_gemset)
15+        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
16+        [[ -n "$gemset" ]] && echo -n "${ruby}@${gemset}" || echo -n "${ruby}"
17+        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
18     }
19 else
20     alias rubies="ruby -v"
21@@ -59,7 +58,11 @@ else
22     function current_ruby() { echo "not supported" }
23     function current_gemset() { echo "not supported" }
24     function gems() { echo "not supported" }
25-    function rbenv_prompt_info() { echo "system: $(ruby -v | cut -f-2 -d ' ')" }
26+    function rbenv_prompt_info() {
27+        echo -n "${ZSH_THEME_RUBY_PROMPT_PREFIX}"
28+        echo -n "system: $(ruby -v | cut -f-2 -d ' ')"
29+        echo "${ZSH_THEME_RUBY_PROMPT_SUFFIX}"
30+    }
31 fi
32 
33 unset FOUND_RBENV rbenvdirs dir