Add support for EDITOR with args to commands

cli/consumer_command.go

@@ -565,6 +565,7 @@ func (c *consumerCmd) interactiveEdit(cfg api.ConsumerConfig) (*api.ConsumerConf
 	if editor == "" {
 		return &api.ConsumerConfig{}, fmt.Errorf("set EDITOR environment variable to your chosen editor")
 	}
+	editor, args := splitCommand(editor)
 
 	cj, err := decoratedYamlMarshal(cfg)
 	if err != nil {
@@ -584,7 +585,8 @@ func (c *consumerCmd) interactiveEdit(cfg api.ConsumerConfig) (*api.ConsumerConf
 
 	tfile.Close()
 
-	cmd := exec.Command(editor, tfile.Name())
+	args = append(args, tfile.Name())
+	cmd := exec.Command(editor, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

cli/context_command.go

@@ -238,6 +238,7 @@ func (c *ctxCommand) editCommand(pc *fisk.ParseContext) error {
 	if editor == "" {
 		return fmt.Errorf("set EDITOR environment variable to your chosen editor")
 	}
+	editor, args := splitCommand(editor)
 
 	if !natscontext.IsKnown(c.name) {
 		return fmt.Errorf("unknown context %q", c.name)
@@ -289,7 +290,8 @@ func (c *ctxCommand) editCommand(pc *fisk.ParseContext) error {
 		editFile = f.Name()
 	}
 
-	cmd := exec.Command(editor, editFile)
+	args = append(args, editFile)
+	cmd := exec.Command(editor, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

cli/errors_command.go

@@ -122,9 +122,11 @@ func (c *errCmd) listAction(_ *fisk.ParseContext) error {
 }
 
 func (c *errCmd) editAction(pc *fisk.ParseContext) error {
-	if os.Getenv("EDITOR") == "" {
+	editor := os.Getenv("EDITOR")
+	if editor == "" {
 		return fmt.Errorf("EDITOR variable is not set")
 	}
+	editor, args := splitCommand(editor)
 
 	errs, err := c.loadErrors(nil)
 	if err != nil {
@@ -162,8 +164,10 @@ func (c *errCmd) editAction(pc *fisk.ParseContext) error {
 	tfile.Write(fj)
 	tfile.Close()
 
+	args = append(args, tfile.Name())
+
 	for {
-		cmd := exec.Command(os.Getenv("EDITOR"), tfile.Name())
+		cmd := exec.Command(editor, args...)
 		cmd.Stdin = os.Stdin
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr

cli/stream_command.go

@@ -1797,6 +1797,7 @@ func (c *streamCmd) interactiveEdit(cfg api.StreamConfig) (api.StreamConfig, err
 	if editor == "" {
 		return api.StreamConfig{}, fmt.Errorf("set EDITOR environment variable to your chosen editor")
 	}
+	editor, args := splitCommand(editor)
 
 	cj, err := decoratedYamlMarshal(cfg)
 	if err != nil {
@@ -1816,7 +1817,8 @@ func (c *streamCmd) interactiveEdit(cfg api.StreamConfig) (api.StreamConfig, err
 
 	tfile.Close()
 
-	cmd := exec.Command(editor, tfile.Name())
+	args = append(args, tfile.Name())
+	cmd := exec.Command(editor, args...)
 	cmd.Stdin = os.Stdin
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr

cli/util.go

@@ -254,6 +254,14 @@ func splitString(s string) []string {
 	})
 }
 
+// Split the string into a command and its arguments.
+func splitCommand(s string) (string, []string) {
+	cmdAndArgs := strings.Fields(s)
+	cmd := cmdAndArgs[0]
+	args := cmdAndArgs[1:]
+	return cmd, args
+}
+
 func splitCLISubjects(subjects []string) []string {
 	new := []string{}
 

cli/util_test.go

@@ -15,6 +15,7 @@ package cli
 
 import (
 	"errors"
+	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -85,6 +86,23 @@ func TestSplitString(t *testing.T) {
 	}
 }
 
+func TestSplitCommand(t *testing.T) {
+	cmd, args := splitCommand("vim")
+	if cmd != "vim" && len(args) != 0 {
+		t.Fatalf("Expected vim and [], got %v and %v", cmd, args)
+	}
+
+	cmd, args = splitCommand("code --wait")
+	if cmd != "code" && !slices.Equal(args, []string{"--wait"}) {
+		t.Fatalf("Expected code and [\"--wait\"], got %v and %v", cmd, args)
+	}
+
+	cmd, args = splitCommand("code --wait --new-window")
+	if cmd != "code" && !slices.Equal(args, []string{"--wait", "--new-window"}) {
+		t.Fatalf("Expected code and [\"--wait\", \"--new-window\"], got %v and %v", cmd, args)
+	}
+}
+
 func TestRandomString(t *testing.T) {
 	for i := 0; i < 1000; i++ {
 		if len(randomString(1024, 1024)) != 1024 {