git.iko.soy/crush
on main help sign in
Revert "fix(editor): fix opening `$EDITOR` when it contains arguments… (#1519)
9b1ec53Ayman Bagabas
internal/tui/components/chat/editor/editor.go+7−6
compare with main
unifiedsplit
@@ -6,6 +6,7 @@ import (
6 "math/rand"
6 "math/rand"
7 "net/http"
7 "net/http"
8 "os"
8 "os"
9+ "os/exec"
9 "path/filepath"
10 "path/filepath"
10 "runtime"
11 "runtime"
11 "slices"
12 "slices"
@@ -95,7 +96,7 @@ type OpenEditorMsg struct {
95func (m *editorCmp) openEditor(value string) tea.Cmd {
96func (m *editorCmp) openEditor(value string) tea.Cmd {
96 editor := os.Getenv("EDITOR")
97 editor := os.Getenv("EDITOR")
97 if editor == "" {
98 if editor == "" {
98− // Use platform-appropriate default editor.
99+ // Use platform-appropriate default editor
99 if runtime.GOOS == "windows" {
100 if runtime.GOOS == "windows" {
100 editor = "notepad"
101 editor = "notepad"
101 } else {
102 } else {
@@ -111,11 +112,11 @@ func (m *editorCmp) openEditor(value string) tea.Cmd {
111 if _, err := tmpfile.WriteString(value); err != nil {
112 if _, err := tmpfile.WriteString(value); err != nil {
112 return util.ReportError(err)
113 return util.ReportError(err)
113 }
114 }
114−
115− // Build the full shell command with the file argument.
116− cmdStr := fmt.Sprintf("%s %s", editor, tmpfile.Name())
115+ c := exec.CommandContext(context.TODO(), editor, tmpfile.Name())
117−
116+ c.Stdin = os.Stdin
117+ c.Stdout = os.Stdout
118+ c.Stderr = os.Stderr
118− return util.ExecShell(context.TODO(), cmdStr, func(err error) tea.Msg {
119+ return tea.ExecProcess(c, func(err error) tea.Msg {
119 if err != nil {
120 if err != nil {
120 return util.ReportError(err)
121 return util.ReportError(err)
121 }
122 }
internal/tui/util/shell.godeleted−58
@@ -1,58 +0,0 @@
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−}