Merge pull request #859 from rsteube/multipartsp-contest

MultiPartsP: remove context
carapace-sh · Jul 29, 2023 · c59c323 · c59c323
2 parents 45fb542 + fc6f5d7
commit c59c323
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/action.go b/action.go
@@ -116,7 +116,7 @@ func (a Action) MultiParts(dividers ...string) Action {
 }
 
 // MultiPartsP is like MultiParts but with placeholder completion.
-func (a Action) MultiPartsP(delimiter string, placeholderPattern string, f func(segment string, matches map[string]string, c Context) Action) Action {
+func (a Action) MultiPartsP(delimiter string, placeholderPattern string, f func(segment string, matches map[string]string) Action) Action {
 	return ActionCallback(func(c Context) Action {
 		invoked := a.Invoke(c)
 
@@ -171,7 +171,7 @@ func (a Action) MultiPartsP(delimiter string, placeholderPattern string, f func(
 			actions := make([]Action, 0, len(matchedSegments))
 			for key, value := range matchedSegments {
 				if placeholder.MatchString(key) {
-					actions = append(actions, f(key, matchedData, c))
+					actions = append(actions, f(key, matchedData))
 				} else {
 					actions = append(actions, ActionStyledValuesDescribed(key, value.Description, value.Style)) // TODO tag,..
 				}

diff --git a/docs/src/carapace/action/multiPartsP.md b/docs/src/carapace/action/multiPartsP.md
@@ -8,7 +8,7 @@ carapace.ActionStyledValuesDescribed(
 	"styles/<style>", "details", style.Default,
 	"styles/custom", "custom style", style.Of(style.Blue, style.Blink),
 	"styles", "list", style.Yellow,
-).MultiPartsP("/", "<.*>", func(segment string, matches map[string]string, c carapace.Context) carapace.Action {
+).MultiPartsP("/", "<.*>", func(segment string, matches map[string]string) carapace.Action {
 	switch segment {
 	case "<style>":
 		return carapace.ActionStyles()

diff --git a/example/cmd/modifier.go b/example/cmd/modifier.go
@@ -121,7 +121,7 @@ func init() {
 			"styles/<style>", "details", style.Default,
 			"styles/custom", "custom style", style.Of(style.Blue, style.Blink),
 			"styles", "list", style.Yellow,
-		).MultiPartsP("/", "<.*>", func(segment string, matches map[string]string, c carapace.Context) carapace.Action {
+		).MultiPartsP("/", "<.*>", func(segment string, matches map[string]string) carapace.Action {
 			switch segment {
 			case "<style>":
 				return carapace.ActionStyles()