From 5657fe6ac7d75cac48a386f55e429b716f8d7623 Mon Sep 17 00:00:00 2001
From: Chris Chou <chhschou@gmail.com>
Date: Fri, 6 Oct 2017 09:47:37 +1300
Subject: #632: Indicate `Rust` or `(rust)` for rust_version segment only if
icon is unavailable
---
functions/icons.zsh | 4 ++--
powerlevel9k.zsh-theme | 4 ++--
test/segments/rust_version.spec | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/functions/icons.zsh b/functions/icons.zsh
index 3a4909f7..be507563 100644
--- a/functions/icons.zsh
+++ b/functions/icons.zsh
@@ -77,7 +77,7 @@ case $POWERLEVEL9K_MODE in
VCS_GIT_GITLAB_ICON $'\uE20E ' #
VCS_HG_ICON $'\uE1C3 ' #
VCS_SVN_ICON '(svn) '
- RUST_ICON ''
+ RUST_ICON '(rust)'
PYTHON_ICON $'\ue63c' #
SWIFT_ICON ''
GO_ICON ''
@@ -290,7 +290,7 @@ case $POWERLEVEL9K_MODE in
VCS_GIT_GITLAB_ICON ''
VCS_HG_ICON ''
VCS_SVN_ICON ''
- RUST_ICON ''
+ RUST_ICON 'Rust'
PYTHON_ICON ''
SWIFT_ICON 'Swift'
GO_ICON 'Go'
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 5aa280c6..edb94632 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -1095,9 +1095,9 @@ prompt_root_indicator() {
prompt_rust_version() {
local rust_version
rust_version=$(rustc --version 2>&1 | grep -oe "^rustc\s*[^ ]*" | grep -o '[0-9.a-z\\\-]*$')
-
+
if [[ -n "$rust_version" ]]; then
- "$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "Rust $rust_version" 'RUST_ICON'
+ "$1_prompt_segment" "$0" "$2" "208" "$DEFAULT_COLOR" "$rust_version" 'RUST_ICON'
fi
}
# RSpec test ratio
diff --git a/test/segments/rust_version.spec b/test/segments/rust_version.spec
index 49b06bcf..c945f8ae 100755
--- a/test/segments/rust_version.spec
+++ b/test/segments/rust_version.spec
@@ -19,7 +19,7 @@ function testRust() {
alias rustc=mockRust
POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(rust_version)
- assertEquals "%K{208} %F{black}Rust 0.4.1a-alpha %k%F{208}%f " "$(build_left_prompt)"
+ assertEquals "%K{208} %F{black%}Rust%f %F{black}0.4.1a-alpha %k%F{208}%f " "$(build_left_prompt)"
unset POWERLEVEL9K_LEFT_PROMPT_ELEMENTS
unalias rustc
--
cgit v1.2.3