Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pkg/terminal: support zed editor and allow args in DELVE_EDITOR #3899

Merged
merged 1 commit into from
Jan 12, 2025
+18 −6
Merged

pkg/terminal: support zed editor and allow args in DELVE_EDITOR #3899

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions pkg/terminal/command.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1960,22 +1960,32 @@ func tracepoint(t *Term, ctx callContext, args string) error {
return err
}

func getEditorName() (string, error) {
func getEditorName() (string, []string, error) {
var editor string
if editor = os.Getenv("DELVE_EDITOR"); editor == "" {
if editor = os.Getenv("EDITOR"); editor == "" {
return "", errors.New("Neither DELVE_EDITOR or EDITOR is set")
return "", nil, errors.New("Neither DELVE_EDITOR or EDITOR is set")
}
}
return editor, nil

editorParts := strings.Fields(editor)
editor = editorParts[0]

var userArgs []string
if len(editorParts) > 1 {
userArgs = editorParts[1:]
}

return editor, userArgs, nil
}

func runEditor(args ...string) error {
editor, err := getEditorName()
editor, userArgs, err := getEditorName()
if err != nil {
return err
}
cmd := exec.Command(editor, args...)
allArgs := append(userArgs, args...)
cmd := exec.Command(editor, allArgs...)
cmd.Stdin = os.Stdin
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
Expand All @@ -1987,13 +1997,15 @@ func edit(t *Term, ctx callContext, args string) error {
if err != nil {
return err
}
editor, err := getEditorName()
editor, _, err := getEditorName()
if err != nil {
return err
}
switch editor {
case "code":
return runEditor("--goto", fmt.Sprintf("%s:%d", file, lineno))
case "zed":
return runEditor(fmt.Sprintf("%s:%d:0", file, lineno))
case "hx":
return runEditor(fmt.Sprintf("%s:%d", file, lineno))
case "vi", "vim", "nvim":
Expand Down