@@ -9,7 +9,6 @@ import (
99 "net/http"
1010 "os"
1111 "path/filepath"
12− "runtime"
1312 "slices"
1413 "strings"
1514
@@ -39,6 +38,7 @@ import (
3938 "github.com/charmbracelet/crush/internal/version"
4039 uv "github.com/charmbracelet/ultraviolet"
4140 "github.com/charmbracelet/ultraviolet/screen"
41+ "github.com/charmbracelet/x/editor"
4242)
4343
4444// Max file size set to 5M.
@@ -1562,16 +1562,6 @@ type layout struct {
15621562}
15631563
15641564func (m *UI) openEditor(value string) tea.Cmd {
1565− editor := os.Getenv("EDITOR")
1566− if editor == "" {
1567− // Use platform-appropriate default editor
1568− if runtime.GOOS == "windows" {
1569− editor = "notepad"
1570− } else {
1571− editor = "nvim"
1572− }
1573− }
1574−
15751565 tmpfile, err := os.CreateTemp("", "msg_*.md")
15761566 if err != nil {
15771567 return uiutil.ReportError(err)
@@ -1580,8 +1570,18 @@ func (m *UI) openEditor(value string) tea.Cmd {
15801570 if _, err := tmpfile.WriteString(value); err != nil {
15811571 return uiutil.ReportError(err)
15821572 }
1583− cmdStr := editor + " " + tmpfile.Name()
1584− return uiutil.ExecShell(context.TODO(), cmdStr, func(err error) tea.Msg {
1573+ cmd, err := editor.Command(
1574+ "crush",
1575+ tmpfile.Name(),
1576+ editor.AtPosition(
1577+ m.textarea.Line()+1,
1578+ m.textarea.Column()+1,
1579+ ),
1580+ )
1581+ if err != nil {
1582+ return uiutil.ReportError(err)
1583+ }
1584+ return tea.ExecProcess(cmd, func(err error) tea.Msg {
15851585 if err != nil {
15861586 return uiutil.ReportError(err)
15871587 }