From ec9a3a408d564dddfe30a4cec67b435266886afa Mon Sep 17 00:00:00 2001 From: Pierre-Olivier Mercier Date: Thu, 24 Nov 2022 21:37:20 +0100 Subject: [PATCH] repochecker/grammalecte: Don't use HTML writer --- repochecker/grammalecte/main.go | 1 + repochecker/grammalecte/void/renderer.go | 29 ++++++++---------------- 2 files changed, 10 insertions(+), 20 deletions(-) diff --git a/repochecker/grammalecte/main.go b/repochecker/grammalecte/main.go index e4bee609..3523afa3 100644 --- a/repochecker/grammalecte/main.go +++ b/repochecker/grammalecte/main.go @@ -44,6 +44,7 @@ var ALLOWED_WORDS = []string{ "AES", "RSA", "LFSR", + "Wireshark", } var CommonOpts = GrammalecteOptions{ diff --git a/repochecker/grammalecte/void/renderer.go b/repochecker/grammalecte/void/renderer.go index ceeb7e24..21db15f7 100644 --- a/repochecker/grammalecte/void/renderer.go +++ b/repochecker/grammalecte/void/renderer.go @@ -6,19 +6,15 @@ import ( "github.com/yuin/goldmark/ast" goldrender "github.com/yuin/goldmark/renderer" - "github.com/yuin/goldmark/renderer/html" "github.com/yuin/goldmark/util" ) type VoidRenderer struct { - Writer html.Writer - errs []error + errs []error } func NewVoidRenderer() *VoidRenderer { - return &VoidRenderer{ - Writer: html.DefaultWriter, - } + return &VoidRenderer{} } // RegisterFuncs implements NodeRenderer.RegisterFuncs . @@ -38,7 +34,7 @@ func (r *VoidRenderer) Errors() []error { func (r *VoidRenderer) renderParagraph(w util.BufWriter, source []byte, n ast.Node, entering bool) (ast.WalkStatus, error) { if !entering { - _, _ = w.WriteString("\n") + w.WriteString("\n") } return ast.WalkContinue, nil @@ -109,12 +105,9 @@ func (r *VoidRenderer) renderText(w util.BufWriter, source []byte, node ast.Node n := node.(*ast.Text) segment := n.Segment - if n.IsRaw() { - r.Writer.RawWrite(w, segment.Value(source)) - } else { - r.Writer.Write(w, segment.Value(source)) - r.Writer.Write(w, []byte(" ")) - } + w.Write(segment.Value(source)) + w.WriteString(" ") + return ast.WalkContinue, nil } @@ -125,14 +118,10 @@ func (r *VoidRenderer) renderString(w util.BufWriter, source []byte, node ast.No n := node.(*ast.String) if n.IsCode() { - _, _ = w.Write(n.Value) + w.Write(n.Value) } else { - if n.IsRaw() { - r.Writer.RawWrite(w, n.Value) - } else { - r.Writer.Write(w, n.Value) - r.Writer.Write(w, []byte("\n")) - } + w.Write(n.Value) + w.WriteString("\n") } return ast.WalkContinue, nil }