From 1b44256fc093b2b52868ad39cc1233dde9e07a3e Mon Sep 17 00:00:00 2001 From: Ruud Poutsma Date: Sat, 24 Oct 2020 14:13:38 +0200 Subject: [PATCH] improve whitespace handling in FencedCodeBlock --- src/Markdig.Tests/RoundtripSpecs/TestOrderedList.cs | 10 +++++++++- src/Markdig/Parsers/FencedBlockParserBase.cs | 3 +++ src/Markdig/Parsers/HeadingBlockParser.cs | 2 +- src/Markdig/Parsers/MarkdownParser.cs | 9 +++------ src/Markdig/Renderers/Normalize/ListRenderer.cs | 1 + src/Markdig/Syntax/IBlock.cs | 5 +++++ src/Markdig/Syntax/IFencedBlock.cs | 1 - 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/Markdig.Tests/RoundtripSpecs/TestOrderedList.cs b/src/Markdig.Tests/RoundtripSpecs/TestOrderedList.cs index c6a0d632..3df63fe3 100644 --- a/src/Markdig.Tests/RoundtripSpecs/TestOrderedList.cs +++ b/src/Markdig.Tests/RoundtripSpecs/TestOrderedList.cs @@ -104,12 +104,20 @@ namespace Markdig.Tests.RoundtripSpecs [TestCase("1. i\n2. j\n3. k")] [TestCase("1. i\n2. j\n3. k\n")] - public void Test(string value) { RoundTrip(value); } + [TestCase("10. i")] + [TestCase("11. i")] + [TestCase("10. i\n12. i")] + public void Test_MoreThenOneStart(string value) + { + RoundTrip(value); + } + + [TestCase("\n1. i")] [TestCase("\r1. i")] [TestCase("\r\n1. i")] diff --git a/src/Markdig/Parsers/FencedBlockParserBase.cs b/src/Markdig/Parsers/FencedBlockParserBase.cs index 986b5002..ea753677 100644 --- a/src/Markdig/Parsers/FencedBlockParserBase.cs +++ b/src/Markdig/Parsers/FencedBlockParserBase.cs @@ -90,6 +90,8 @@ namespace Markdig.Parsers // after args? // info: between fencedchars and + var wsb = blockProcessor.PopBeforeWhitespace(blockProcessor.Start - 1); + // An info string cannot contain any backticks (unless it is a tilde block) for (int i = line.Start; i <= line.End; i++) { @@ -166,6 +168,7 @@ namespace Markdig.Parsers fenced.Arguments = HtmlHelper.Unescape(arg); fenced.WhitespaceAfterArguments = afterArg; fenced.InfoNewline = line.Newline; + fenced.BeforeWhitespace = wsb; return true; } diff --git a/src/Markdig/Parsers/HeadingBlockParser.cs b/src/Markdig/Parsers/HeadingBlockParser.cs index b055c74b..fc91b390 100644 --- a/src/Markdig/Parsers/HeadingBlockParser.cs +++ b/src/Markdig/Parsers/HeadingBlockParser.cs @@ -84,7 +84,7 @@ namespace Markdig.Parsers WhitespaceAfterAtxHeaderChar = whitespace, Level = leadingCount, Column = column, - Span = { Start = sourcePosition }, + Span = { Start = sourcePosition }, BeforeWhitespace = processor.PopBeforeWhitespace(sourcePosition - 1), LinesBefore = processor.UseLinesBefore(), Newline = processor.Line.Newline, diff --git a/src/Markdig/Parsers/MarkdownParser.cs b/src/Markdig/Parsers/MarkdownParser.cs index c69aa065..53889d62 100644 --- a/src/Markdig/Parsers/MarkdownParser.cs +++ b/src/Markdig/Parsers/MarkdownParser.cs @@ -114,13 +114,10 @@ namespace Markdig.Parsers // If this is the end of file and the last line is empty if (lineText.Text is null) { - if (!lineReader.IsEndOfFile()) + var lastBlock = blockProcessor.LastBlock; + if (lastBlock != null && blockProcessor.BeforeLines != null) { - var lastBlock = blockProcessor.LastBlock; - if (lastBlock != null && blockProcessor.BeforeLines != null) - { - lastBlock.LinesAfter = blockProcessor.BeforeLines ?? new List(); - } + lastBlock.LinesAfter = blockProcessor.BeforeLines ?? new List(); } break; } diff --git a/src/Markdig/Renderers/Normalize/ListRenderer.cs b/src/Markdig/Renderers/Normalize/ListRenderer.cs index c9b06267..61fa6c15 100644 --- a/src/Markdig/Renderers/Normalize/ListRenderer.cs +++ b/src/Markdig/Renderers/Normalize/ListRenderer.cs @@ -44,6 +44,7 @@ namespace Markdig.Renderers.Normalize renderer.Write(listItem.BeforeWhitespace); renderer.Write(index.ToString(CultureInfo.InvariantCulture)); + //renderer.Write(listItem.Order.ToString(CultureInfo.InvariantCulture)); renderer.Write(listBlock.OrderedDelimiter); renderer.Write(' '); renderer.PushIndent(new string(' ', IntLog10Fast(index) + 3)); diff --git a/src/Markdig/Syntax/IBlock.cs b/src/Markdig/Syntax/IBlock.cs index c0cd35b2..242250f4 100644 --- a/src/Markdig/Syntax/IBlock.cs +++ b/src/Markdig/Syntax/IBlock.cs @@ -2,6 +2,7 @@ // This file is licensed under the BSD-Clause 2 license. // See the license.txt file in the project root for more information. +using Markdig.Helpers; using Markdig.Parsers; namespace Markdig.Syntax @@ -56,5 +57,9 @@ namespace Markdig.Syntax /// Occurs when the process of inlines ends for this instance. /// event ProcessInlineDelegate ProcessInlinesEnd; + + public StringSlice BeforeWhitespace { get; set; } + public StringSlice AfterWhitespace { get; set; } + } } \ No newline at end of file diff --git a/src/Markdig/Syntax/IFencedBlock.cs b/src/Markdig/Syntax/IFencedBlock.cs index 931b8cdf..9dd3b167 100644 --- a/src/Markdig/Syntax/IFencedBlock.cs +++ b/src/Markdig/Syntax/IFencedBlock.cs @@ -51,7 +51,6 @@ namespace Markdig.Syntax /// public int ClosingFencedCharCount { get; set; } public StringSlice WhitespaceBeforeClosingFence { get; set; } - public StringSlice AfterWhitespace { get; set; } /// /// Gets or sets the fenced character used to open and close this fenced code block.