From a04aa8a4de8499a1593567d1d00d4bbb643f6ded Mon Sep 17 00:00:00 2001 From: Ruud Poutsma Date: Fri, 23 Oct 2020 17:50:07 +0200 Subject: [PATCH] fix empty QuoteBlock lines --- src/Markdig.Tests/RoundtripSpecs/Roundtrip.md | 1 + .../RoundtripSpecs/TestQuoteBlock.cs | 15 ++++++++ src/Markdig/Parsers/BlockProcessor.cs | 4 +++ src/Markdig/Parsers/MarkdownParser.cs | 2 +- src/Markdig/Parsers/QuoteBlockParser.cs | 28 +++++++++------ .../Renderers/Normalize/ParagraphRenderer.cs | 2 +- .../Renderers/Normalize/QuoteBlockRenderer.cs | 35 +++++++++++++++++-- 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/src/Markdig.Tests/RoundtripSpecs/Roundtrip.md b/src/Markdig.Tests/RoundtripSpecs/Roundtrip.md index dad7b489..56ea8602 100644 --- a/src/Markdig.Tests/RoundtripSpecs/Roundtrip.md +++ b/src/Markdig.Tests/RoundtripSpecs/Roundtrip.md @@ -63,3 +63,4 @@ In order: - Newline struct itself - handling newlines - should newlines be supported? +- Example 207, 209: Special-casing certain edgecases \ No newline at end of file diff --git a/src/Markdig.Tests/RoundtripSpecs/TestQuoteBlock.cs b/src/Markdig.Tests/RoundtripSpecs/TestQuoteBlock.cs index ffa46c06..3ad24f00 100644 --- a/src/Markdig.Tests/RoundtripSpecs/TestQuoteBlock.cs +++ b/src/Markdig.Tests/RoundtripSpecs/TestQuoteBlock.cs @@ -266,5 +266,20 @@ namespace Markdig.Tests.RoundtripSpecs { RoundTrip(value); } + + [TestCase(">\n>q")] + [TestCase(">\n>\n>q")] + [TestCase(">q\n>\n>q")] + [TestCase(">q\n>\n>\n>q")] + [TestCase(">q\n> \n>q")] + [TestCase(">q\n> \n>q")] + [TestCase(">q\n> \n>q")] + [TestCase(">q\n>\t\n>q")] + [TestCase(">q\n>\v\n>q")] + [TestCase(">q\n>\f\n>q")] + public void TestEmptyLines(string value) + { + RoundTrip(value); + } } } diff --git a/src/Markdig/Parsers/BlockProcessor.cs b/src/Markdig/Parsers/BlockProcessor.cs index 2c0f2516..01e06516 100644 --- a/src/Markdig/Parsers/BlockProcessor.cs +++ b/src/Markdig/Parsers/BlockProcessor.cs @@ -555,6 +555,10 @@ namespace Markdig.Parsers { break; } + if (BeforeLines != null && BeforeLines.Count > 0) + { + block.LinesAfter = UseLinesBefore(); + } Close(i); } UpdateLastBlockAndContainer(); diff --git a/src/Markdig/Parsers/MarkdownParser.cs b/src/Markdig/Parsers/MarkdownParser.cs index 240a4c68..c69aa065 100644 --- a/src/Markdig/Parsers/MarkdownParser.cs +++ b/src/Markdig/Parsers/MarkdownParser.cs @@ -117,7 +117,7 @@ namespace Markdig.Parsers if (!lineReader.IsEndOfFile()) { var lastBlock = blockProcessor.LastBlock; - if (lastBlock != null) + if (lastBlock != null && blockProcessor.BeforeLines != null) { lastBlock.LinesAfter = blockProcessor.BeforeLines ?? new List(); } diff --git a/src/Markdig/Parsers/QuoteBlockParser.cs b/src/Markdig/Parsers/QuoteBlockParser.cs index d484fbe5..8bb2066c 100644 --- a/src/Markdig/Parsers/QuoteBlockParser.cs +++ b/src/Markdig/Parsers/QuoteBlockParser.cs @@ -36,13 +36,6 @@ namespace Markdig.Parsers var quoteChar = processor.CurrentChar; var column = processor.Column; var c = processor.NextChar(); - //if (c.IsSpaceOrTab()) - //{ - // processor.NextColumn(); - // hasSpaceAfterQuoteChar = true; - // whitespaceToAdd += 1; - //} - //beforeWhitespace.End -= 1 + (hasSpaceAfterQuoteChar ? 1 : 0); var quoteBlock = new QuoteBlock(this) { @@ -51,9 +44,16 @@ namespace Markdig.Parsers Span = new SourceSpan(sourcePosition, processor.Line.End), LinesBefore = processor.UseLinesBefore() }; + StringSlice afterWhitespace = StringSlice.Empty; + if (processor.Line.IsEmptyOrWhitespace()) + { + processor.Line.TrimStart(); + afterWhitespace = new StringSlice(processor.Line.Text, sourcePosition + 1, processor.Line.End); + } quoteBlock.QuoteLines.Add(new QuoteBlock.QuoteLine { BeforeWhitespace = processor.PopBeforeWhitespace(sourcePosition - 1), + AfterWhitespace = afterWhitespace, QuoteChar = true, Newline = processor.Line.Newline, }); @@ -70,6 +70,7 @@ namespace Markdig.Parsers } var quote = (QuoteBlock) block; + var sourcePosition = processor.Start; // 5.1 Block quotes // A block quote marker consists of 0-3 spaces of initial indent, plus (a) the character > together with a following space, or (b) a single character > not followed by a space. @@ -85,20 +86,27 @@ namespace Markdig.Parsers quote.QuoteLines.Add(new QuoteBlock.QuoteLine { QuoteChar = false, - BeforeWhitespace = processor.PopBeforeWhitespace(processor.Start - 1), + BeforeWhitespace = processor.PopBeforeWhitespace(sourcePosition - 1), Newline = processor.Line.Newline, }); return BlockState.None; } } + processor.NextChar(); // Skip quote marker char + StringSlice afterWhitespace = StringSlice.Empty; + if (processor.Line.IsEmptyOrWhitespace()) + { + processor.Line.TrimStart(); + afterWhitespace = new StringSlice(processor.Line.Text, sourcePosition + 1, processor.Line.End); + } quote.QuoteLines.Add(new QuoteBlock.QuoteLine { QuoteChar = true, - BeforeWhitespace = processor.PopBeforeWhitespace(processor.Start - 1), + BeforeWhitespace = processor.PopBeforeWhitespace(sourcePosition - 1), + AfterWhitespace = afterWhitespace, Newline = processor.Line.Newline, }); - processor.NextChar(); // Skip quote marker char processor.WhitespaceStart = processor.Start; block.UpdateSpanEnd(processor.Line.End); return BlockState.Continue; diff --git a/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs index 88e17866..5b5fc752 100644 --- a/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs +++ b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs @@ -19,7 +19,7 @@ namespace Markdig.Renderers.Normalize renderer.RenderLinesBefore(paragraph); renderer.Write(paragraph.BeforeWhitespace); renderer.WriteLeafInline(paragraph); - //renderer.Write(paragraph.Newline); + //renderer.Write(paragraph.Newline); // paragraph typically has LineBreakInlines as closing inline nodes renderer.RenderLinesAfter(paragraph); } } diff --git a/src/Markdig/Renderers/Normalize/QuoteBlockRenderer.cs b/src/Markdig/Renderers/Normalize/QuoteBlockRenderer.cs index 02612a2d..373d2373 100644 --- a/src/Markdig/Renderers/Normalize/QuoteBlockRenderer.cs +++ b/src/Markdig/Renderers/Normalize/QuoteBlockRenderer.cs @@ -3,6 +3,7 @@ // See the license.txt file in the project root for more information. using Markdig.Syntax; +using Markdig.Syntax.Inlines; using System.Collections.Generic; namespace Markdig.Renderers.Normalize @@ -21,14 +22,44 @@ namespace Markdig.Renderers.Normalize var indents = new List(); foreach (var quoteLine in quoteBlock.QuoteLines) { - indents.Add(quoteLine.BeforeWhitespace.ToString() + (quoteLine.QuoteChar ? ">" : "") + quoteLine.AfterWhitespace.ToString()); + var wsb = quoteLine.BeforeWhitespace.ToString(); + var quoteChar = quoteLine.QuoteChar ? ">" : ""; + var wsa = quoteLine.AfterWhitespace.ToString(); + indents.Add(wsb + quoteChar + wsa); + } + bool noChildren = false; + if (quoteBlock.Count == 0) + { + noChildren = true; + // since this QuoteBlock instance has no children, indents will not be rendered. We + // work around this by adding empty LineBreakInlines to a ParagraphBlock. + // Wanted: a more elegant/better solution (although this is not *that* bad). + foreach (var quoteLine in quoteBlock.QuoteLines) + { + // TODO: RTP: introduce EmptyQuoteLine class deriving from LeafBlock? + var emptyLeafBlock = new ParagraphBlock + { + Newline = quoteLine.Newline + }; + var newline = new LineBreakInline + { + Newline = quoteLine.Newline + }; + var container = new ContainerInline(); + container.AppendChild(newline); + emptyLeafBlock.Inline = container; + quoteBlock.Add(emptyLeafBlock); + } } renderer.PushIndent(indents); renderer.WriteChildren(quoteBlock); renderer.PopIndent(); - renderer.RenderLinesAfter(quoteBlock); + if (!noChildren) + { + renderer.RenderLinesAfter(quoteBlock); + } } } } \ No newline at end of file