From bb1da73da2e96c5abf39b1540180850b64c750dd Mon Sep 17 00:00:00 2001 From: Ruud Poutsma Date: Sat, 24 Oct 2020 15:53:34 +0200 Subject: [PATCH] fix whitespace in HtmlBlock within ListItemBlock --- src/Markdig/Parsers/BlockProcessor.cs | 9 ++++++--- src/Markdig/Parsers/HtmlBlockParser.cs | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Markdig/Parsers/BlockProcessor.cs b/src/Markdig/Parsers/BlockProcessor.cs index b2567540..09b57f73 100644 --- a/src/Markdig/Parsers/BlockProcessor.cs +++ b/src/Markdig/Parsers/BlockProcessor.cs @@ -876,10 +876,13 @@ namespace Markdig.Parsers { if (!result.IsDiscard()) { - bool isParagraph = block is ParagraphBlock; - if (TrackTrivia && isParagraph) + if (TrackTrivia) { - UnwindAllIndents(); + if (block is ParagraphBlock || + block is HtmlBlock) + { + UnwindAllIndents(); + } } leaf.AppendLine(ref Line, Column, LineIndex, CurrentLineStartPosition, TrackTrivia); } diff --git a/src/Markdig/Parsers/HtmlBlockParser.cs b/src/Markdig/Parsers/HtmlBlockParser.cs index 52cb7841..c515eb51 100644 --- a/src/Markdig/Parsers/HtmlBlockParser.cs +++ b/src/Markdig/Parsers/HtmlBlockParser.cs @@ -277,7 +277,7 @@ namespace Markdig.Parsers Type = type, // By default, setup to the end of line Span = new SourceSpan(startPosition, startPosition + state.Line.End), - BeforeWhitespace = state.PopBeforeWhitespace(startPosition - 1), + //BeforeWhitespace = state.PopBeforeWhitespace(startPosition - 1), LinesBefore = state.UseLinesBefore(), Newline = state.Line.Newline, });