trim trailing space from log content

robinovitch61 · Feb 1, 2025 · 255fc83 · 255fc83
1 parent 647d303
commit 255fc83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/internal/model/k8s_log.go b/internal/model/k8s_log.go
@@ -9,6 +9,7 @@ import (
 	"github.com/robinovitch61/kl/internal/viewport/linebuffer"
 	"strings"
 	"time"
+	"unicode"
 )
 
 type Log struct {
@@ -58,6 +59,7 @@ func (ls LogScanner) StartReadingLogs() {
 
 			logContent := strings.Join(vals[1:], " ")
 			logContent = strings.ReplaceAll(logContent, "\t", "    ")
+			logContent = strings.TrimRightFunc(logContent, unicode.IsSpace)
 
 			// precompute LogData here as logs come in as logs are immutable. Having the LogData up front helps
 			// to minimize expensive/repeated re-computation later

diff --git a/internal/viewport/viewport.go b/internal/viewport/viewport.go
@@ -717,7 +717,7 @@ func (m Model[T]) getVisibleContentLines() visibleContentLinesResult {
 	}
 
 	if m.wrapText {
-		lb := currItem.Render() // TODO LEO: strings.TrimRightFunc(currItem.String(), unicode.IsSpace), m.width
+		lb := currItem.Render()
 		itemLines := lb.WrappedLines(m.width, m.height, m.stringToHighlight, m.highlightStyle(currItemIdx))
 		offsetLines := safeSliceFromIdx(itemLines, m.topItemLineOffset)
 		done = addLines(linebuffer.ToLineBuffers(offsetLines), currItemIdx)
@@ -728,7 +728,7 @@ func (m Model[T]) getVisibleContentLines() visibleContentLinesResult {
 				done = true
 			} else {
 				currItem = m.allItems[currItemIdx]
-				lb = currItem.Render() // TODO LEO: strings.TrimRightFunc(currItem.String(), unicode.IsSpace), m.width
+				lb = currItem.Render()
 				itemLines = lb.WrappedLines(m.width, m.height, m.stringToHighlight, m.highlightStyle(currItemIdx))
 				done = addLines(linebuffer.ToLineBuffers(itemLines), currItemIdx)
 			}