mirror of
https://github.com/rwinkhart/glamour-temp-MUTN.git
synced 2026-09-01 06:36:43 -04:00
Use io.Writer directly instead of using Fprintf to print strings
This commit is contained in:
+7
-8
@@ -1,7 +1,6 @@
|
||||
package gold
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"io"
|
||||
"strconv"
|
||||
|
||||
@@ -16,7 +15,7 @@ type BaseElement struct {
|
||||
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)
|
||||
if 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()
|
||||
}
|
||||
|
||||
_, err := w.Write([]byte(aurora.Sprintf("%s", out)))
|
||||
return err
|
||||
_, _ = w.Write([]byte(out.String()))
|
||||
}
|
||||
|
||||
func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error {
|
||||
if e.Prefix != "" {
|
||||
fmt.Fprintf(w, "%s", e.Prefix)
|
||||
_, _ = w.Write([]byte(e.Prefix))
|
||||
}
|
||||
defer func() {
|
||||
if e.Suffix != "" {
|
||||
fmt.Fprintf(w, "%s", e.Suffix)
|
||||
_, _ = w.Write([]byte(e.Suffix))
|
||||
}
|
||||
}()
|
||||
|
||||
rules := tr.style[e.Style]
|
||||
if rules == nil {
|
||||
fmt.Fprintf(w, "%s", e.Token)
|
||||
_, _ = w.Write([]byte(e.Token))
|
||||
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
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
|
||||
if entering {
|
||||
if node.Type == bf.Paragraph {
|
||||
w.Write(tr.paragraph.Bytes())
|
||||
_, _ = w.Write(tr.paragraph.Bytes())
|
||||
tr.paragraph.Reset()
|
||||
}
|
||||
if isChild(node) {
|
||||
@@ -99,9 +99,8 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
}
|
||||
|
||||
if e.Entering != "" {
|
||||
fmt.Fprintf(&tr.paragraph, "%s", e.Entering)
|
||||
tr.paragraph.WriteString(e.Entering)
|
||||
}
|
||||
|
||||
if e.Renderer != nil {
|
||||
err := e.Renderer.Render(&tr.paragraph, node, tr)
|
||||
if err != nil {
|
||||
@@ -117,13 +116,12 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf
|
||||
return bf.Terminate
|
||||
}
|
||||
}
|
||||
|
||||
if e.Exiting != "" {
|
||||
fmt.Fprintf(&tr.paragraph, "%s", e.Exiting)
|
||||
tr.paragraph.WriteString(e.Exiting)
|
||||
}
|
||||
|
||||
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()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user