Merge pull request #60 from rsteube/macro-disableflagparsing

macro: added DisableFlagParsing()

action.go

@@ -37,9 +37,12 @@ func ActionSpec(path string) carapace.Action {
 func parseAction(cmd *cobra.Command, arr []string) carapace.Action {
 	if !cmd.DisableFlagParsing {
 		for _, entry := range arr {
-			if strings.HasPrefix(entry, "$spec(") {
-				cmd.DisableFlagParsing = true // implicitly disable flag parsing
-				break
+			if strings.HasPrefix(entry, "$") {
+				macro := strings.SplitN(strings.TrimPrefix(entry, "$"), "(", 2)[0]
+				if m, ok := macros[macro]; ok && m.disableFlagParsing {
+					cmd.DisableFlagParsing = true // implicitly disable flag parsing
+					break
+				}
 			}
 		}
 	}
@@ -78,25 +81,6 @@ func parseAction(cmd *cobra.Command, arr []string) carapace.Action {
 			return carapace.ActionValues()
 		}))
 
-		addCoreMacro("directories", MacroN(carapace.ActionDirectories))
-		addCoreMacro("files", MacroV(carapace.ActionFiles))
-		addCoreMacro("message", MacroI(carapace.ActionMessage))
-		addCoreMacro("spec", MacroI(ActionSpec))
-		addCoreMacro("", MacroI(func(s string) carapace.Action {
-			return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-				return carapace.ActionExecCommand("sh", "-c", s)(func(output []byte) carapace.Action {
-					lines := strings.Split(string(output), "\n")
-					vals := make([]string, 0)
-					for _, line := range lines {
-						if line != "" {
-							vals = append(vals, parseValue(line)...)
-						}
-					}
-					return carapace.ActionStyledValuesDescribed(vals...)
-				}).Invoke(c).ToA()
-			})
-		}))
-
 		batch := carapace.Batch()
 		vals := make([]string, 0)
 		for _, elem := range arr {

core.go

@@ -0,0 +1,29 @@
+package spec
+
+import (
+	"strings"
+
+	"github.com/rsteube/carapace"
+)
+
+func init() {
+	addCoreMacro("directories", MacroN(carapace.ActionDirectories))
+	addCoreMacro("disableflagparsing", MacroN(func() carapace.Action { return carapace.ActionValues() }).DisableFlagParsing())
+	addCoreMacro("files", MacroV(carapace.ActionFiles))
+	addCoreMacro("message", MacroI(carapace.ActionMessage))
+	addCoreMacro("spec", MacroI(ActionSpec).DisableFlagParsing())
+	addCoreMacro("", MacroI(func(s string) carapace.Action {
+		return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+			return carapace.ActionExecCommand("sh", "-c", s)(func(output []byte) carapace.Action {
+				lines := strings.Split(string(output), "\n")
+				vals := make([]string, 0)
+				for _, line := range lines {
+					if line != "" {
+						vals = append(vals, parseValue(line)...)
+					}
+				}
+				return carapace.ActionStyledValuesDescribed(vals...)
+			}).Invoke(c).ToA()
+		})
+	}))
+}

macro.go

@@ -11,11 +11,13 @@ import (
 )
 
 type Macro struct {
-	f func(string) carapace.Action
-	s func() string
+	f                  func(string) carapace.Action
+	s                  func() string
+	disableFlagParsing bool
 }
 
-func (m Macro) Signature() string { return m.s() }
+func (m Macro) Signature() string         { return m.s() }
+func (m Macro) DisableFlagParsing() Macro { m.disableFlagParsing = true; return m }
 
 var macros = make(map[string]Macro)