carapace-sh · rsteube · Nov 25, 2024 · Nov 25, 2024
diff --git a/completers/bloop_completer/Dockerfile b/completers/bloop_completer/Dockerfile
@@ -1,13 +1,15 @@
-FROM alpine
+FROM ubuntu
+
+RUN apt-get update \
+ && apt-get install -y bash curl elvish git scala
 
-RUN apk add --no-cache curl gcompat
-RUN apk add --no-cache \
-            --repository=https://dl-cdn.alpinelinux.org/alpine/edge/community \
-            elvish
 RUN curl -fL "https://github.com/coursier/launchers/raw/master/cs-x86_64-pc-linux.gz" \
   | gzip -d > /usr/bin/cs \
  && chmod +x /usr/bin/cs
+
+RUN cs setup -y
 RUN cs install bloop --only-prebuilt=true
 
 ENV PATH="$PATH:/root/.local/share/coursier/bin"
 RUN bloop
+ENTRYPOINT [ "bash" ]
diff --git a/completers/bloop_completer/cmd/autocomplete.go b/completers/bloop_completer/cmd/autocomplete.go
@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
@@ -15,13 +16,14 @@ func init() {
 	carapace.Gen(autocompleteCmd).Standalone()
 
 	autocompleteCmd.Flags().String("command", "", "")
-	autocompleteCmd.Flags().String("format", "", "")
-	autocompleteCmd.Flags().String("mode", "", "")
+	autocompleteCmd.Flags().String("format", "", "output format")
+	autocompleteCmd.Flags().String("mode", "", "completion mode")
 	autocompleteCmd.Flags().String("project", "", "")
 	rootCmd.AddCommand(autocompleteCmd)
 
-	// TODO flag completion
 	carapace.Gen(autocompleteCmd).FlagCompletion(carapace.ActionMap{
-		"format": carapace.ActionValues("bash", "fish", "zsh"),
+		"format":  carapace.ActionValues("bash", "fish", "zsh"),
+		"mode":    carapace.ActionValues("commands", "mainsfqcn", "projects", "project-commands", "protocols", "reporters", "testsfqcn"),
+		"project": bloop.ActionProjects(),
 	})
 }
diff --git a/completers/bloop_completer/cmd/bsp.go b/completers/bloop_completer/cmd/bsp.go
@@ -3,6 +3,7 @@ package cmd
 import (
 	"github.com/carapace-sh/carapace"
 	"github.com/carapace-sh/carapace-bin/pkg/actions/net"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
@@ -26,7 +27,7 @@ func init() {
 		"host":      net.ActionHosts(),
 		"pipe-name": carapace.ActionFiles(),
 		"port":      net.ActionPorts(),
-		"protocol":  carapace.ActionValues(), // TODO
+		"protocol":  bloop.ActionProtocols(),
 		"socket":    carapace.ActionFiles(),
 	})
 }
