tmp

carapace.go

@@ -3,6 +3,7 @@ package carapace
 
 import (
 	"os"
+	"sync"
 
 	"github.com/rsteube/carapace/internal/shell"
 	"github.com/spf13/cobra"
@@ -70,9 +71,16 @@ func (c Carapace) DashAnyCompletion(action Action) {
 	storage.get(c.cmd).dashAny = action
 }
 
+// TODO move to storage
+var flagMutex sync.RWMutex
+
 // FlagCompletion defines completion for flags using a map consisting of name and Action.
 func (c Carapace) FlagCompletion(actions ActionMap) {
-	if e := storage.get(c.cmd); e.flag == nil {
+	e := storage.get(c.cmd)
+	e.flagMutex.Lock()
+	defer e.flagMutex.Unlock()
+
+	if e.flag == nil {
 		e.flag = actions
 	} else {
 		for name, action := range actions {

storage.go

@@ -15,6 +15,7 @@ import (
 
 type entry struct {
 	flag          ActionMap
+	flagMutex     sync.RWMutex
 	positional    []Action
 	positionalAny Action
 	dash          []Action
@@ -37,8 +38,10 @@ func (s _storage) get(cmd *cobra.Command) *entry {
 	if !ok {
 		storageMutex.Lock()
 		defer storageMutex.Unlock()
-		e = &entry{}
-		s[cmd] = e
+		if e, ok = s[cmd]; !ok {
+			e = &entry{}
+			s[cmd] = e
+		}
 	}
 	return e
 }

storage_test.go

@@ -82,14 +82,14 @@ func BenchmarkStorage(b *testing.B) {
 	cmd2 := &cobra.Command{}
 	b.RunParallel(func(pb *testing.PB) {
 		for pb.Next() {
-			// Gen(cmd).FlagCompletion(ActionMap{
-			// 	"flag1": ActionValues("a", "b"),
-			// })
+			Gen(cmd).FlagCompletion(ActionMap{
+				"flag1": ActionValues("a", "b"),
+			})
 			Gen(cmd).PositionalCompletion(ActionValues("a", "b"))
 
-			// Gen(cmd2).FlagCompletion(ActionMap{
-			// 	"flag2": ActionValues("a", "b"),
-			// })
+			Gen(cmd2).FlagCompletion(ActionMap{
+				"flag2": ActionValues("a", "b"),
+			})
 			Gen(cmd2).PositionalCompletion(ActionValues("a", "b"))
 		}
 	})