tmp

carapace-sh · Dec 19, 2023 · 61a8f77 · 61a8f77
1 parent 07b022a
commit 61a8f77
Showing 1 changed file with 19 additions and 9 deletions.
diff --git a/cmd/carapace/cmd/macros.go b/cmd/carapace/cmd/macros.go
@@ -34,18 +34,28 @@ func init() {
 	macrosCmd.Flags().SetInterspersed(false)
 
 	carapace.Gen(macrosCmd).PositionalCompletion(
-		carapace.ActionExecCommand("carapace", "--macros")(func(output []byte) carapace.Action {
-			lines := strings.Split(string(output), "\n")
+		carapace.ActionMultiPartsN("(", 2, func(c carapace.Context) carapace.Action {
+			switch len(c.Parts) {
+			case 0:
+				return carapace.ActionExecCommand("carapace", "--macros")(func(output []byte) carapace.Action {
+					lines := strings.Split(string(output), "\n")
 
-			vals := make([]string, 0)
-			for _, line := range lines[:len(lines)-1] {
-				if fields := strings.Fields(line); len(fields) > 1 {
-					vals = append(vals, fields[0], strings.Join(fields[1:], " "))
-				} else {
-					vals = append(vals, fields[0], "")
+					vals := make([]string, 0)
+					for _, line := range lines[:len(lines)-1] {
+						if fields := strings.Fields(line); len(fields) > 1 {
+							vals = append(vals, fields[0], strings.Join(fields[1:], " "))
+						} else {
+							vals = append(vals, fields[0], "")
+						}
+					}
+					return carapace.ActionValuesDescribed(vals...).Invoke(carapace.Context{}).ToMultiPartsA(".")
+				})
+			default:
+				if m, ok := actions.MacroMap[c.Parts[0]]; ok {
+					return carapace.ActionValues(m.Signature() + ")")
 				}
+				return carapace.ActionValues(")")
 			}
-			return carapace.ActionValuesDescribed(vals...).Invoke(carapace.Context{}).ToMultiPartsA(".")
 		}),
 	)