Merge pull request #1271 from rsteube/rustup-default-channels

rustup: default channel completion
carapace-sh · Aug 22, 2022 · ebd4017 · ebd4017
2 parents 476a1f4 + 0ef69c8
commit ebd4017
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/completers/rustup_completer/cmd/action/action.go b/completers/rustup_completer/cmd/action/action.go
@@ -5,8 +5,17 @@ import (
 	"strings"
 
 	"github.com/rsteube/carapace"
+	"github.com/rsteube/carapace/pkg/style"
 )
 
+func ActionDefaultChannels() carapace.Action {
+	return carapace.ActionStyledValues(
+		"stable", style.Green,
+		"beta", style.Yellow,
+		"nightly", style.Red,
+	)
+}
+
 func ActionToolchains() carapace.Action {
 	return carapace.ActionCallback(func(c carapace.Context) carapace.Action {
 		return carapace.ActionExecCommand("rustup", "toolchain", "list")(func(output []byte) carapace.Action {

diff --git a/completers/rustup_completer/cmd/default.go b/completers/rustup_completer/cmd/default.go
@@ -19,6 +19,9 @@ func init() {
 	rootCmd.AddCommand(defaultCmd)
 
 	carapace.Gen(defaultCmd).PositionalCompletion(
-		action.ActionToolchains(),
+		carapace.Batch(
+			action.ActionDefaultChannels(),
+			action.ActionToolchains(),
+		).ToA(),
 	)
 }
diff --git a/completers/rustup_completer/cmd/toolchain_install.go b/completers/rustup_completer/cmd/toolchain_install.go
@@ -36,7 +36,7 @@ func init() {
 
 	carapace.Gen(toolchain_installCmd).PositionalAnyCompletion(
 		carapace.ActionCallback(func(c carapace.Context) carapace.Action {
-			return carapace.ActionValues("beta", "nightly", "stable").Invoke(c).Filter(c.Args).ToA()
+			return action.ActionDefaultChannels().Invoke(c).Filter(c.Args).ToA()
 		}),
 	)
 }