From 8d3d6d8bcf8c7c8d06817ba9639e74d49bce7988 Mon Sep 17 00:00:00 2001
From: Ajeet D'Souza <98ajeet@gmail.com>
Date: Sat, 6 May 2023 10:54:53 +0530
Subject: [PATCH] Improve Fish completions

---
 CHANGELOG.md       |  5 +++++
 templates/fish.txt | 20 +++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb0a884..1fb7e07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Nushell: add support for v0.78.0.
 - Fish: plugin now works on older versions.
 
+### Fixed
+
+- Fish: not providing `cd` completions when there is a space in the path.
+- Fish: providing `z` completions when the preceding argument starts with `z!`.
+
 ## [0.9.0] - 2023-01-08
 
 ### Added
diff --git a/templates/fish.txt b/templates/fish.txt
index 6409bd4..1db92b0 100644
--- a/templates/fish.txt
+++ b/templates/fish.txt
@@ -62,20 +62,21 @@ end
 # When using zoxide with --no-cmd, alias these internal functions as desired.
 #
 
-set __zoxide_z_prefix 'z!'
+if test -z $__zoxide_z_prefix
+    set __zoxide_z_prefix 'z!'
+end
+set __zoxide_z_prefix_regex ^(string escape --style=regex $__zoxide_z_prefix)
 
 # Jump to a directory using only keywords.
 function __zoxide_z
     set -l argc (count $argv)
-    set -l prefix (string escape --style=regex $__zoxide_z_prefix)
-
     if test $argc -eq 0
         __zoxide_cd $HOME
     else if test "$argv" = -
         __zoxide_cd -
     else if test $argc -eq 1 -a -d $argv[1]
         __zoxide_cd $argv[1]
-    else if set -l result (string replace --regex ^$prefix $argv[-1])
+    else if set -l result (string replace --regex $__zoxide_z_prefix_regex '' $argv[-1]); and test -n $result
         __zoxide_cd $result
     else
         set -l result (command zoxide query --exclude (__zoxide_pwd) -- $argv)
@@ -90,11 +91,12 @@ function __zoxide_z_complete
 
     if test (count $tokens) -le 2 -a (count $curr_tokens) -eq 1
         # If there are < 2 arguments, use `cd` completions.
-        __fish_complete_directories "$tokens[2]" ''
-    else if test (count $tokens) -eq (count $curr_tokens)
-        # If the last argument is empty, use interactive selection.
+        complete --do-complete "'' "(commandline --cut-at-cursor --current-token) | string match --regex '.*/$'
+    else if test (count $tokens) -eq (count $curr_tokens); and ! string match --quiet --regex $__zoxide_z_prefix_regex. $tokens[-1]
+        # If the last argument is empty and the one before doesn't start with
+        # $__zoxide_z_prefix, use interactive selection.
         set -l query $tokens[2..-1]
-        set -l result (zoxide query --exclude (__zoxide_pwd) -i -- $query)
+        set -l result (zoxide query --exclude (__zoxide_pwd) --interactive -- $query)
         and echo $__zoxide_z_prefix$result
         commandline --function repaint
     end
@@ -103,7 +105,7 @@ complete --command __zoxide_z --no-files --arguments '(__zoxide_z_complete)'
 
 # Jump to a directory using interactive search.
 function __zoxide_zi
-    set -l result (command zoxide query -i -- $argv)
+    set -l result (command zoxide query --interactive -- $argv)
     and __zoxide_cd $result
 end