Merge pull request #951 from rsteube/actioncobracomplete-fix-directive

ActionCobraComplete: fix directive check
carapace-sh · Feb 23, 2022 · 775bab9 · 775bab9
2 parents 1b4cb49 + 30263ae
commit 775bab9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/cmd/carapace/cmd/bridge.go b/cmd/carapace/cmd/bridge.go
@@ -50,7 +50,10 @@ func createCmd(command string, engine string) *cobra.Command {
 	cmd := &cobra.Command{
 		Use:                command,
 		DisableFlagParsing: true,
-		Run:                func(cmd *cobra.Command, args []string) {},
+		CompletionOptions: cobra.CompletionOptions{
+			DisableDefaultCmd: true,
+		},
+		Run: func(cmd *cobra.Command, args []string) {},
 	}
 
 	carapace.Gen(cmd).PositionalAnyCompletion(

diff --git a/completers/git_completer/cmd/difftool.go b/completers/git_completer/cmd/difftool.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace-bin/pkg/actions/os"
 	"github.com/rsteube/carapace-bin/pkg/actions/tools/git"
 	"github.com/spf13/cobra"
 )
@@ -27,7 +28,10 @@ func init() {
 	rootCmd.AddCommand(difftoolCmd)
 
 	carapace.Gen(difftoolCmd).FlagCompletion(carapace.ActionMap{
-		"tool": carapace.ActionFiles(),
+		"tool": carapace.Batch(
+			os.ActionPathExecutables(),
+			carapace.ActionFiles(),
+		).ToA(),
 	})
 
 	carapace.Gen(difftoolCmd).PositionalCompletion(

diff --git a/pkg/actions/bridge/cobra.go b/pkg/actions/bridge/cobra.go
@@ -72,7 +72,7 @@ func ActionCobraComplete(cmd string) carapace.Action {
 type compDirective int
 
 func (d compDirective) matches(cobraDirective cobra.ShellCompDirective) bool {
-	return d&compDirective(cobraDirective) == d
+	return d&compDirective(cobraDirective) != 0
 }
 
 func readDirective(lines []string) (compDirective, error) {