zoriya/bubbles
1
0
Fork 0
mirror of https://github.com/zoriya/bubbles.git synced 2026-08-16 01:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(textarea): consolidate prompt rendering in a method

Browse Source
This commit is contained in:
Christian Rocha
2025-01-31 16:21:17 -05:00
parent 63fb8c67e7
commit a6b8a4559c
1 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
textarea/textarea.go
+17 -23
View File
@@ -1221,7 +1221,7 @@ func (m Model) View() string {
} }
for wl, wrappedLine := range wrappedLines { for wl, wrappedLine := range wrappedLines {
prompt := m.getPromptString(displayLine) prompt := m.promptView(displayLine)
prompt = styles.computedPrompt().Render(prompt) prompt = styles.computedPrompt().Render(prompt)
s.WriteString(style.Render(prompt)) s.WriteString(style.Render(prompt))
displayLine++ displayLine++
@@ -1278,9 +1278,7 @@ func (m Model) View() string {
// Always show at least `m.Height` lines at all times. // Always show at least `m.Height` lines at all times.
// To do this we can simply pad out a few extra new lines in the view. // To do this we can simply pad out a few extra new lines in the view.
for i := 0; i < m.height; i++ { for i := 0; i < m.height; i++ {
prompt := m.getPromptString(displayLine) s.WriteString(m.promptView(displayLine))
prompt = styles.computedPrompt().Render(prompt)
s.WriteString(prompt)
displayLine++ displayLine++
// Write end of buffer content // Write end of buffer content
@@ -1295,13 +1293,22 @@ func (m Model) View() string {
return styles.Base.Render(m.viewport.View()) return styles.Base.Render(m.viewport.View())
} }
// promptView returns the prompt for a single line (as prompts are applited to // promptView renders a single line of the prompt.
// each line). func (m Model) promptView(displayLine int) (prompt string) {
func (m Model) promptView() string { prompt = m.Prompt
return "" if m.promptFunc == nil {
return prompt
}
prompt = m.promptFunc(displayLine)
width := lipgloss.Width(prompt)
if width < m.promptWidth {
prompt = fmt.Sprintf("%*s%s", m.promptWidth-width, "", prompt)
}
return m.activeStyle().computedPrompt().Render(prompt)
} }
// lineNumberView returns the line number. // lineNumberView renders the line number.
// //
// If the argument is less than 0, a space styled as a line number is returned // If the argument is less than 0, a space styled as a line number is returned
// instead. Such cases are used for soft-wrapped lines. // instead. Such cases are used for soft-wrapped lines.
@@ -1334,19 +1341,6 @@ func (m Model) lineNumberView(n int, isCursorLine bool) (str string) {
return textStyle.Render(lineNumberStyle.Render(str)) return textStyle.Render(lineNumberStyle.Render(str))
} }
func (m Model) getPromptString(displayLine int) (prompt string) {
prompt = m.Prompt
if m.promptFunc == nil {
return prompt
}
prompt = m.promptFunc(displayLine)
pl := uniseg.StringWidth(prompt)
if pl < m.promptWidth {
prompt = fmt.Sprintf("%*s%s", m.promptWidth-pl, "", prompt)
}
return prompt
}
// placeholderView returns the prompt and placeholder view, if any. // placeholderView returns the prompt and placeholder view, if any.
func (m Model) placeholderView() string { func (m Model) placeholderView() string {
var ( var (
@@ -1373,7 +1367,7 @@ func (m Model) placeholderView() string {
} }
// render prompt // render prompt
prompt := m.getPromptString(i) prompt := m.promptView(i)
prompt = styles.computedPrompt().Render(prompt) prompt = styles.computedPrompt().Render(prompt)
s.WriteString(lineStyle.Render(prompt)) s.WriteString(lineStyle.Render(prompt))