From 922098d3cf57a11d3336e749d7cc843cefc639ce Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Tue, 1 Jun 2021 16:34:42 -0700
Subject: [PATCH] Fix pwd

---
 functions/_tide_pwd.fish | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/functions/_tide_pwd.fish b/functions/_tide_pwd.fish
index dbdc8eb..877018f 100644
--- a/functions/_tide_pwd.fish
+++ b/functions/_tide_pwd.fish
@@ -4,50 +4,42 @@ function _tide_pwd
     set -l keep_background_color (set_color normal -b $tide_pwd_bg_color || echo)
     set -l color_truncated_dirs (set_color $tide_pwd_color_truncated_dirs || echo)
 
-    set -l split_pwd (string replace -- $HOME '~' $PWD | string split --no-empty '/')
+    set -l split_pwd (string replace -- $HOME '~' $PWD | string split /)
     set -l split_pwd_for_length $split_pwd
     set -l split_pwd_for_output $split_pwd
 
     # Anchor first and last directories
-    set split_pwd_for_output[1] $color_anchors"$split_pwd[1]"$keep_background_color$color_dirs
-    set split_pwd_for_output[-1] $color_anchors"$split_pwd[-1]"$keep_background_color$color_dirs
-
-    set -g pwd_length (string join -- / $split_pwd_for_length | string length)
-
-    if test "$split_pwd[1]" != '~'
-        set split_pwd_for_output[1] /"$split_pwd_for_output[1]"
-        set pwd_length (math $pwd_length + 1)
-    end
+    set split_pwd_for_output[1] $color_anchors$split_pwd[1]$keep_background_color$color_dirs
+    set split_pwd_for_output[-1] $color_anchors$split_pwd[-1]$keep_background_color$color_dirs
 
+    set -l icon $tide_pwd_icon_dir' '
     if not test -w $PWD
-        test -n "$tide_pwd_icon_unwritable" && set pwd_length (math $pwd_length + 2)
-        printf '%s' $color_dirs $tide_pwd_icon_unwritable' '
+        set icon $tide_pwd_icon_unwritable' '
     else if test $PWD = $HOME
-        test -n "$tide_pwd_icon_home" && set pwd_length (math $pwd_length + 2)
-        printf '%s' $color_dirs $tide_pwd_icon_home' '
-    else
-        test -n "$tide_pwd_icon_dir" && set pwd_length (math $pwd_length + 2)
-        printf '%s' $color_dirs $tide_pwd_icon_dir' '
+        set icon $tide_pwd_icon_home' '
     end
 
+    set -g pwd_length (string length "$icon"(string join / $split_pwd_for_length))
+
     i=1 for dir_section in $split_pwd[2..-2]
-        set -l parentDir (string join -- / $split_pwd[1..$i] | string replace '~' $HOME) # Use i from before increment
+        set -l parent_dir (string join -- / $split_pwd[1..$i] | string replace '~' $HOME) # Use i from before increment
 
         set i (math $i + 1)
 
         # Returns true if any markers exist in dir_section
-        if test -z false (string split --max 2 " " -- "-o -e "$parentDir/$dir_section/$tide_pwd_markers)
+        if test -z false (string split --max 2 " " -- "-o -e "$parent_dir/$dir_section/$tide_pwd_markers)
             set split_pwd_for_output[$i] $color_anchors$dir_section$keep_background_color$color_dirs
         else if test $pwd_length -gt $dist_btwn_sides
             while set -l truncation_length (math $truncation_length + 1) &&
                     set -l truncated (string sub --length $truncation_length -- $dir_section) &&
-                    test $truncated != $dir_section -a (count $parentDir/$truncated*/) -gt 1
+                    test $truncated != $dir_section -a (count $parent_dir/$truncated*/) -gt 1
             end
             set split_pwd_for_length[$i] $truncated
             set split_pwd_for_output[$i] $color_truncated_dirs$truncated$keep_background_color$color_dirs
-            set pwd_length (string join -- / $split_pwd_for_length | string length) # Update length
+            set pwd_length (string length "$icon"(string join / $split_pwd_for_length)) # Update length
         end
     end
 
+    printf '%s' $color_dirs $icon
     string join -- / $split_pwd_for_output
 end