diff --git a/completers/bloop_completer/cmd/clean.go b/completers/bloop_completer/cmd/clean.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var cleanCmd = &cobra.Command{
-	Use:   "clean",
+	Use:   "clean <project>",
 	Short: "clean compilation caches",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -23,5 +24,12 @@ func init() {
 
 	cleanCmd.MarkFlagsMutuallyExclusive("include-dependencies", "propagate")
 
-	// TODO completion
+	carapace.Gen(cleanCmd).FlagCompletion(carapace.ActionMap{
+		"project":  bloop.ActionProjects(),
+		"projects": bloop.ActionProjects(),
+	})
+
+	carapace.Gen(cleanCmd).PositionalAnyCompletion(
+		bloop.ActionProjects().FilterArgs(),
+	)
 }
diff --git a/completers/bloop_completer/cmd/compile.go b/completers/bloop_completer/cmd/compile.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var compileCmd = &cobra.Command{
-	Use:   "compile",
+	Use:   "compile <project>",
 	Short: "compile projects",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -23,5 +24,13 @@ func init() {
 	compileCmd.Flags().BoolP("watch", "w", false, "run the command when projects' source files change")
 	rootCmd.AddCommand(compileCmd)
 
-	// TODO completion
+	carapace.Gen(compileCmd).FlagCompletion(carapace.ActionMap{
+		"project":  bloop.ActionProjects(),
+		"projects": bloop.ActionProjects(),
+		"reporter": bloop.ActionReporters(),
+	})
+
+	carapace.Gen(compileCmd).PositionalAnyCompletion(
+		bloop.ActionProjects().FilterArgs(),
+	)
 }
diff --git a/completers/bloop_completer/cmd/console.go b/completers/bloop_completer/cmd/console.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var consoleCmd = &cobra.Command{
-	Use:   "console",
+	Use:   "console <project>",
 	Short: "start console",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -26,14 +27,17 @@ func init() {
 	consoleCmd.Flags().String("reporter", "", "pick reporter to show compilation messages")
 	rootCmd.AddCommand(consoleCmd)
 
-	// TODO completion
 	carapace.Gen(consoleCmd).FlagCompletion(carapace.ActionMap{
 		"ammonite-version": carapace.ActionValues(),
 		"args":             carapace.ActionValues(),
 		"out-file":         carapace.ActionFiles(),
-		"project":          carapace.ActionValues(),
-		"projects":         carapace.ActionValues(),
+		"project":          bloop.ActionProjects(),
+		"projects":         bloop.ActionProjects(),
 		"repl":             carapace.ActionValues("scalac", "ammonite"),
-		"reporter":         carapace.ActionValues(),
+		"reporter":         bloop.ActionReporters(),
 	})
+
+	carapace.Gen(consoleCmd).PositionalCompletion(
+		bloop.ActionProjects(),
+	)
 }
diff --git a/completers/bloop_completer/cmd/link.go b/completers/bloop_completer/cmd/link.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var linkCmd = &cobra.Command{
-	Use:   "link",
+	Use:   "link <link>",
 	Short: "link projects",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -24,11 +25,14 @@ func init() {
 	linkCmd.Flags().BoolP("watch", "w", false, "run the command whenever projects' source files change")
 	rootCmd.AddCommand(linkCmd)
 
-	// TODO completion
 	carapace.Gen(linkCmd).FlagCompletion(carapace.ActionMap{
 		"main":     carapace.ActionValues(),
 		"optimize": carapace.ActionValues("debug", "release"),
-		"project":  carapace.ActionValues(),
-		"projects": carapace.ActionValues(),
+		"project":  bloop.ActionProjects(),
+		"projects": bloop.ActionProjects(),
 	})
+
+	carapace.Gen(linkCmd).PositionalAnyCompletion(
+		bloop.ActionProjects().FilterArgs(),
+	)
 }
diff --git a/completers/bloop_completer/cmd/root.go b/completers/bloop_completer/cmd/root.go
@@ -26,7 +26,7 @@ func init() {
 
 	carapace.Gen(rootCmd).FlagCompletion(carapace.ActionMap{
 		"config-dir": carapace.ActionDirectories(),
-		"debug":      carapace.ActionValues("all", "file-watching", "compilation", "test", "bsp", "link"), // TODO list?
+		"debug":      carapace.ActionValues("all", "file-watching", "compilation", "test", "bsp", "link"),
 	})
 
 }
diff --git a/completers/bloop_completer/cmd/run.go b/completers/bloop_completer/cmd/run.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var runCmd = &cobra.Command{
-	Use:   "run",
+	Use:   "run <project>",
 	Short: "run a project",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -26,13 +27,16 @@ func init() {
 	runCmd.Flags().BoolP("watch", "w", false, "run the command whenever projects' source files change")
 	rootCmd.AddCommand(runCmd)
 
-	// TODO completion
 	carapace.Gen(runCmd).FlagCompletion(carapace.ActionMap{
 		"args":     carapace.ActionValues(),
 		"main":     carapace.ActionValues(),
 		"optimize": carapace.ActionValues("debug", "release"),
-		"project":  carapace.ActionValues(),
-		"projects": carapace.ActionValues(),
-		"reporter": carapace.ActionValues(),
+		"project":  bloop.ActionProjects(),
+		"projects": bloop.ActionProjects(),
+		"reporter": bloop.ActionReporters(),
 	})
+
+	carapace.Gen(runCmd).PositionalAnyCompletion(
+		bloop.ActionProjects().FilterArgs(),
+	)
 }
diff --git a/completers/bloop_completer/cmd/test.go b/completers/bloop_completer/cmd/test.go
@@ -2,11 +2,12 @@ package cmd
 
 import (
 	"github.com/carapace-sh/carapace"
+	"github.com/carapace-sh/carapace-bin/pkg/actions/tools/bloop"
 	"github.com/spf13/cobra"
 )
 
 var testCmd = &cobra.Command{
-	Use:   "test",
+	Use:   "test <project>",
 	Short: "run tests",
 	Run:   func(cmd *cobra.Command, args []string) {},
 }
@@ -28,12 +29,15 @@ func init() {
 	testCmd.Flags().BoolP("watch", "w", false, "run the command when projects' source files change")
 	rootCmd.AddCommand(testCmd)
 
-	// TODO completion
 	carapace.Gen(testCmd).FlagCompletion(carapace.ActionMap{
 		"args":     carapace.ActionValues(),
 		"only":     carapace.ActionValues(),
-		"project":  carapace.ActionValues(),
-		"projects": carapace.ActionValues(),
-		"reporter": carapace.ActionValues(),
+		"project":  bloop.ActionProjects(),
+		"projects": bloop.ActionProjects(),
+		"reporter": bloop.ActionReporters(),
 	})
+
+	carapace.Gen(testCmd).PositionalAnyCompletion(
+		bloop.ActionProjects().FilterArgs(),
+	)
 }
diff --git a/pkg/actions/tools/bloop/bloop.go b/pkg/actions/tools/bloop/bloop.go
@@ -0,0 +1,46 @@
+package bloop
+
+import (
+	"strings"
+
+	"github.com/carapace-sh/carapace"
+)
+
+func autocomplete(mode string) carapace.Action {
+	return carapace.ActionExecCommand("bloop", "autocomplete", "--format", "fish", "--mode", mode)(func(output []byte) carapace.Action {
+		lines := strings.Split(string(output), "\n")
+		vals := make([]string, 0)
+
+		for _, line := range lines {
+			if line != "" {
+				value, description, _ := strings.Cut(line, "\t")
+				vals = append(vals, value, description)
+			}
+		}
+		return carapace.ActionValuesDescribed(vals...)
+	})
+}
+
+// ActionProjects completes projects
+//
+//	one
+//	two
+func ActionProjects() carapace.Action {
+	return autocomplete("projects").Tag("projects")
+}
+
+// ActionProtocols completes protocols
+//
+//	local
+//	tcp
+func ActionProtocols() carapace.Action {
+	return autocomplete("protocols").Tag("protocols")
+}
+
+// ActionReporters completes ActionReporters
+//
+//	scalac
+//	bloop
+func ActionReporters() carapace.Action {
+	return autocomplete("reporters").Tag("reporters")
+}