From eab5576759427767393c612812e3595fd24a99d5 Mon Sep 17 00:00:00 2001 From: Luke Duan Date: Thu, 5 Nov 2026 11:36:36 -0700 Subject: [PATCH] fix: allow args when setting $EDITOR --- internal/cmd/edit/edit.go | 16 +++++++++++----- internal/cmd/edit/edit_internal_test.go | 12 +++++++++++- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/internal/cmd/edit/edit.go b/internal/cmd/edit/edit.go index 42ed4c8..cf5c77e 100644 --- a/internal/cmd/edit/edit.go +++ b/internal/cmd/edit/edit.go @@ -217,12 +217,17 @@ func edit[T, TS any]( return loadEditedFile[T](fs, originalJSON, tmpFileName) } -func getEditor() (string, error) { - editor := os.Getenv("EDITOR") +func getEditor() (string, []string, error) { + editor := strings.TrimSpace(os.Getenv("EDITOR")) if editor == "" { editor = osutil.DefaultEditor() } - return exec.LookPath(editor) + fields := strings.Fields(editor) + path, err := exec.LookPath(fields[0]) + if err != nil { + return "", nil, err + } + return path, fields[1:], nil } func cleanJSON[T any](originalJSON []byte) []byte { @@ -260,11 +265,12 @@ func editFile( ctx context.Context, fileName string, ) error { - editor, err := getEditor() + editor, args, err := getEditor() if err != nil { return err } - cmd := exec.CommandContext(ctx, editor, fileName) + args = append(args, fileName) + cmd := exec.CommandContext(ctx, editor, args...) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr cmd.Stdin = os.Stdin diff --git a/internal/cmd/edit/edit_internal_test.go b/internal/cmd/edit/edit_internal_test.go index 2506a6e..7db6a0c 100644 --- a/internal/cmd/edit/edit_internal_test.go +++ b/internal/cmd/edit/edit_internal_test.go @@ -22,17 +22,26 @@ func TestGetEditor(t *testing.T) { name string editorEnv string expectedEditor string + expectedArgs []string expectedErr string }{ { name: "returns default when EDITOR not set", editorEnv: "", expectedEditor: osutil.Executable(osutil.DefaultBinDir(), osutil.DefaultEditor()), + expectedArgs: []string{}, }, { name: "returns EDITOR env var when set", editorEnv: osutil.ExecutableScript("testdata", "no-change"), expectedEditor: osutil.ExecutableScript("testdata", "no-change"), + expectedArgs: []string{}, + }, + { + name: "returns EDITOR args when set", + editorEnv: osutil.ExecutableScript("testdata", "no-change") + " -w", + expectedEditor: osutil.ExecutableScript("testdata", "no-change"), + expectedArgs: []string{"-w"}, }, { name: "returns error when env set to missing file", @@ -49,12 +58,13 @@ func TestGetEditor(t *testing.T) { t.Setenv("EDITOR", "") } - editor, err := getEditor() + editor, args, err := getEditor() if tt.expectedErr != "" { require.EqualError(t, err, tt.expectedErr) } else { require.NoError(t, err) require.Equal(t, tt.expectedEditor, editor) + require.Equal(t, tt.expectedArgs, args) } }) }