From 8d5233ac19ed29269ef2b03ec9b38a209af7867d Mon Sep 17 00:00:00 2001
From: David Farrell <davidpfarrell+github@gmail.com>
Date: Wed, 6 Nov 2019 18:11:53 -0800
Subject: [PATCH] Fixes prompt color

---
 themes/powerline/powerline.base.bash | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/themes/powerline/powerline.base.bash b/themes/powerline/powerline.base.bash
index a348cd7a..60339ed0 100644
--- a/themes/powerline/powerline.base.bash
+++ b/themes/powerline/powerline.base.bash
@@ -233,8 +233,15 @@ function __powerline_prompt_command {
   done
 
   [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
-  [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]] && LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}${normal}"
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -)${separator_char}${normal}"
+
+  # By default we try to match the prompt to the adjacent segment's background color,
+  # but when part of the prompt exists within that segment, we instead match the foreground color.
+  local prompt_color="$(set_color ${LAST_SEGMENT_COLOR} -)"
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ -n "${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}" ]]; then
+    LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR})${POWERLINE_LEFT_LAST_SEGMENT_PROMPT_CHAR}"
+    prompt_color="${normal}"
+  fi
+  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="${prompt_color}${separator_char}${normal}"
 
   PS1="${LEFT_PROMPT} "