From bafade896322cdf6d6db220bd41fee2595e8d1a7 Mon Sep 17 00:00:00 2001
From: romkatv <roman.perepelitsa@gmail.com>
Date: Mon, 12 Aug 2019 08:56:47 +0200
Subject: [PATCH] add POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY and
 POWERLEVEL9K_GO_VERSION_PROJECT_ONLY

---
 config/p10k-classic.zsh |  6 ++++-
 config/p10k-lean.zsh    |  6 ++++-
 internal/p10k.zsh       | 50 ++++++++++++++++++++++++-----------------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/config/p10k-classic.zsh b/config/p10k-classic.zsh
index 739ba6dd..1237a4b3 100644
--- a/config/p10k-classic.zsh
+++ b/config/p10k-classic.zsh
@@ -494,14 +494,18 @@ fi
   # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
   #######################[ go_version: go version (https://golang.org) ]########################
-  # Golang version color.
+  # Go version color.
   typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37
+  # Show go version only when in a go project subdirectory.
+  typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true
   # Custom icon.
   # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
   #################[ rust_version: rustc version (https://www.rust-lang.org) ]##################
   # Rust version color.
   typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37
+  # Show rust version only when in a rust project subdirectory.
+  typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true
   # Custom icon.
   # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
diff --git a/config/p10k-lean.zsh b/config/p10k-lean.zsh
index d9c7a40e..ea74b926 100644
--- a/config/p10k-lean.zsh
+++ b/config/p10k-lean.zsh
@@ -477,14 +477,18 @@ fi
   # typeset -g POWERLEVEL9K_NODE_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
   #######################[ go_version: go version (https://golang.org) ]########################
-  # Golang version color.
+  # Go version color.
   typeset -g POWERLEVEL9K_GO_VERSION_FOREGROUND=37
+  # Show go version only when in a go project subdirectory.
+  typeset -g POWERLEVEL9K_GO_VERSION_PROJECT_ONLY=true
   # Custom icon.
   # typeset -g POWERLEVEL9K_GO_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
   #################[ rust_version: rustc version (https://www.rust-lang.org) ]##################
   # Rust version color.
   typeset -g POWERLEVEL9K_RUST_VERSION_FOREGROUND=37
+  # Show rust version only when in a rust project subdirectory.
+  typeset -g POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY=true
   # Custom icon.
   # typeset -g POWERLEVEL9K_RUST_VERSION_VISUAL_IDENTIFIER_EXPANSION='⭐'
 
