git.iko.soy/crush
on main help sign in
fix(editor): fix opening `$EDITOR` when it contains arguments (#1481)
77da29dAmolith
internal/tui/components/chat/editor/editor.go+6−7
compare with main
unifiedsplit
@@ -6,7 +6,6 @@ import (
6 "math/rand"
6 "math/rand"
7 "net/http"
7 "net/http"
8 "os"
8 "os"
9− "os/exec"
10 "path/filepath"
9 "path/filepath"
11 "runtime"
10 "runtime"
12 "slices"
11 "slices"
@@ -96,7 +95,7 @@ type OpenEditorMsg struct {
96func (m *editorCmp) openEditor(value string) tea.Cmd {
95func (m *editorCmp) openEditor(value string) tea.Cmd {
97 editor := os.Getenv("EDITOR")
96 editor := os.Getenv("EDITOR")
98 if editor == "" {
97 if editor == "" {
99− // Use platform-appropriate default editor
98+ // Use platform-appropriate default editor.
100 if runtime.GOOS == "windows" {
99 if runtime.GOOS == "windows" {
101 editor = "notepad"
100 editor = "notepad"
102 } else {
101 } else {
@@ -112,11 +111,11 @@ func (m *editorCmp) openEditor(value string) tea.Cmd {
112 if _, err := tmpfile.WriteString(value); err != nil {
111 if _, err := tmpfile.WriteString(value); err != nil {
113 return util.ReportError(err)
112 return util.ReportError(err)
114 }
113 }
114+
115+ // Build the full shell command with the file argument.
115− c := exec.CommandContext(context.TODO(), editor, tmpfile.Name())
116+ cmdStr := fmt.Sprintf("%s %s", editor, tmpfile.Name())
116− c.Stdin = os.Stdin
117+
117− c.Stdout = os.Stdout
118− c.Stderr = os.Stderr
119− return tea.ExecProcess(c, func(err error) tea.Msg {
118+ return util.ExecShell(context.TODO(), cmdStr, func(err error) tea.Msg {
120 if err != nil {
119 if err != nil {
121 return util.ReportError(err)
120 return util.ReportError(err)
122 }
121 }
internal/tui/util/shell.gonew file+58
@@ -0,0 +1,58 @@
1+package util
2+
3+import (
4+ "context"
5+ "io"
6+ "strings"
7+
8+ tea "charm.land/bubbletea/v2"
9+ "mvdan.cc/sh/v3/interp"
10+ "mvdan.cc/sh/v3/syntax"
11+)
12+
13+// shellCommand wraps a shell interpreter to implement tea.ExecCommand.
14+type shellCommand struct {
15+ ctx context.Context
16+ file *syntax.File
17+ stdin io.Reader
18+ stdout io.Writer
19+ stderr io.Writer
20+}
21+
22+func (s *shellCommand) SetStdin(r io.Reader) {
23+ s.stdin = r
24+}
25+
26+func (s *shellCommand) SetStdout(w io.Writer) {
27+ s.stdout = w
28+}
29+
30+func (s *shellCommand) SetStderr(w io.Writer) {
31+ s.stderr = w
32+}
33+
34+func (s *shellCommand) Run() error {
35+ runner, err := interp.New(
36+ interp.StdIO(s.stdin, s.stdout, s.stderr),
37+ )
38+ if err != nil {
39+ return err
40+ }
41+ return runner.Run(s.ctx, s.file)
42+}
43+
44+// ExecShell executes a shell command string using tea.Exec.
45+// The command is parsed and executed via mvdan.cc/sh/v3/interp, allowing
46+// proper handling of shell syntax like quotes and arguments.
47+func ExecShell(ctx context.Context, cmdStr string, callback tea.ExecCallback) tea.Cmd {
48+ parsed, err := syntax.NewParser().Parse(strings.NewReader(cmdStr), "")
49+ if err != nil {
50+ return ReportError(err)
51+ }
52+
53+ cmd := &shellCommand{
54+ ctx: ctx,
55+ file: parsed,
56+ }
57+ return tea.Exec(cmd, callback)
58+}