From e267bc982afe0b911df751bde89a18cc88ef27cc Mon Sep 17 00:00:00 2001
From: Christian Rocha <christian@rocha.is>
Date: Tue, 22 Feb 2022 14:56:37 -0500
Subject: [PATCH] chore: adjust line number coloring

---
 server/middleware.go | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/server/middleware.go b/server/middleware.go
index 8f48e498e..e6d6b1bcc 100644
--- a/server/middleware.go
+++ b/server/middleware.go
@@ -20,10 +20,11 @@ import (
 )
 
 var (
-	linenoStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("8"))
-	dirnameStyle  = lipgloss.NewStyle().Foreground(lipgloss.Color("#00AAFF"))
-	filenameStyle = lipgloss.NewStyle()
-	filemodeStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("#777777"))
+	lineDigitStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("239"))
+	lineBarStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("236"))
+	dirnameStyle   = lipgloss.NewStyle().Foreground(lipgloss.Color("#00AAFF"))
+	filenameStyle  = lipgloss.NewStyle()
+	filemodeStyle  = lipgloss.NewStyle().Foreground(lipgloss.Color("#777777"))
 )
 
 type entries []object.TreeEntry
@@ -144,13 +145,18 @@ func softServeMiddleware(ac *appCfg.Config) wish.Middleware {
 
 func withLineNumber(s string, color bool) string {
 	lines := strings.Split(s, "\n")
-	mll := fmt.Sprintf("%d", len(fmt.Sprintf("%d", len(lines))))
+	// NB: len() is not a particularly safe way to count string width (because
+	// it's counting bytes instead of runes) but in this case it's okay
+	// because we're only dealing with digits, which are one byte each.
+	mll := len(fmt.Sprintf("%d", len(lines)))
 	for i, l := range lines {
-		lines[i] = fmt.Sprintf("%-"+mll+"d", i+1)
+		digit := fmt.Sprintf("%*d", mll, i)
+		line := "│"
 		if color {
-			lines[i] = linenoStyle.Render(lines[i])
+			digit = lineDigitStyle.Render(digit)
+			line = lineBarStyle.Render(line)
 		}
-		lines[i] += " │ " + l
+		lines[i] = fmt.Sprintf(" %s %s %s", digit, line, l)
 	}
 	return strings.Join(lines, "\n")
 }