tui: migrate Bubble Tea v1 → v2 (charm.land), enable Shift+Enter
Move the Go TUI from github.com/charmbracelet/{bubbletea,lipgloss} to the v2
ecosystem at charm.land/{bubbletea,lipgloss}/v2 (Go 1.25). v2's kitty keyboard
disambiguation is on by default, so Shift+Enter now reliably inserts a newline
in the composer (Ctrl+J / Alt+Enter kept as fallbacks for non-kitty terminals).
Approach: rather than rewrite ~190 key-match sites to v2's (Code, Mod) idiom, a
small shim (internal/app/key.go) converts a v2 KeyPressMsg into the v1-shaped
keyMsg the handlers already expect, at the single Update boundary. The rest is
mechanical:
- key constants tea.Key* → shim consts; tea.KeyMsg → keyMsg.
- lipgloss.Color is now a func returning color.Color, not a type → fields/params
retyped to image/color.Color (theme/diff/overlays/view).
- v2 View() returns tea.View: render() builds the string, View() wraps it and
carries AltScreen (alt-screen is a per-frame View field now, not a program opt).
- WithWhitespaceBackground/Foreground → WithWhitespaceStyle(Style).
- preview: drop lipgloss.SetColorProfile (v2 renders truecolor by default).
Build, vet, gofmt, and the full test suite are green; preview renders truecolor
across kinds.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -3,8 +3,8 @@ package app
|
||||
import (
|
||||
"strings"
|
||||
|
||||
tea "github.com/charmbracelet/bubbletea"
|
||||
"github.com/charmbracelet/lipgloss"
|
||||
tea "charm.land/bubbletea/v2"
|
||||
"charm.land/lipgloss/v2"
|
||||
"github.com/correx/tui-go/internal/protocol"
|
||||
)
|
||||
|
||||
@@ -92,7 +92,7 @@ func (m Model) clarAnswerValue(i int, q ClarQuestion) string {
|
||||
|
||||
// --- key handling ---
|
||||
|
||||
func (m Model) handleClarificationKey(k tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
func (m Model) handleClarificationKey(k keyMsg) (tea.Model, tea.Cmd) {
|
||||
s := m.session(m.selectedID)
|
||||
if s == nil || s.Clar == nil {
|
||||
return m, nil
|
||||
@@ -102,21 +102,21 @@ func (m Model) handleClarificationKey(k tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
return m.handleClarTyping(k), nil
|
||||
}
|
||||
switch k.Type {
|
||||
case tea.KeyEsc:
|
||||
case keyEsc:
|
||||
m.clarDismissed = true
|
||||
case tea.KeyUp:
|
||||
case keyUp:
|
||||
m.clarFocusMove(-1, qs)
|
||||
case tea.KeyDown:
|
||||
case keyDown:
|
||||
m.clarFocusMove(1, qs)
|
||||
case tea.KeyLeft:
|
||||
case keyLeft:
|
||||
m.clarCursorMove(-1, qs)
|
||||
case tea.KeyRight:
|
||||
case keyRight:
|
||||
m.clarCursorMove(1, qs)
|
||||
case tea.KeySpace:
|
||||
case keySpace:
|
||||
m.clarSelect(qs)
|
||||
case tea.KeyEnter:
|
||||
case keyEnter:
|
||||
return m.clarSubmit()
|
||||
case tea.KeyRunes:
|
||||
case keyRunes:
|
||||
switch string(k.Runes) {
|
||||
case "k":
|
||||
m.clarFocusMove(-1, qs)
|
||||
@@ -136,24 +136,24 @@ func (m Model) handleClarificationKey(k tea.KeyMsg) (tea.Model, tea.Cmd) {
|
||||
return m, nil
|
||||
}
|
||||
|
||||
func (m Model) handleClarTyping(k tea.KeyMsg) tea.Model {
|
||||
func (m Model) handleClarTyping(k keyMsg) tea.Model {
|
||||
if m.clarFocus >= len(m.clarText) {
|
||||
return m
|
||||
}
|
||||
switch k.Type {
|
||||
case tea.KeyEsc:
|
||||
case keyEsc:
|
||||
m.clarTyping = false
|
||||
case tea.KeyEnter:
|
||||
case keyEnter:
|
||||
m.clarTyping = false
|
||||
// committing custom text supersedes any chosen option for this question
|
||||
if m.clarFocus < len(m.clarChosen) {
|
||||
m.clarChosen[m.clarFocus] = map[int]bool{}
|
||||
}
|
||||
case tea.KeyBackspace:
|
||||
case keyBackspace:
|
||||
if t := m.clarText[m.clarFocus]; len(t) > 0 {
|
||||
m.clarText[m.clarFocus] = t[:len(t)-1]
|
||||
}
|
||||
case tea.KeyRunes, tea.KeySpace:
|
||||
case keyRunes, keySpace:
|
||||
m.clarText[m.clarFocus] += string(k.Runes)
|
||||
}
|
||||
return m
|
||||
|
||||
Reference in New Issue
Block a user