diff --git a/internal/p10k.zsh b/internal/p10k.zsh
index 4b503e01..b56c9da5 100755
--- a/internal/p10k.zsh
+++ b/internal/p10k.zsh
@@ -1527,20 +1527,23 @@ prompt_go_version() {
   local -a match
   [[ $_p9k_ret == (#b)*go([[:digit:].]##)* ]] || return
   local v=$match[1]
-  local p=$GOPATH
-  if [[ -z $p ]]; then
-    if [[ -d $HOME/go ]]; then
-      p=$HOME/go
-    else
-      p="$(go env GOPATH 2>/dev/null)" && [[ -n $p ]] || return
+  if (( _POWERLEVEL9K_GO_VERSION_PROJECT_ONLY )); then
+    local p=$GOPATH
+    if [[ -z $p ]]; then
+      if [[ -d $HOME/go ]]; then
+        p=$HOME/go
+      else
+        p="$(go env GOPATH 2>/dev/null)" && [[ -n $p ]] || return
+      fi
+    fi
+    if [[ $_p9k_pwd/ != $p/* && $_p9k_pwd_a/ != $p/* ]]; then
+      local dir=$_p9k_pwd_a
+      while true; do
+        [[ $dir == / ]] && return
+        [[ -e $dir/go.mod ]] && break
+        dir=${dir:h}
+      done
     fi
-  fi
-  if [[ $_p9k_pwd/ != $p/* ]]; then
-    local dir=$_p9k_pwd
-    while [[ ! -e $dir/go.mod ]]; do
-      [[ $dir == / ]] && return
-      dir=${dir:h}
-    done
   fi
   _p9k_prompt_segment "$0" "green" "grey93" "GO_ICON" 0 '' "${v//\%/%%}"
 }
@@ -1821,7 +1824,7 @@ prompt_nodenv() {
   (( $+commands[nodenv] )) || return
   _p9k_ret=$NODENV_VERSION
   if [[ -z $_p9k_ret ]]; then
-    [[ $NODENV_DIR == /* ]] && local dir=$NODENV_DIR || local dir="$_p9k_pwd/$NODENV_DIR"
+    [[ $NODENV_DIR == /* ]] && local dir=$NODENV_DIR || local dir="$_p9k_pwd_a/$NODENV_DIR"
     while [[ $dir != //[^/]# ]]; do
       _p9k_read_nodenv_version_file $dir/.node-version && break
       [[ $dir == / ]] && break
@@ -1909,7 +1912,7 @@ prompt_rbenv() {
   (( $+commands[rbenv] )) || return
   local v=$RBENV_VERSION
   if [[ -z $v ]]; then
-    [[ $RBENV_DIR == /* ]] && local dir=$RBENV_DIR || local dir="$_p9k_pwd/$RBENV_DIR"
+    [[ $RBENV_DIR == /* ]] && local dir=$RBENV_DIR || local dir="$_p9k_pwd_a/$RBENV_DIR"
     while true; do
       if _p9k_read_rbenv_version_file $dir/.ruby-version; then
         v=$_p9k_ret
@@ -1956,11 +1959,14 @@ prompt_rust_version() {
   _p9k_cached_cmd_stdout rustc --version || return
   local v=${${_p9k_ret#rustc }%% *}
   [[ -n $v ]] || return
-  local dir=$_p9k_pwd_a
-  while [[ ! -e $dir/Cargo.toml ]]; do
-    [[ $dir == / ]] && return
-    dir=${dir:h}
-  done
+  if (( _POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY )); then
+    local dir=$_p9k_pwd_a
+    while true; do
+      [[ $dir == / ]] && return
+      [[ -e $dir/Cargo.toml ]] && break
+      dir=${dir:h}
+    done
+  fi
   _p9k_prompt_segment "$0" "darkorange" "$_p9k_color1" 'RUST_ICON' 0 '' "${v//\%/%%}"
 }
 
@@ -2744,7 +2750,7 @@ prompt_pyenv() {
   (( $+commands[pyenv] )) || return
   local v=${(j.:.)${(@)${(s.:.)PYENV_VERSION}#python-}}
   if [[ -z $v ]]; then
-    [[ $PYENV_DIR == /* ]] && local dir=$PYENV_DIR || local dir="$_p9k_pwd/$PYENV_DIR"
+    [[ $PYENV_DIR == /* ]] && local dir=$PYENV_DIR || local dir="$_p9k_pwd_a/$PYENV_DIR"
     while true; do
       if _p9k_read_pyenv_version_file $dir/.python-version; then
         v=$_p9k_ret
@@ -3614,6 +3620,8 @@ _p9k_init_params() {
   _p9k_declare -i POWERLEVEL9K_LOAD_WHICH 5
   _p9k_declare -b POWERLEVEL9K_NODENV_PROMPT_ALWAYS_SHOW 0
   _p9k_declare -b POWERLEVEL9K_NODE_VERSION_PROJECT_ONLY 0
+  _p9k_declare -b POWERLEVEL9K_GO_VERSION_PROJECT_ONLY 1
+  _p9k_declare -b POWERLEVEL9K_RUST_VERSION_PROJECT_ONLY 1
   _p9k_declare -b POWERLEVEL9K_RBENV_PROMPT_ALWAYS_SHOW 0
   _p9k_declare -b POWERLEVEL9K_RVM_SHOW_GEMSET 0
   _p9k_declare -b POWERLEVEL9K_RVM_SHOW_PREFIX 0