Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions internal/cmd/edit/edit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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
Expand Down
12 changes: 11 additions & 1 deletion internal/cmd/edit/edit_internal_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)
}
})
}
Expand Down
Loading