a700b64 · crush · git.iko.soy

.gitignore+1

compare with main

unifiedsplit

@@ -48,3 +48,4 @@ Thumbs.db

48

49manpages/

50completions/

51+!internal/tui/components/completions/

go.mod+1−1

@@ -16,7 +16,7 @@ require (

16 github.com/aymanbagabas/go-udiff v0.3.1

17 github.com/bmatcuk/doublestar/v4 v4.8.1

18 github.com/charlievieth/fastwalk v1.0.11

19− github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198

19+ github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5

20 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1

21 github.com/charmbracelet/fang v0.3.1-0.20250711140230-d5ebb8c1d674

22 github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe

go.sum+2−2

@@ -68,8 +68,8 @@ github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR

68github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=

69github.com/charlievieth/fastwalk v1.0.11 h1:5sLT/q9+d9xMdpKExawLppqvXFZCVKf6JHnr2u/ufj8=

70github.com/charlievieth/fastwalk v1.0.11/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=

71−github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198 h1:CkMS9Ah9ac1Ego5JDC5NJyZyAAqu23Z+O0yDwsa3IxM=

71+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5 h1:GTcMIfDQJKyNKS+xVt7GkNIwz+tBuQtIuiP50WpzNgs=

72−github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

72+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

73github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250716142813-5d1379f56ba2 h1:Gj/vSk7h96TxUU/GSuwbYkr9H0ze+ElAQjcl25wB0+U=

74github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250716142813-5d1379f56ba2/go.mod h1:m240IQxo1/eDQ7klblSzOCAUyc3LddHcV3Rc/YEGAgw=

75github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=

internal/tui/components/chat/editor/editor.go+36−29

@@ -171,6 +171,8 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

171 }

172 m.attachments = append(m.attachments, msg.Attachment)

173 return m, nil

174+ case completions.CompletionsOpenedMsg:

175+ m.isCompletionsOpen = true

174 case completions.CompletionsClosedMsg:

176 case completions.CompletionsClosedMsg:

175 m.isCompletionsOpen = false

177 m.isCompletionsOpen = false

176 m.currentQuery = ""

178 m.currentQuery = ""

@@ -183,9 +185,6 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

183 // If the selected item is a file, insert its path into the textarea

185 // If the selected item is a file, insert its path into the textarea

184 value := m.textarea.Value()

186 value := m.textarea.Value()

185 value = value[:m.completionsStartIndex]

187 value = value[:m.completionsStartIndex]

186− if len(value) > 0 && value[len(value)-1] != ' ' {

187− value += " "

188− }

189 value += item.Path

188 value += item.Path

190 m.textarea.SetValue(value)

189 m.textarea.SetValue(value)

191 m.isCompletionsOpen = false

190 m.isCompletionsOpen = false

@@ -199,37 +198,15 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

199 case tea.KeyPressMsg:

198 case tea.KeyPressMsg:

200 switch {

199 switch {

201 // Completions

200 // Completions

202− case msg.String() == "/" && !m.isCompletionsOpen:

201+ case msg.String() == "/" && !m.isCompletionsOpen &&

202+ // only show if beginning of prompt, or if previous char is a space:

203+ (len(m.textarea.Value()) == 0 || m.textarea.Value()[len(m.textarea.Value())-1] == ' '):

203 m.isCompletionsOpen = true

204 m.isCompletionsOpen = true

204 m.currentQuery = ""

205 m.currentQuery = ""

205− cmds = append(cmds, m.startCompletions)

206 m.completionsStartIndex = len(m.textarea.Value())

207− case msg.String() == "space" && m.isCompletionsOpen:

207+ cmds = append(cmds, m.startCompletions)

208− m.isCompletionsOpen = false

209− m.currentQuery = ""

210− m.completionsStartIndex = 0

211− cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

212 case m.isCompletionsOpen && m.textarea.Cursor().X <= m.completionsStartIndex:

208 case m.isCompletionsOpen && m.textarea.Cursor().X <= m.completionsStartIndex:

213 cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

209 cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

214− case msg.String() == "backspace" && m.isCompletionsOpen:

215− if len(m.currentQuery) > 0 {

216− m.currentQuery = m.currentQuery[:len(m.currentQuery)-1]

217− cmds = append(cmds, util.CmdHandler(completions.FilterCompletionsMsg{

218− Query: m.currentQuery,

219− }))

220− } else {

221− m.isCompletionsOpen = false

222− m.currentQuery = ""

223− m.completionsStartIndex = 0

224− cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

225− }

226− default:

227− if m.isCompletionsOpen {

228− m.currentQuery += msg.String()

229− cmds = append(cmds, util.CmdHandler(completions.FilterCompletionsMsg{

230− Query: m.currentQuery,

231− }))

232− }

233 }

210 }

