refactor

Author: ethanndickson

completion.go

@@ -18,7 +18,7 @@ func DefaultCompletionHandler(inv *Invocation) []string {
 		allResps = append(allResps, cmd.Name())
 	}
 	for _, opt := range inv.Command.Options {
-		if opt.ValueSource == ValueSourceNone || opt.Value.Type() == "string-array" {
+		if opt.ValueSource == ValueSourceNone || opt.ValueSource == ValueSourceDefault || opt.Value.Type() == "string-array" {
 			allResps = append(allResps, "--"+opt.Flag)
 		}
 	}

completion/all.go

@@ -7,6 +7,7 @@ import (
 	"os/user"
 	"path/filepath"
 	"strings"
+	"text/template"
 
 	"github.com/coder/serpent"
 )
@@ -19,10 +20,10 @@ const (
 )
 
 var shellCompletionByName = map[string]func(io.Writer, string) error{
-	BashShell:  GenerateBashCompletion,
-	FishShell:  GenerateFishCompletion,
-	ZShell:     GenerateZshCompletion,
-	Powershell: GeneratePowershellCompletion,
+	BashShell:  GenerateCompletion(bashCompletionTemplate),
+	FishShell:  GenerateCompletion(fishCompletionTemplate),
+	ZShell:     GenerateCompletion(zshCompletionTemplate),
+	Powershell: GenerateCompletion(pshCompletionTemplate),
 }
 
 func ShellOptions(choice *string) *serpent.Enum {
@@ -72,3 +73,26 @@ func GetUserShell() (string, error) {
 
 	return "", fmt.Errorf("default shell not found")
 }
+
+func GenerateCompletion(
+	scriptTemplate string,
+) func(io.Writer, string) error {
+	return func(w io.Writer, rootCmdName string) error {
+		tmpl, err := template.New("script").Parse(scriptTemplate)
+		if err != nil {
+			return fmt.Errorf("parse template: %w", err)
+		}
+
+		err = tmpl.Execute(
+			w,
+			map[string]string{
+				"Name": rootCmdName,
+			},
+		)
+		if err != nil {
+			return fmt.Errorf("execute template: %w", err)
+		}
+
+		return nil
+	}
+}

completion/bash.go

@@ -1,11 +1,5 @@
 package completion
 
-import (
-	"fmt"
-	"io"
-	"text/template"
-)
-
 const bashCompletionTemplate = `
 _generate_{{.Name}}_completions() {
     # Capture the line excluding the command, and everything after the current word
@@ -26,25 +20,3 @@ _generate_{{.Name}}_completions() {
 # Setup Bash to use the function for completions for '{{.Name}}'
 complete -F _generate_{{.Name}}_completions {{.Name}}
 `
-
-func GenerateBashCompletion(
-	w io.Writer,
-	rootCmdName string,
-) error {
-	tmpl, err := template.New("bash").Parse(bashCompletionTemplate)
-	if err != nil {
-		return fmt.Errorf("parse template: %w", err)
-	}
-
-	err = tmpl.Execute(
-		w,
-		map[string]string{
-			"Name": rootCmdName,
-		},
-	)
-	if err != nil {
-		return fmt.Errorf("execute template: %w", err)
-	}
-
-	return nil
-}

completion/fish.go

@@ -1,11 +1,5 @@
 package completion
 
-import (
-	"fmt"
-	"io"
-	"text/template"
-)
-
 const fishCompletionTemplate = `
 function _{{.Name}}_completions
 	# Capture the full command line as an array
@@ -17,25 +11,3 @@ end
 # Setup Fish to use the function for completions for '{{.Name}}'
 complete -c {{.Name}} -f -a '(_{{.Name}}_completions)'
 `
-
-func GenerateFishCompletion(
-	w io.Writer,
-	rootCmdName string,
-) error {
-	tmpl, err := template.New("fish").Parse(fishCompletionTemplate)
-	if err != nil {
-		return fmt.Errorf("parse template: %w", err)
-	}
-
-	err = tmpl.Execute(
-		w,
-		map[string]string{
-			"Name": rootCmdName,
-		},
-	)
-	if err != nil {
-		return fmt.Errorf("execute template: %w", err)
-	}
-
-	return nil
-}

completion/powershell.go

@@ -1,11 +1,5 @@
 package completion
 
-import (
-	"fmt"
-	"io"
-	"text/template"
-)
-
 const pshCompletionTemplate = `
 
 # Escaping output sourced from:
@@ -37,7 +31,6 @@ $_{{.Name}}_completions = {
         $Command = $Command + $Space
     }
     # Get completions by calling the command with the COMPLETION_MODE environment variable set to 1
-    "$Command" | Out-File -Append -FilePath "out.log"
     $env:COMPLETION_MODE = 1
     Invoke-Expression $Command | Where-Object { $_ -like "$wordToComplete*" } | ForEach-Object {
         "$_" | _{{.Name}}_escapeStringWithSpecialChars
@@ -47,25 +40,3 @@ $_{{.Name}}_completions = {
 
 Register-ArgumentCompleter -CommandName {{.Name}} -ScriptBlock $_{{.Name}}_completions
 `
-
-func GeneratePowershellCompletion(
-	w io.Writer,
-	rootCmdName string,
-) error {
-	tmpl, err := template.New("powershell").Parse(pshCompletionTemplate)
-	if err != nil {
-		return fmt.Errorf("parse template: %w", err)
-	}
-
-	err = tmpl.Execute(
-		w,
-		map[string]string{
-			"Name": rootCmdName,
-		},
-	)
-	if err != nil {
-		return fmt.Errorf("execute template: %w", err)
-	}
-
-	return nil
-}

completion/zsh.go

@@ -1,11 +1,5 @@
 package completion
 
-import (
-	"fmt"
-	"io"
-	"text/template"
-)
-
 const zshCompletionTemplate = `
 _{{.Name}}_completions() {
 	local -a args completions
@@ -16,25 +10,3 @@ _{{.Name}}_completions() {
 
 compdef _{{.Name}}_completions {{.Name}}
 `
-
-func GenerateZshCompletion(
-	w io.Writer,
-	rootCmdName string,
-) error {
-	tmpl, err := template.New("zsh").Parse(zshCompletionTemplate)
-	if err != nil {
-		return fmt.Errorf("parse template: %w", err)
-	}
-
-	err = tmpl.Execute(
-		w,
-		map[string]string{
-			"Name": rootCmdName,
-		},
-	)
-	if err != nil {
-		return fmt.Errorf("execute template: %w", err)
-	}
-
-	return nil
-}