Merge pull request #299 from carapace-sh/fish-missing-completions

fish: fix missing completions

Author: rsteube

pkg/actions/bridge/fish.go

@@ -25,12 +25,12 @@ func ActionFish(command ...string) carapace.Action {
 			args := append(command, c.Args...)
 			args = append(args, c.Value)
 
-			configPath := filepath.Join(configDir, "carapace/bridge/fish/config.fish")
-			if err := ensureExists(configPath); err != nil {
+			fishConfigDir := filepath.Join(configDir, "carapace/bridge/fish")
+			if err := ensureExists(fishConfigDir + "/config.fish"); err != nil {
 				return carapace.ActionMessage(err.Error())
 			}
 
-			snippet := fmt.Sprintf(`set __fish_config_dir "/var/empty";source "$__fish_data_dir/config.fish";source %#v;complete --do-complete="%v"`, configPath, shlex.Join(args)) // TODO needs custom escaping
+			snippet := fmt.Sprintf(`set __fish_config_dir %[1]q;source "$__fish_data_dir/config.fish";source %[1]q/config.fish;complete --do-complete=%[2]q`, fishConfigDir, shlex.Join(args)) // TODO needs custom escaping
 			return carapace.ActionExecCommand("fish", "--no-config", "--command", snippet)(func(output []byte) carapace.Action {
 				lines := strings.Split(string(output), "\n")
 

pkg/bridges/fish.go

@@ -25,16 +25,17 @@ func Fish() []string {
 			return nil, err
 		}
 
-		configPath := filepath.Join(configDir, "carapace/bridge/fish/config.fish")
-		snippet := fmt.Sprintf(`set __fish_config_dir "/var/empty";source "$__fish_data_dir/config.fish";source %#v;echo $fish_complete_path`, configPath)
+		fishConfigPath := filepath.Join(configDir, "carapace/bridge/fish/config.fish")
+		// TODO explicitly adding $__fish_data_dir/completions which is currently missing in $fish_complete_path
+		snippet := fmt.Sprintf(`set __fish_config_dir %[1]q;source "$__fish_data_dir/config.fish";source %[1]q/config.fish;echo $fish_complete_path $__fish_data_dir/completions`, fishConfigPath)
 
 		output, err := execlog.Command("fish", "--no-config", "--command", snippet).Output()
 		if err != nil {
 			return nil, err
 		}
 
 		unique := make(map[string]bool)
-		for _, location := range strings.Split(string(output), " ") {
+		for location := range strings.SplitSeq(string(output), " ") {
 			entries, err := os.ReadDir(location)
 			if err != nil {
 				continue