234 if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {

211 if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {

235 m.deleteMode = true

212 m.deleteMode = true

@@ -281,6 +258,36 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

281

258

282 m.textarea, cmd = m.textarea.Update(msg)

259 m.textarea, cmd = m.textarea.Update(msg)

283 cmds = append(cmds, cmd)

260 cmds = append(cmds, cmd)

261+

262+ if m.textarea.Focused() {

263+ kp, ok := msg.(tea.KeyPressMsg)

264+ if ok {

265+ if kp.String() == "space" || m.textarea.Value() == "" {

266+ m.isCompletionsOpen = false

267+ m.currentQuery = ""

268+ m.completionsStartIndex = 0

269+ cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

270+ } else {

271+ word := m.textarea.Word()

272+ if strings.HasPrefix(word, "/") {

273+ // XXX: wont' work if editing in the middle of the field.

274+ m.completionsStartIndex = strings.LastIndex(m.textarea.Value(), word)

275+ m.currentQuery = word[1:]

276+ m.isCompletionsOpen = true

277+ cmds = append(cmds, util.CmdHandler(completions.FilterCompletionsMsg{

278+ Query: m.currentQuery,

279+ Reopen: m.isCompletionsOpen,

280+ }))

281+ } else {

282+ m.isCompletionsOpen = false

283+ m.currentQuery = ""

284+ m.completionsStartIndex = 0

285+ cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))

286+ }

287+ }

288+ }

289+ }

290+

284 return m, tea.Batch(cmds...)

291 return m, tea.Batch(cmds...)

285}

292}

286

293

internal/tui/components/completions/completions.go+34−16

@@ -1,6 +1,8 @@

1package completions

2

3import (

4+ "strings"

5+

4 "github.com/charmbracelet/bubbles/v2/key"

6 "github.com/charmbracelet/bubbles/v2/key"

5 tea "github.com/charmbracelet/bubbletea/v2"

7 tea "github.com/charmbracelet/bubbletea/v2"

6 "github.com/charmbracelet/crush/internal/tui/components/core/list"

8 "github.com/charmbracelet/crush/internal/tui/components/core/list"

@@ -23,11 +25,14 @@ type OpenCompletionsMsg struct {

23}

25}

24

26

25type FilterCompletionsMsg struct {

27type FilterCompletionsMsg struct {

26− Query string // The query to filter completions

28+ Query string // The query to filter completions

29+ Reopen bool

27}

30}

28

31

29type CompletionsClosedMsg struct{}

32type CompletionsClosedMsg struct{}

30

33

34+type CompletionsOpenedMsg struct{}

35+

31type CloseCompletionsMsg struct{}

36type CloseCompletionsMsg struct{}

32

37

33type SelectCompletionMsg struct {

38type SelectCompletionMsg struct {

@@ -126,11 +131,7 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

126 }

131 }

127 case CloseCompletionsMsg:

132 case CloseCompletionsMsg:

128 c.open = false

133 c.open = false

129− c.query = ""

130− return c, tea.Batch(

131− c.list.SetItems([]util.Model{}),

132− util.CmdHandler(CompletionsClosedMsg{}),

134+ return c, util.CmdHandler(CompletionsClosedMsg{})

133− )

134 case OpenCompletionsMsg:

135 case OpenCompletionsMsg:

135 c.open = true

136 c.open = true

136 c.query = ""

137 c.query = ""

@@ -143,21 +144,41 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

143 items = append(items, item)

144 items = append(items, item)

144 }

145 }

145 c.height = max(min(c.height, len(items)), 1) // Ensure at least 1 item height

146 c.height = max(min(c.height, len(items)), 1) // Ensure at least 1 item height

146− cmds := []tea.Cmd{

147+ return c, tea.Batch(

147 c.list.SetSize(c.width, c.height),

148 c.list.SetSize(c.width, c.height),

148 c.list.SetItems(items),

149 c.list.SetItems(items),

149− }

150+ util.CmdHandler(CompletionsOpenedMsg{}),

150− return c, tea.Batch(cmds...)

151+ )

151 case FilterCompletionsMsg:

152 case FilterCompletionsMsg:

152− c.query = msg.Query

153+ if !c.open && !msg.Reopen {

153− if !c.open {

154+ return c, nil

154− return c, nil // If completions are not open, do nothing

155+ }

156+ if msg.Query == c.query {

157+ // PERF: if same query, don't need to filter again

158+ return c, nil

159+ }

160+ if len(c.list.Items()) == 0 &&

161+ len(msg.Query) > len(c.query) &&

162+ strings.HasPrefix(msg.Query, c.query) {

163+ // PERF: if c.query didn't match anything,

164+ // AND msg.Query is longer than c.query,

165+ // AND msg.Query is prefixed with c.query - which means

166+ // that the user typed more chars after a 0 match,

167+ // it won't match anything, so return earlier.

168+ return c, nil

155 }

169 }

