From afd83210ea5cab19a9adf04ff8a790214079ba3f Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Wed, 4 Dec 2019 05:38:54 +0100 Subject: [PATCH] Simplify code --- baselement.go | 20 ++++++++------------ document.go | 8 ++------ gold.go | 8 ++------ paragraph.go | 6 ++---- 4 files changed, 14 insertions(+), 28 deletions(-) diff --git a/baselement.go b/baselement.go index fce4335..52344ec 100644 --- a/baselement.go +++ b/baselement.go @@ -16,6 +16,10 @@ type BaseElement struct { } func renderText(w io.Writer, rules *ElementStyle, s string) { + if len(s) == 0 { + return + } + out := aurora.Reset(s) if rules != nil { @@ -59,13 +63,9 @@ func renderText(w io.Writer, rules *ElementStyle, s string) { } func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error { - if e.Prefix != "" { - renderText(w, tr.blockStyle.Current(), e.Prefix) - } + renderText(w, tr.blockStyle.Current(), e.Prefix) defer func() { - if e.Suffix != "" { - renderText(w, tr.blockStyle.Current(), e.Suffix) - } + renderText(w, tr.blockStyle.Current(), e.Suffix) }() rules := cascadeStyles(tr.blockStyle, tr.style[e.Style]) @@ -74,13 +74,9 @@ func (e *BaseElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) error return nil } - if rules.Prefix != "" { - renderText(w, rules, rules.Prefix) - } + renderText(w, rules, rules.Prefix) defer func() { - if rules.Suffix != "" { - renderText(w, rules, rules.Suffix) - } + renderText(w, rules, rules.Suffix) }() renderText(w, rules, e.Token) diff --git a/document.go b/document.go index 98e6714..959304d 100644 --- a/document.go +++ b/document.go @@ -13,9 +13,7 @@ func (e *DocumentElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) e rules := tr.style[Document] if rules != nil { tr.blockStyle.Push(rules) - if rules.Prefix != "" { - renderText(w, rules, rules.Prefix) - } + renderText(w, rules, rules.Prefix) } return nil } @@ -43,8 +41,6 @@ func (e *DocumentElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) e tr.document.Reset() tr.blockStyle.Pop() - if suffix != "" { - renderText(w, rules, suffix) - } + renderText(w, rules, suffix) return nil } diff --git a/gold.go b/gold.go index 5bde965..94285b2 100644 --- a/gold.go +++ b/gold.go @@ -95,9 +95,7 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf e := tr.NewElement(node) if entering { - if e.Entering != "" { - _, _ = tr.document.Write([]byte(e.Entering)) - } + _, _ = tr.document.Write([]byte(e.Entering)) // each paragraph gets rendered into a separate buffer if tr.paragraph != nil { @@ -126,9 +124,7 @@ func (tr *TermRenderer) RenderNode(w io.Writer, node *bf.Node, entering bool) bf } } - if e.Exiting != "" { - _, _ = tr.document.Write([]byte(e.Exiting)) - } + _, _ = tr.document.Write([]byte(e.Exiting)) } return bf.GoToNext diff --git a/paragraph.go b/paragraph.go index 4db2acb..e7cbc69 100644 --- a/paragraph.go +++ b/paragraph.go @@ -22,7 +22,7 @@ func (e *ParagraphElement) Render(w io.Writer, node *bf.Node, tr *TermRenderer) _, _ = w.Write([]byte("\n")) } - if rules != nil && rules.Prefix != "" { + if rules != nil { renderText(w, tr.blockStyle.Current(), rules.Prefix) } return nil @@ -40,9 +40,7 @@ func (e *ParagraphElement) Finish(w io.Writer, node *bf.Node, tr *TermRenderer) indent = 0 } } - if suffix != "" { - renderText(tr.paragraph, rules, suffix) - } + renderText(tr.paragraph, rules, suffix) pw := &PaddingWriter{ Padding: uint(tr.WordWrap + int(indent) - int(tr.blockStyle.Indent())),