From 3961136a13e9429df6220fdefbca75deb65d01a3 Mon Sep 17 00:00:00 2001
From: Ayman Bagabas <ayman.bagabas@gmail.com>
Date: Tue, 4 Feb 2025 14:26:33 -0500
Subject: [PATCH] fix(viewport): handle nil LeftGutterFunc (#723)

Since LeftGutterFunc is public, it can be nil if viewport is
instantiated without using `viewport.New()`. This commit adds nil
checks to handle this case.
---
 viewport/viewport.go | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/viewport/viewport.go b/viewport/viewport.go
index 8ac13ea..4f13c16 100644
--- a/viewport/viewport.go
+++ b/viewport/viewport.go
@@ -243,7 +243,11 @@ func (m Model) calculateLine(yoffset int) (total, idx int) {
 		return len(m.lines), yoffset
 	}
 	maxWidth := m.maxWidth()
-	gutterSize := lipgloss.Width(m.LeftGutterFunc(GutterContext{}))
+
+	var gutterSize int
+	if m.LeftGutterFunc != nil {
+		gutterSize = lipgloss.Width(m.LeftGutterFunc(GutterContext{}))
+	}
 	for i, line := range m.lines {
 		adjust := max(1, ansi.StringWidth(line)/(maxWidth-gutterSize))
 		if yoffset >= total && yoffset < total+adjust {
@@ -281,9 +285,13 @@ func (m Model) maxXOffset() int {
 }
 
 func (m Model) maxWidth() int {
+	var gutterSize int
+	if m.LeftGutterFunc != nil {
+		gutterSize = lipgloss.Width(m.LeftGutterFunc(GutterContext{}))
+	}
 	return m.Width() -
 		m.Style.GetHorizontalFrameSize() -
-		lipgloss.Width(m.LeftGutterFunc(GutterContext{}))
+		gutterSize
 }
 
 func (m Model) maxHeight() int {
@@ -361,11 +369,14 @@ func (m Model) softWrap(lines []string, maxWidth int) []string {
 		idx := 0
 		for ansi.StringWidth(line) >= idx {
 			truncatedLine := ansi.Cut(line, idx, maxWidth+idx)
-			wrappedLines = append(wrappedLines, m.LeftGutterFunc(GutterContext{
-				Index:      i + m.YOffset,
-				TotalLines: m.TotalLineCount(),
-				Soft:       idx > 0,
-			})+truncatedLine)
+			if m.LeftGutterFunc != nil {
+				truncatedLine = m.LeftGutterFunc(GutterContext{
+					Index:      i + m.YOffset,
+					TotalLines: m.TotalLineCount(),
+					Soft:       idx > 0,
+				}) + truncatedLine
+			}
+			wrappedLines = append(wrappedLines, truncatedLine)
 			idx += maxWidth
 		}
 	}
@@ -375,10 +386,13 @@ func (m Model) softWrap(lines []string, maxWidth int) []string {
 func (m Model) prependColumn(lines []string) []string {
 	result := make([]string, len(lines))
 	for i, line := range lines {
-		result[i] = m.LeftGutterFunc(GutterContext{
-			Index:      i + m.YOffset,
-			TotalLines: m.TotalLineCount(),
-		}) + line
+		if m.LeftGutterFunc != nil {
+			line = m.LeftGutterFunc(GutterContext{
+				Index:      i + m.YOffset,
+				TotalLines: m.TotalLineCount(),
+			}) + line
+		}
+		result[i] = line
 	}
 	return result
 }