Merge pull request #36 from rsteube/rename-macrovari

renamed MacroVarI to MacroV
carapace-sh · May 6, 2022 · 2371a4a · 2371a4a
2 parents a08bf7e + f157e55
commit 2371a4a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/macro.go b/macro.go
@@ -65,7 +65,7 @@ func MacroI[T any](f func(t T) carapace.Action) Macro {
 	}
 }
 
-func MacroVarI[T any](f func(s ...T) carapace.Action) Macro {
+func MacroV[T any](f func(s ...T) carapace.Action) Macro {
 	return Macro{
 		Func: func(s string) carapace.Action {
 			if s == "" {

diff --git a/macro_test.go b/macro_test.go
@@ -27,12 +27,12 @@ func TestSignature(t *testing.T) {
 		t.Errorf("should be: %v", expected)
 	}
 
-	signature = MacroVarI(func(a ...Arg) carapace.Action { return carapace.ActionValues() }).Signature()
+	signature = MacroV(func(a ...Arg) carapace.Action { return carapace.ActionValues() }).Signature()
 	if expected := `[{name: "", option: false}]`; signature != expected {
 		t.Errorf("should be: %v", expected)
 	}
 
-	signature = MacroVarI(func(b ...bool) carapace.Action { return carapace.ActionValues() }).Signature()
+	signature = MacroV(func(b ...bool) carapace.Action { return carapace.ActionValues() }).Signature()
 	if expected := `[false]`; signature != expected {
 		t.Errorf("should be: %v", expected)
 	}

diff --git a/spec.go b/spec.go
@@ -95,7 +95,7 @@ func parseAction(cmd *cobra.Command, arr []string) carapace.Action {
 			nospace = true
 			return carapace.ActionValues()
 		}))
-		addCoreMacro("files", MacroVarI(carapace.ActionFiles))
+		addCoreMacro("files", MacroV(carapace.ActionFiles))
 		addCoreMacro("directories", MacroN(carapace.ActionDirectories))
 		addCoreMacro("message", MacroI(carapace.ActionMessage))
 		addCoreMacro("", MacroI(func(s string) carapace.Action {