From 692e10d8251ccc0d6aa35fa24a65dc9c67d7209e Mon Sep 17 00:00:00 2001 From: Kyren223 Date: Wed, 18 Dec 2024 18:48:02 +0200 Subject: Fixed extra newline due to placeholder issues --- internal/client/ui/viminput/viminput.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'internal/client/ui/viminput/viminput.go') diff --git a/internal/client/ui/viminput/viminput.go b/internal/client/ui/viminput/viminput.go index d752620..db2881d 100644 --- a/internal/client/ui/viminput/viminput.go +++ b/internal/client/ui/viminput/viminput.go @@ -41,7 +41,7 @@ type Model struct { PlaceholderStyle lipgloss.Style PromptStyle lipgloss.Style - Placeholder string + Placeholder string register string lines [][]rune undoStack []State @@ -118,6 +118,7 @@ func (m Model) View() string { rest := m.PlaceholderStyle.Render(m.Placeholder[1:]) builder.WriteString(CursorStyle.Render(cursorChar)) builder.WriteString(rest) + builder.WriteByte('\n') continue } @@ -147,6 +148,7 @@ func (m Model) View() string { rest := m.PlaceholderStyle.Render(m.Placeholder[1:]) builder.WriteString(CursorStyle.Render(cursorChar)) builder.WriteString(rest) + builder.WriteByte('\n') continue } @@ -252,6 +254,7 @@ func (m Model) View() string { rest := m.PlaceholderStyle.Render(m.Placeholder[1:]) builder.WriteString(CursorStyle.Render(cursorChar)) builder.WriteString(rest) + builder.WriteByte('\n') continue } @@ -282,6 +285,7 @@ func (m Model) View() string { } result := builder.String() + result = result[:len(result)-1] // Remove last \n result = lipgloss.NewStyle().Width(m.width).Height(m.height).Render(result) return result @@ -405,7 +409,7 @@ func (m *Model) handleNormalModeKeys(key tea.KeyMsg) { motion := key.String() count := 1 - if m.count != NoCount && (motion[0] < '0' || motion[0] > '9'){ + if m.count != NoCount && (motion[0] < '0' || motion[0] > '9') { count = m.count m.count = NoCount } @@ -1618,7 +1622,7 @@ func (m *Model) handleVisualModeKeys(key tea.KeyMsg) { } count := 1 - if m.count != NoCount && (motion[0] < '0' || motion[0] > '9'){ + if m.count != NoCount && (motion[0] < '0' || motion[0] > '9') { count = m.count m.count = NoCount } @@ -1789,7 +1793,7 @@ func (m *Model) handleVisualLineModeKeys(key tea.KeyMsg) { } count := 1 - if m.count != NoCount && (motion[0] < '0' || motion[0] > '9'){ + if m.count != NoCount && (motion[0] < '0' || motion[0] > '9') { count = m.count m.count = NoCount } -- cgit v1.3.1