Skip to content

Commit 986e3e8

Browse files
committed
fix: disable padding for the codeblock
test: update test snapshots
1 parent ffae7b7 commit 986e3e8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+339
-333
lines changed

β€Žansi/blockelement.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (e *BlockElement) Finish(w io.Writer, ctx RenderContext) error {
3636
" ,.;-+|",
3737
)
3838

39-
mw := NewMarginWriter(ctx, w, bs.Current().Style)
39+
mw := NewMarginWriter(ctx, w, bs.Current().Style, true)
4040
if _, err := io.WriteString(mw, s); err != nil {
4141
return err
4242
}

β€Žansi/codeblock.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (e *CodeBlockElement) Finish(w io.Writer, ctx RenderContext) error {
124124
mutex.Unlock()
125125
}
126126

127-
mw := NewMarginWriter(ctx, w, bs.Current().Style)
127+
mw := NewMarginWriter(ctx, w, bs.Current().Style, false)
128128
renderText(mw, ctx.options.ColorProfile, bs.Current().Style.StylePrimitive, rules.BlockPrefix)
129129
if len(theme) > 0 {
130130
err := quick.Highlight(mw, e.Code, e.Language, "terminal256", theme)

β€Žansi/heading.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ func (e *HeadingElement) Render(w io.Writer, ctx RenderContext) error {
5959
func (e *HeadingElement) Finish(w io.Writer, ctx RenderContext) error {
6060
bs := ctx.blockStack
6161
rules := bs.Current().Style
62-
mw := NewMarginWriter(ctx, w, rules)
62+
mw := NewMarginWriter(ctx, w, rules, true)
6363

6464
flow := wordwrap.NewWriter(int(bs.Width(ctx)))
6565
_, err := flow.Write(bs.Current().Block.Bytes())

β€Žansi/margin.go

+9-5
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ type MarginWriter struct {
2424
}
2525

2626
// NewMarginWriter returns a new MarginWriter.
27-
func NewMarginWriter(ctx RenderContext, w io.Writer, rules StyleBlock) *MarginWriter {
27+
func NewMarginWriter(ctx RenderContext, w io.Writer, rules StyleBlock, padded bool) *MarginWriter {
2828
bs := ctx.blockStack
2929
mw := &MarginWriter{
3030
w: w,
@@ -44,11 +44,15 @@ func NewMarginWriter(ctx RenderContext, w io.Writer, rules StyleBlock) *MarginWr
4444
mw.margin = *rules.Margin
4545
}
4646

47-
mw.pw = padding.NewWriterPipe(mw.w, bs.Width(ctx), func(wr io.Writer) {
48-
renderText(mw.w, mw.profile, mw.rules, " ")
49-
})
47+
fwd := mw.w
48+
if padded {
49+
mw.pw = padding.NewWriterPipe(mw.w, bs.Width(ctx), func(wr io.Writer) {
50+
renderText(mw.w, mw.profile, mw.rules, "")
51+
})
52+
fwd = mw.pw
53+
}
5054

51-
mw.iw = indent.NewWriterPipe(mw.pw, mw.indentation+mw.margin, mw.indentFunc)
55+
mw.iw = indent.NewWriterPipe(fwd, mw.indentation+(mw.margin*2), mw.indentFunc)
5256
return mw
5357
}
5458

β€Žansi/paragraph.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ func (e *ParagraphElement) Finish(w io.Writer, ctx RenderContext) error {
3535
bs := ctx.blockStack
3636
rules := bs.Current().Style
3737

38-
mw := NewMarginWriter(ctx, w, rules)
38+
mw := NewMarginWriter(ctx, w, rules, true)
3939
if len(strings.TrimSpace(bs.Current().Block.String())) > 0 {
4040
flow := wordwrap.NewWriter(int(bs.Width(ctx)))
4141
flow.KeepNewlines = ctx.options.PreserveNewLines

β€Žansi/testdata/TestRenderer/block_quote.golden

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/code.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/code_block.golden

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/emoji.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/emph.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/enumeration.golden

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/heading.golden

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/image.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/link.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/list.golden

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/ordered_list.golden

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/strikethrough.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/strong.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/table.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/table_align.golden

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

β€Žansi/testdata/TestRenderer/task.golden

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
Β (0)