GitHubMirror/glamour-temp-MUTN
1
0
Fork 0
mirror of https://github.com/rwinkhart/glamour-temp-MUTN.git synced 2026-09-06 00:47:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use io.Writer directly instead of using Fprintf to print strings

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2019-11-28 05:48:31 +01:00
parent f1a62c8b72
commit e768cd63bf
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baselement.go
+7 -8
View File
@@ -1,7 +1,6 @@
package gold package gold
import ( import (
"fmt"
"io" "io"
"strconv" "strconv"
@@ -16,7 +15,7 @@ type BaseElement struct {
Style StyleType Style StyleType
} }
func (e *BaseElement) renderText(w io.Writer, rules *ElementStyle, s string) error { func (e *BaseElement) renderText(w io.Writer, rules *ElementStyle, s string) {
out := aurora.Reset(s) out := aurora.Reset(s)
if rules.Color != "" { if rules.Color != "" {
i, err := strconv.Atoi(rules.Color) i, err := strconv.Atoi(rules.Color)
@@ -53,23 +52,22 @@ func (e *BaseElement) renderText(w io.Writer, rules *ElementStyle, s string) err
out = out.Blink() out = out.Blink()
} }
_, err := w.Write([]byte(aurora.Sprintf("%s", out))) _, _ = w.Write([]byte(out.String()))
return err
} }
func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error { func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
if e.Prefix != "" { if e.Prefix != "" {
fmt.Fprintf(w, "%s", e.Prefix) _, _ = w.Write([]byte(e.Prefix))
} }
defer func() { defer func() {
if e.Suffix != "" { if e.Suffix != "" {
fmt.Fprintf(w, "%s", e.Suffix) _, _ = w.Write([]byte(e.Suffix))
} }
}() }()
rules := tr.style[e.Style] rules := tr.style[e.Style]
if rules == nil { if rules == nil {
fmt.Fprintf(w, "%s", e.Token) _, _ = w.Write([]byte(e.Token))
return nil return nil
} }
@@ -82,5 +80,6 @@ func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error
} }
}() }()
return e.renderText(w, rules, e.Token) e.renderText(w, rules, e.Token)
return nil
} }
gold.go
+4 -6
View File
@@ -91,7 +91,7 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
if entering { if entering {
if node.Type == bf.Paragraph { if node.Type == bf.Paragraph {
w.Write(tr.paragraph.Bytes()) _, _ = w.Write(tr.paragraph.Bytes())
tr.paragraph.Reset() tr.paragraph.Reset()
} }
if isChild(node) { if isChild(node) {
@@ -99,9 +99,8 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
} }
if e.Entering != "" { if e.Entering != "" {
fmt.Fprintf(&tr.paragraph, "%s", e.Entering) tr.paragraph.WriteString(e.Entering)
} }
if e.Renderer != nil { if e.Renderer != nil {
err := e.Renderer.Render(&tr.paragraph, node, tr) err := e.Renderer.Render(&tr.paragraph, node, tr)
if err != nil { if err != nil {
@@ -117,13 +116,12 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
return bf.Terminate return bf.Terminate
} }
} }
if e.Exiting != "" { if e.Exiting != "" {
fmt.Fprintf(&tr.paragraph, "%s", e.Exiting) tr.paragraph.WriteString(e.Exiting)
} }
if node.Type == bf.Paragraph { if node.Type == bf.Paragraph {
w.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap)) _, _ = w.Write(reflow.ReflowBytes(tr.paragraph.Bytes(), tr.WordWrap))
tr.paragraph.Reset() tr.paragraph.Reset()
} }
} }