git.iko.soy/crush
on main help sign in
fix: hide completions tui when no results (#206)

* fix: hide completions tui when no results * fix: gitignore * Revert "fix(tui): completions should not close on no results (#198)" This reverts commit 833eede1c10e1dcfacfcc6c6e529d3d8b7e7f838. * fix: completions Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * fix: accept * fix: improvements * chore(deps): update bubbles Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> * fix: improvements * fix: accept --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com>

commita700b64a2811d3a99c3aa054df9538bed4b00e4b authorCarlos Alexandro Becker <caarlos0@users.noreply.github.com> dateWed 16 Jul 2025, 22:11 (1 year ago) parentf664df6
8 files changed+113−52
compare with main
unifiedsplit
.gitignore+1 go.mod+1−1 go.sum+2−2 internal/tui/components/chat/editor/editor.go+36−29 internal/tui/components/completions/completions.go+34−16 vendor/github.com/charmbracelet/bubbles/v2/filepicker/filepicker.go+3−3 vendor/github.com/charmbracelet/bubbles/v2/textarea/textarea.go+35 vendor/modules.txt+1−1
.gitignore+1
@@ -48,3 +48,4 @@ Thumbs.db
4848
4949manpages/
5050completions/
51+!internal/tui/components/completions/
go.mod+1−1
@@ -16,7 +16,7 @@ require (
1616 github.com/aymanbagabas/go-udiff v0.3.1
1717 github.com/bmatcuk/doublestar/v4 v4.8.1
1818 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
2020 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.1
2121 github.com/charmbracelet/fang v0.3.1-0.20250711140230-d5ebb8c1d674
2222 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
6868github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
6969github.com/charlievieth/fastwalk v1.0.11 h1:5sLT/q9+d9xMdpKExawLppqvXFZCVKf6JHnr2u/ufj8=
7070github.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=
72−github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250710161907-a4c42b579198/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
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.20250716191546-1e2ffbbcf5c5/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=
7373github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250716142813-5d1379f56ba2 h1:Gj/vSk7h96TxUU/GSuwbYkr9H0ze+ElAQjcl25wB0+U=
7474github.com/charmbracelet/bubbletea-internal/v2 v2.0.0-20250716142813-5d1379f56ba2/go.mod h1:m240IQxo1/eDQ7klblSzOCAUyc3LddHcV3Rc/YEGAgw=
7575github.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) {
171171 }
172172 m.attachments = append(m.attachments, msg.Attachment)
173173 return m, nil
174+ case completions.CompletionsOpenedMsg:
175+ m.isCompletionsOpen = true
174176 case completions.CompletionsClosedMsg:
175177 m.isCompletionsOpen = false
176178 m.currentQuery = ""
@@ -183,9 +185,6 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
183185 // If the selected item is a file, insert its path into the textarea
184186 value := m.textarea.Value()
185187 value = value[:m.completionsStartIndex]
186− if len(value) > 0 && value[len(value)-1] != ' ' {
187− value += " "
188− }
189188 value += item.Path
190189 m.textarea.SetValue(value)
191190 m.isCompletionsOpen = false
@@ -199,37 +198,15 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
199198 case tea.KeyPressMsg:
200199 switch {
201200 // 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] == ' '):
203204 m.isCompletionsOpen = true
204205 m.currentQuery = ""
205− cmds = append(cmds, m.startCompletions)
206206 m.completionsStartIndex = len(m.textarea.Value())
207− case msg.String() == "space" && m.isCompletionsOpen:
208− m.isCompletionsOpen = false
209− m.currentQuery = ""
210− m.completionsStartIndex = 0
211− cmds = append(cmds, util.CmdHandler(completions.CloseCompletionsMsg{}))
207+ cmds = append(cmds, m.startCompletions)
212208 case m.isCompletionsOpen && m.textarea.Cursor().X <= m.completionsStartIndex:
213209 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− }
233210 }
234211 if key.Matches(msg, DeleteKeyMaps.AttachmentDeleteMode) {
235212 m.deleteMode = true
@@ -281,6 +258,36 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
281258
282259 m.textarea, cmd = m.textarea.Update(msg)
283260 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+
284291 return m, tea.Batch(cmds...)
285292}
286293
internal/tui/components/completions/completions.go+34−16
@@ -1,6 +1,8 @@
11package completions
22
33import (
4+ "strings"
5+
46 "github.com/charmbracelet/bubbles/v2/key"
57 tea "github.com/charmbracelet/bubbletea/v2"
68 "github.com/charmbracelet/crush/internal/tui/components/core/list"
@@ -23,11 +25,14 @@ type OpenCompletionsMsg struct {
2325}
2426
2527type FilterCompletionsMsg struct {
26− Query string // The query to filter completions
28+ Query string // The query to filter completions
29+ Reopen bool
2730}
2831
2932type CompletionsClosedMsg struct{}
3033
34+type CompletionsOpenedMsg struct{}
35+
3136type CloseCompletionsMsg struct{}
3237
3338type SelectCompletionMsg struct {
@@ -126,11 +131,7 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
126131 }
127132 case CloseCompletionsMsg:
128133 c.open = false
129− c.query = ""
130− return c, tea.Batch(
131− c.list.SetItems([]util.Model{}),
132− util.CmdHandler(CompletionsClosedMsg{}),
133− )
134+ return c, util.CmdHandler(CompletionsClosedMsg{})
134135 case OpenCompletionsMsg:
135136 c.open = true
136137 c.query = ""
@@ -143,21 +144,41 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
143144 items = append(items, item)
144145 }
145146 c.height = max(min(c.height, len(items)), 1) // Ensure at least 1 item height
146− cmds := []tea.Cmd{
147+ return c, tea.Batch(
147148 c.list.SetSize(c.width, c.height),
148149 c.list.SetItems(items),
149− }
150− return c, tea.Batch(cmds...)
150+ util.CmdHandler(CompletionsOpenedMsg{}),
151+ )
151152 case FilterCompletionsMsg:
152− c.query = msg.Query
153− if !c.open {
154− return c, nil // If completions are not open, do nothing
153+ if !c.open && !msg.Reopen {
154+ return c, nil
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
155169 }
170+ c.query = msg.Query
156171 var cmds []tea.Cmd
157172 cmds = append(cmds, c.list.Filter(msg.Query))
158173 itemsLen := len(c.list.Items())
159174 c.height = max(min(maxCompletionsHeight, itemsLen), 1)
160175 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+ }
161182 return c, tea.Batch(cmds...)
162183 }
163184 return c, nil
@@ -165,12 +186,9 @@ func (c *completionsCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
165186
166187// View implements Completions.
167188func (c *completionsCmp) View() string {
168− if !c.open {
189+ if !c.open || len(c.list.Items()) == 0 {
169190 return ""
170191 }
171− if len(c.list.Items()) == 0 {
172− return c.style().Render("No completions found")
173− }
174192
175193 return c.style().Render(c.list.View())
176194}
vendor/github.com/charmbracelet/bubbles/v2/filepicker/filepicker.go+3−3
@@ -518,9 +518,9 @@ func (m Model) canSelect(file string) bool {
518518}
519519
520520// HighlightedPath returns the path of the currently highlighted file or directory.
521−func (M Model) HighlightedPath() string {
522− if len(M.files) == 0 || M.selected < 0 || M.selected >= len(M.files) {
521+func (m Model) HighlightedPath() string {
522+ if len(m.files) == 0 || m.selected < 0 || m.selected >= len(m.files) {
523523 return ""
524524 }
525− return filepath.Join(M.CurrentDirectory, M.files[M.selected].Name())
525+ return filepath.Join(m.CurrentDirectory, m.files[m.selected].Name())
526526}
vendor/github.com/charmbracelet/bubbles/v2/textarea/textarea.go+35
@@ -722,6 +722,41 @@ func (m *Model) Reset() {
722722 m.SetCursorColumn(0)
723723}
724724
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+
725760// san initializes or retrieves the rune sanitizer.
726761func (m *Model) san() runeutil.Sanitizer {
727762 if m.rsan == nil {
vendor/modules.txt+1−1
@@ -241,7 +241,7 @@ github.com/bmatcuk/doublestar/v4
241241github.com/charlievieth/fastwalk
242242github.com/charlievieth/fastwalk/internal/dirent
243243github.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
245245## explicit; go 1.23.0
246246github.com/charmbracelet/bubbles/v2/cursor
247247github.com/charmbracelet/bubbles/v2/filepicker