ActionMacro: support format

carapace-sh · Sep 14, 2024 · 7c82fa3 · 7c82fa3
1 parent 6d1ce29
commit 7c82fa3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/action.go b/action.go
@@ -58,8 +58,11 @@ func executable() string {
 }
 
 // ActionMacro completes given macro
-func ActionMacro(s string) carapace.Action {
+func ActionMacro(s string, a ...any) carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
+		if len(a) > 0 {
+			s = fmt.Sprintf(s, a...)
+		}
 		r := regexp.MustCompile(`^\$(?P<macro>[^(]*)(\((?P<arg>.*)\))?$`)
 		matches := r.FindStringSubmatch(s)
 		if matches == nil {

diff --git a/macro.go b/macro.go
@@ -34,7 +34,7 @@ func AddMacro(s string, m Macro) {
 
 func MacroN(f func() carapace.Action) Macro {
 	return Macro{
-		macro: macro.MacroN[carapace.Action](func() (*carapace.Action, error) {
+		macro: macro.MacroN(func() (*carapace.Action, error) {
 			a := f()
 			return &a, nil
 		}),
@@ -43,7 +43,7 @@ func MacroN(f func() carapace.Action) Macro {
 
 func MacroI[T any](f func(t T) carapace.Action) Macro {
 	return Macro{
-		macro: macro.MacroI[T, carapace.Action](func(t T) (*carapace.Action, error) {
+		macro: macro.MacroI(func(t T) (*carapace.Action, error) {
 			a := f(t)
 			return &a, nil
 		}),
@@ -52,7 +52,7 @@ func MacroI[T any](f func(t T) carapace.Action) Macro {
 
 func MacroV[T any](f func(t ...T) carapace.Action) Macro {
 	return Macro{
-		macro: macro.MacroV[T, carapace.Action](func(t ...T) (*carapace.Action, error) {
+		macro: macro.MacroV(func(t ...T) (*carapace.Action, error) {
 			a := f(t...)
 			return &a, nil
 		}),