exposed ActionMacro

carapace-sh · May 8, 2022 · 11a1165 · 11a1165
1 parent d8b70b5
commit 11a1165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/macro.go b/macro.go
@@ -25,7 +25,8 @@ func AddMacro(s string, m Macro) {
 	macros["_"+s] = m
 }
 
-func parseMacro(s string) carapace.Action {
+// ActionMacro completes given macro
+func ActionMacro(s string) carapace.Action {
 	r := regexp.MustCompile(`^\$(?P<macro>[^(]*)(\((?P<arg>.*)\))?$`)
 	if !r.MatchString(s) {
 		return carapace.ActionMessage(fmt.Sprintf("malformed macro: '%v'", s))

diff --git a/spec.go b/spec.go
@@ -119,7 +119,7 @@ func parseAction(cmd *cobra.Command, arr []string) carapace.Action {
 			if elemSubst, err := c.Envsubst(elem); err != nil {
 				batch = append(batch, carapace.ActionMessage(fmt.Sprintf("%v: %v", err.Error(), elem)))
 			} else if strings.HasPrefix(elemSubst, "$") { // macro
-				batch = append(batch, parseMacro(elemSubst))
+				batch = append(batch, ActionMacro(elemSubst))
 			} else {
 				vals = append(vals, parseValue(elemSubst)...)
 			}