Merge pull request #1130 from carapace-sh/flagset-exclusive-self

flagset: skip self in mutually exclusive check

Author: rsteube

example/cmd/special.go

@@ -28,13 +28,13 @@ func init() {
 	carapace.Gen(specialCmd).Standalone()
 
 	specialCmd.Flags().CountP("count", "c", "count flag")
-	specialCmd.Flags().Bool("exclusive1", false, "mutually exclusive flag")
-	specialCmd.Flags().Bool("exclusive2", false, "mutually exclusive flag")
+	specialCmd.Flags().Bool("exclusive", false, "mutually exclusive flag")
+	specialCmd.Flags().Count("exclusiveRepeatable", "mutually exclusive repeatable flag")
 	specialCmd.Flags().StringP("optarg", "o", "", "optional argument")
 
 	specialCmd.Flag("optarg").NoOptDefVal = " "
 
-	specialCmd.MarkFlagsMutuallyExclusive("exclusive1", "exclusive2")
+	specialCmd.MarkFlagsMutuallyExclusive("exclusive", "exclusiveRepeatable")
 
 	rootCmd.AddCommand(specialCmd)
 

example/cmd/special_test.go

@@ -0,0 +1,29 @@
+package cmd
+
+import (
+	"testing"
+
+	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace/pkg/sandbox"
+)
+
+func TestMutuallyExclusive(t *testing.T) {
+	sandbox.Package(t, "github.com/carapace-sh/carapace/example")(func(s *sandbox.Sandbox) {
+		s.Run("special", "--e").
+			Expect(carapace.ActionValuesDescribed(
+				"--exclusive", "mutually exclusive flag",
+				"--exclusiveRepeatable", "mutually exclusive repeatable flag",
+			).NoSpace('.').
+				Tag("longhand flags"))
+
+		s.Run("special", "--exclusive", "--e").
+			Expect(carapace.ActionValues().NoSpace('.'))
+
+		s.Run("special", "--exclusiveRepeatable", "--e").
+			Expect(carapace.ActionValuesDescribed(
+				"--exclusiveRepeatable", "mutually exclusive repeatable flag",
+			).NoSpace('.').
+				Tag("longhand flags"))
+
+	})
+}

internal/pflagfork/flagset.go

@@ -37,7 +37,7 @@ func (f FlagSet) IsMutuallyExclusive(flag *pflag.Flag) bool {
 	if groups, ok := flag.Annotations["cobra_annotation_mutually_exclusive"]; ok {
 		for _, group := range groups {
 			for _, name := range strings.Split(group, " ") {
-				if other := f.Lookup(name); other != nil && other.Changed {
+				if other := f.Lookup(name); other != nil && other.Changed && other != flag {
 					return true
 				}
 			}