Adds compact support to powerline themes

themes/powerline-plain/powerline-plain.base.bash

@@ -4,15 +4,34 @@ function __powerline_left_segment {
   local OLD_IFS="${IFS}"; IFS="|"
   local params=( $1 )
   IFS="${OLD_IFS}"
+  local pad_before_segment=" "
 
-  LEFT_PROMPT+="${separator}$(set_color - ${params[1]}) ${params[0]} ${normal}"
+  if [[ "${SEGMENTS_AT_LEFT}" -eq 0 ]]; then
+    if [[ "${POWERLINE_COMPACT_BEFORE_FIRST_SEGMENT}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+  else
+    if [[ "${POWERLINE_COMPACT_AFTER_SEPARATOR}" -ne 0 ]]; then
+      pad_before_segment=""
+    fi
+    # Since the previous segment wasn't the last segment, add padding, if needed
+    #
+    if [[ "${POWERLINE_COMPACT_BEFORE_SEPARATOR}" -eq 0 ]]; then
+      LEFT_PROMPT+="$(set_color - ${LAST_SEGMENT_COLOR}) ${normal}"
+    fi
+  fi
+
+  LEFT_PROMPT+="$(set_color - ${params[1]})${pad_before_segment}${params[0]}${normal}"
   LAST_SEGMENT_COLOR=${params[1]}
+  (( SEGMENTS_AT_LEFT += 1 ))
 }
 
 function __powerline_prompt_command {
   local last_status="$?" ## always the first
 
   LEFT_PROMPT=""
+  SEGMENTS_AT_LEFT=0
+  LAST_SEGMENT_COLOR=""
 
   _save-and-reload-history "${HISTORY_AUTOSAVE:-0}"
 
@@ -21,11 +40,21 @@ function __powerline_prompt_command {
     local info="$(__powerline_${segment}_prompt)"
     [[ -n "${info}" ]] && __powerline_left_segment "${info}"
   done
-  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
-  [[ -n "${LEFT_PROMPT}" ]] && LEFT_PROMPT+="$(set_color ${LAST_SEGMENT_COLOR} -) ${normal}"
 
-  PS1="${LEFT_PROMPT} "
+  [[ "${last_status}" -ne 0 ]] && __powerline_left_segment $(__powerline_last_status_prompt ${last_status})
+
+  if [[ -n "${LEFT_PROMPT}" ]] && [[ "${POWERLINE_COMPACT_AFTER_LAST_SEGMENT}" -eq 0 ]]; then
+    __powerline_left_last_segment_padding
+  fi
+
+  if [[ "${POWERLINE_COMPACT_PROMPT}" -eq 0 ]]; then
+    LEFT_PROMPT+=" "
+  fi
+
+  PS1="${LEFT_PROMPT}"
 
   ## cleanup ##
-  unset LEFT_PROMPT
+  unset LAST_SEGMENT_COLOR \
+        LEFT_PROMPT \
+        SEGMENTS_AT_LEFT
 }