Support fish completion with env vars in the path

Fixes spf13#1214 Fixes spf13#1306 Signed-off-by: Marc Khouzam <[email protected]>
VilledeMontreal · Feb 14, 2021 · 09f254f · 09f254f
1 parent 449174b
commit 09f254f
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/fish_completions.go b/fish_completions.go
@@ -43,16 +43,13 @@ function __%[1]s_perform_completion
     end
     __%[1]s_debug "emptyArg: $emptyArg"
 
-    if not type -q "$args[1]"
-        # This can happen when "complete --do-complete %[2]s" is called when running this script.
-        __%[1]s_debug "Cannot find $args[1]. No completions."
-        return
-    end
-
     set requestComp "$args[1] %[3]s $args[2..-1] $emptyArg"
     __%[1]s_debug "Calling $requestComp"
 
-    set results (eval $requestComp 2> /dev/null)
+    # Call the command as a sub-shell so that we can redirect any errors
+    # For example, if $requestComp has an unmatched quote
+    # https://github.com/spf13/cobra/issues/1214
+    set results (fish -c "$requestComp" 2> /dev/null)
     set comps $results[1..-2]
     set directiveLine $results[-1]