Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions pkg/tui/components/completion/completion.go
Original file line number Diff line number Diff line change
Expand Up @@ -340,13 +340,7 @@ func (c *manager) View() string {
visibleStart := c.scrollOffset
visibleEnd := min(c.scrollOffset+maxItems, len(c.filteredItems))

maxLabelLen := 0
for i := visibleStart; i < visibleEnd; i++ {
labelLen := lipgloss.Width(c.filteredItems[i].Label)
if labelLen > maxLabelLen {
maxLabelLen = labelLen
}
}
maxLabelLen := c.labelColumnWidth()

for i := visibleStart; i < visibleEnd; i++ {
item := c.filteredItems[i]
Expand Down Expand Up @@ -389,6 +383,14 @@ func (c *manager) View() string {
return styles.CompletionBoxStyle.Render(content)
}

func (c *manager) labelColumnWidth() int {
width := 0
for _, item := range c.items {
width = max(width, lipgloss.Width(item.Label))
}
return width
}

func (c *manager) GetLayers() []*lipgloss.Layer {
if !c.visible {
return nil
Expand Down
32 changes: 32 additions & 0 deletions pkg/tui/components/completion/completion_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,45 @@ package completion

import (
"reflect"
"strings"
"testing"

tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/x/ansi"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestCompletionLabelColumnWidthIsStableWhileFiltering(t *testing.T) {
t.Parallel()
m := New().(*manager)
m.width = 80
m.Update(OpenMsg{Items: []Item{
{Label: "Short", Description: "Short description"},
{Label: "Much Longer Command", Description: "Long description"},
}})

fullLine := completionLine(t, m.View(), "Short")
fullDescriptionColumn := strings.Index(fullLine, "Short description")
require.Positive(t, fullDescriptionColumn)

m.Update(QueryMsg{Query: "short"})
filteredLine := completionLine(t, m.View(), "Short")

assert.Equal(t, fullDescriptionColumn, strings.Index(filteredLine, "Short description"))
}

func completionLine(t *testing.T, view, label string) string {
t.Helper()
for line := range strings.SplitSeq(ansi.Strip(view), "\n") {
if strings.Contains(line, label) {
return line
}
}
require.FailNow(t, "completion line not found", label)
return ""
}

func TestCompletionManagerStaysOpenWithNoResults(t *testing.T) {
t.Parallel()

Expand Down
Loading