From fd046800074548b6746141c45e46deb7da14ab07 Mon Sep 17 00:00:00 2001 From: Ayman Bagabas Date: Tue, 22 Feb 2022 12:07:28 -0500 Subject: [PATCH] fix: change cat lineno color and style --- server/middleware.go | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/server/middleware.go b/server/middleware.go index 1ef8759411c81131941e45180965849e752bc435..e60fd53b57648ce20db5722a217ae6a0d857f067 100644 --- a/server/middleware.go +++ b/server/middleware.go @@ -17,6 +17,10 @@ import ( "github.com/muesli/termenv" ) +var ( + linenoStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("8")) +) + // softServeMiddleware is a middleware that handles displaying files with the // option of syntax highlighting and line numbers. func softServeMiddleware(ac *appCfg.Config) wish.Middleware { @@ -109,14 +113,14 @@ func readFile(r *gg.Repository, fp string) (string, error) { } func withLineNumber(s string, color bool) string { - st := lipgloss.NewStyle().Foreground(lipgloss.Color("15")) lines := strings.Split(s, "\n") mll := fmt.Sprintf("%d", len(fmt.Sprintf("%d", len(lines)))) for i, l := range lines { - lines[i] = fmt.Sprintf("%-"+mll+"d │ %s", i+1, l) + lines[i] = fmt.Sprintf("%-"+mll+"d", i+1) if color { - lines[i] = st.Render(lines[i]) + lines[i] = linenoStyle.Render(lines[i]) } + lines[i] += " │ " + l } return strings.Join(lines, "\n") }