fix: render right margin for block stack elements (#334)

* Fix spacing for block stack elements

* update golden files

* multiple margin by 2 to account for margin-right

Co-authored-by: Maximilian Moehl <[email protected]>

---------

Co-authored-by: Maximilian Moehl <[email protected]>

ansi/blockstack.go

@@ -59,10 +59,10 @@ func (s BlockStack) Margin() uint {
 
 // Width returns the available rendering width.
 func (s BlockStack) Width(ctx RenderContext) uint {
-	if s.Indent()*s.Margin() > uint(ctx.options.WordWrap) {
+	if s.Indent()+s.Margin()*2 > uint(ctx.options.WordWrap) {
 		return 0
 	}
-	return uint(ctx.options.WordWrap) - s.Indent()*s.Margin()
+	return uint(ctx.options.WordWrap) - s.Indent() - s.Margin()*2
 }
 
 // Parent returns the current BlockElement's parent.

ansi/heading.go

@@ -4,7 +4,6 @@ import (
 	"bytes"
 	"io"
 
-	"github.com/muesli/reflow/indent"
 	"github.com/muesli/reflow/wordwrap"
 )
 
@@ -60,28 +59,16 @@ func (e *HeadingElement) Render(w io.Writer, ctx RenderContext) error {
 func (e *HeadingElement) Finish(w io.Writer, ctx RenderContext) error {
 	bs := ctx.blockStack
 	rules := bs.Current().Style
+	mw := NewMarginWriter(ctx, w, rules)
 
-	var indentation uint
-	var margin uint
-	if rules.Indent != nil {
-		indentation = *rules.Indent
-	}
-	if rules.Margin != nil {
-		margin = *rules.Margin
-	}
-
-	iw := indent.NewWriterPipe(w, indentation+margin, func(wr io.Writer) {
-		renderText(w, ctx.options.ColorProfile, bs.Parent().Style.StylePrimitive, " ")
-	})
-
-	flow := wordwrap.NewWriter(int(bs.Width(ctx) - indentation - margin*2))
+	flow := wordwrap.NewWriter(int(bs.Width(ctx)))
 	_, err := flow.Write(bs.Current().Block.Bytes())
 	if err != nil {
 		return err
 	}
 	flow.Close()
 
-	_, err = iw.Write(flow.Bytes())
+	_, err = mw.Write(flow.Bytes())
 	if err != nil {
 		return err
 	}