rename $pure_color_symbol_success as $pure_color_prompt_on_success

pure-fish · Jan 15, 2019 · f94207b · f94207b
1 parent 7de59a3
commit f94207b
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -82,7 +82,7 @@ You can tweak pretty much everything in `pure` by overriding variables in your `
 | :------------------------------ | :------------- | :-------------------- |
 | **`pure_symbol_prompt`**        | Prompt symbol. | `❯`                   |
 | **`pure_color_prompt_on_error`**   |                | `$pure_color_danger`     |
-| **`pure_color_symbol_success`** |                | `$pure_color_success` |
+| **`pure_color_prompt_on_success`** |                | `$pure_color_success` |
 
 ### Git
 

diff --git a/conf.d/pure.fish b/conf.d/pure.fish
@@ -39,7 +39,7 @@ _pure_set_default pure_color_ssh_separator $pure_color_mute
 _pure_set_default pure_color_ssh_user_normal $pure_color_mute
 _pure_set_default pure_color_ssh_user_root $pure_color_light
 _pure_set_default pure_color_prompt_on_error $pure_color_danger
-_pure_set_default pure_color_symbol_success $pure_color_success
+_pure_set_default pure_color_prompt_on_success $pure_color_success
 _pure_set_default pure_color_virtualenv $pure_color_mute
 
 # Print current working directory at the beginning of prompt

diff --git a/functions/_pure_prompt_symbol.fish b/functions/_pure_prompt_symbol.fish
@@ -5,12 +5,12 @@ function _pure_prompt_symbol \
     set --local pure_symbol $pure_symbol_prompt
     set --local command_succeed 0
 
-    set --local color_symbol $pure_color_symbol_success # default pure symbol color
+    set --local color_symbol $pure_color_prompt_on_success # default pure symbol color
     if test $exit_code -ne 0
         set color_symbol $pure_color_prompt_on_error  # different pure symbol color when previous command failed
 
         if test $pure_separate_prompt_on_error = true
-            set color_symbol "$pure_color_prompt_on_error$pure_symbol_prompt$pure_color_symbol_success"
+            set color_symbol "$pure_color_prompt_on_error$pure_symbol_prompt$pure_color_prompt_on_success"
         end
     end
 

diff --git a/tests/_pure.test.fish b/tests/_pure.test.fish
@@ -210,11 +210,11 @@ test "configure: pure_color_prompt_on_error"
     ) = (set_color red)
 end
 
-test "configure: pure_color_symbol_success" 
+test "configure: pure_color_prompt_on_success" 
     (
-        set --erase pure_color_symbol_success
+        set --erase pure_color_prompt_on_success
         source $DIRNAME/../conf.d/pure.fish
-        echo $pure_color_symbol_success
+        echo $pure_color_prompt_on_success
     ) = (set_color magenta)
 end
 

diff --git a/tests/_pure_prompt.test.fish b/tests/_pure_prompt.test.fish
@@ -9,7 +9,7 @@ set --local succeed 0
 
 test "_pure_prompt: print prompt after succeeding command"
     (
-        set pure_color_symbol_success (set_color magenta)
+        set pure_color_prompt_on_success (set_color magenta)
         set pure_symbol_prompt '>'  # using default ❯ break following tests
         set --local last_command $succeed
 

diff --git a/tests/_pure_prompt_symbol.test.fish b/tests/_pure_prompt_symbol.test.fish
@@ -7,7 +7,7 @@ set --local success 0
 test "_pure_prompt_symbol: throws error message when argument is missing"
     (
         set pure_symbol_prompt '>'  # using default ❯ break following tests
-        set pure_color_symbol_success (set_color green)
+        set pure_color_prompt_on_success (set_color green)
 
         set output (_pure_prompt_symbol 2>&1)
         echo $output[1]
@@ -18,7 +18,7 @@ test "_pure_prompt_symbol: colorizes prompt in green when last command succeed"
     (
         set --local last_command $success
         set pure_symbol_prompt '>'  # using default ❯ break following tests
-        set pure_color_symbol_success (set_color green)
+        set pure_color_prompt_on_success (set_color green)
 
         _pure_prompt_symbol $last_command
     ) = (set_color green)'>'
@@ -39,7 +39,7 @@ test "_pure_prompt_symbol: add a magenta prompt when pure_separate_prompt_on_err
         set --local last_command $fail
         set pure_symbol_prompt '>'  # using default ❯ break following tests
         set pure_color_prompt_on_error (set_color red)
-        set pure_color_symbol_success (set_color magenta)
+        set pure_color_prompt_on_success (set_color magenta)
         set pure_separate_prompt_on_error true