From 3d0c3295f7fef0500cad7eef2c9a33dc3bed536f Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Thu, 13 Nov 2025 04:19:30 +0000 Subject: [PATCH] appview/pages: migrate string templates to use funcmap renderers Change-Id: xooznrpzzlosvxmqsussntkonuousvsx Signed-off-by: oppiliappan --- appview/pages/pages.go | 43 --------------------- appview/pages/templates/strings/string.html | 4 +- 2 files changed, 2 insertions(+), 45 deletions(-) diff --git a/appview/pages/pages.go b/appview/pages/pages.go index 6a27f1ae..80e2803b 100644 --- a/appview/pages/pages.go +++ b/appview/pages/pages.go @@ -1,7 +1,6 @@ package pages import ( - "bytes" "crypto/sha256" "embed" "encoding/hex" @@ -29,10 +28,6 @@ import ( "tangled.org/core/patchutil" "tangled.org/core/types" - "github.com/alecthomas/chroma/v2" - chromahtml "github.com/alecthomas/chroma/v2/formatters/html" - "github.com/alecthomas/chroma/v2/lexers" - "github.com/alecthomas/chroma/v2/styles" "github.com/bluesky-social/indigo/atproto/identity" "github.com/bluesky-social/indigo/atproto/syntax" "github.com/go-git/go-git/v5/plumbing" @@ -1387,44 +1382,6 @@ type SingleStringParams struct { } func (p *Pages) SingleString(w io.Writer, params SingleStringParams) error { - var style *chroma.Style = styles.Get("catpuccin-latte") - - if params.ShowRendered { - switch markup.GetFormat(params.String.Filename) { - case markup.FormatMarkdown: - p.rctx.RendererType = markup.RendererTypeRepoMarkdown - htmlString := p.rctx.RenderMarkdown(params.String.Contents) - sanitized := p.rctx.SanitizeDefault(htmlString) - params.RenderedContents = template.HTML(sanitized) - } - } - - c := params.String.Contents - formatter := chromahtml.New( - chromahtml.InlineCode(false), - chromahtml.WithLineNumbers(true), - chromahtml.WithLinkableLineNumbers(true, "L"), - chromahtml.Standalone(false), - chromahtml.WithClasses(true), - ) - - lexer := lexers.Get(filepath.Base(params.String.Filename)) - if lexer == nil { - lexer = lexers.Fallback - } - - iterator, err := lexer.Tokenise(nil, c) - if err != nil { - return fmt.Errorf("chroma tokenize: %w", err) - } - - var code bytes.Buffer - err = formatter.Format(&code, style, iterator) - if err != nil { - return fmt.Errorf("chroma format: %w", err) - } - - params.String.Contents = code.String() return p.execute("strings/string", w, params) } diff --git a/appview/pages/templates/strings/string.html b/appview/pages/templates/strings/string.html index 31d83b58..3963bc75 100644 --- a/appview/pages/templates/strings/string.html +++ b/appview/pages/templates/strings/string.html @@ -75,9 +75,9 @@
{{ if .ShowRendered }} -
{{ .RenderedContents }}
+
{{ .String.Contents | readme }}
{{ else }} -
{{ .String.Contents | escapeHtml }}
+
{{ code .String.Contents .String.Filename | escapeHtml }}
{{ end }}
{{ template "fragments/multiline-select" }} -- 2.43.0