170+ c.query = msg.Query

156 var cmds []tea.Cmd

171 var cmds []tea.Cmd

157 cmds = append(cmds, c.list.Filter(msg.Query))

172 cmds = append(cmds, c.list.Filter(msg.Query))

158 itemsLen := len(c.list.Items())

173 itemsLen := len(c.list.Items())

159 c.height = max(min(maxCompletionsHeight, itemsLen), 1)

174 c.height = max(min(maxCompletionsHeight, itemsLen), 1)

160 cmds = append(cmds, c.list.SetSize(c.width, c.height))

175 cmds = append(cmds, c.list.SetSize(c.width, c.height))

176+ if itemsLen == 0 {

177+ cmds = append(cmds, util.CmdHandler(CloseCompletionsMsg{}))

178+ } else if msg.Reopen {

179+ c.open = true

180+ cmds = append(cmds, util.CmdHandler(CompletionsOpenedMsg{}))

181+ }

161 return c, tea.Batch(cmds...)

182 return c, tea.Batch(cmds...)

162 }

183 }

163 return c, nil

184 return c, nil

@@ -165,12 +186,9 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

165

186

166// View implements Completions.

187// View implements Completions.

167func (c *completionsCmp) View() string {

188func (c *completionsCmp) View() string {

168− if !c.open {

189+ if !c.open || len(c.list.Items()) == 0 {

169 return ""

190 return ""

170 }

191 }

171− if len(c.list.Items()) == 0 {

172− return c.style().Render("No completions found")

173− }

174

192

175 return c.style().Render(c.list.View())

193 return c.style().Render(c.list.View())

176}

194}

vendor/github.com/charmbracelet/bubbles/v2/filepicker/filepicker.go+3−3

@@ -518,9 +518,9 @@ func (m Model) canSelect(file string) bool {

518}

519

520// HighlightedPath returns the path of the currently highlighted file or directory.

521−func (M Model) HighlightedPath() string {

521+func (m Model) HighlightedPath() string {

522− if len(M.files) == 0 || M.selected < 0 || M.selected >= len(M.files) {

522+ if len(m.files) == 0 || m.selected < 0 || m.selected >= len(m.files) {

523 return ""

524 }

525− return filepath.Join(M.CurrentDirectory, M.files[M.selected].Name())

525+ return filepath.Join(m.CurrentDirectory, m.files[m.selected].Name())

526}

vendor/github.com/charmbracelet/bubbles/v2/textarea/textarea.go+35

@@ -722,6 +722,41 @@ func (m *Model) Reset() {

722 m.SetCursorColumn(0)

723}

724

725+// Word returns the word at the cursor position.

726+// A word is delimited by spaces or line-breaks.

727+func (m *Model) Word() string {

728+ line := m.value[m.row]

729+ col := m.col - 1

730+

731+ if col < 0 {

732+ return ""

733+ }

734+

735+ // If cursor is beyond the line, return empty string

736+ if col >= len(line) {

737+ return ""

738+ }

739+

740+ // If cursor is on a space, return empty string

741+ if unicode.IsSpace(line[col]) {

742+ return ""

743+ }

744+

745+ // Find the start of the word by moving left

746+ start := col

747+ for start > 0 && !unicode.IsSpace(line[start-1]) {

748+ start--

749+ }

750+

751+ // Find the end of the word by moving right

752+ end := col

753+ for end < len(line) && !unicode.IsSpace(line[end]) {

754+ end++

755+ }

756+

757+ return string(line[start:end])

758+}

759+

725// san initializes or retrieves the rune sanitizer.

760// san initializes or retrieves the rune sanitizer.

726func (m *Model) san() runeutil.Sanitizer {

761func (m *Model) san() runeutil.Sanitizer {

727 if m.rsan == nil {

762 if m.rsan == nil {

vendor/modules.txt+1−1

@@ -241,7 +241,7 @@ github.com/bmatcuk/doublestar/v4

241github.com/charlievieth/fastwalk

242github.com/charlievieth/fastwalk/internal/dirent

243github.com/charlievieth/fastwalk/internal/fmtdirent

244−# github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198

244+# github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250716191546-1e2ffbbcf5c5

245## explicit; go 1.23.0

246github.com/charmbracelet/bubbles/v2/cursor

247github.com/charmbracelet/bubbles/v2/filepicker