From 777ac71bd1fd6fc8e9fe37dc6d94dae33a28efec Mon Sep 17 00:00:00 2001 From: Ruud Poutsma Date: Sun, 18 Oct 2020 14:11:47 +0200 Subject: [PATCH] fix HardLineBreak, CodeInline tests --- src/Markdig/Parsers/Inlines/CodeInlineParser.cs | 11 +++++++---- src/Markdig/Parsers/Inlines/EscapeInlineParser.cs | 10 ++++++++-- .../Normalize/Inlines/CodeInlineRenderer.cs | 10 +--------- src/Markdig/Syntax/Inlines/CodeInline.cs | 2 ++ src/Markdig/Syntax/Inlines/EscapedCharacterInline.cs | 12 ++++++++++++ 5 files changed, 30 insertions(+), 15 deletions(-) create mode 100644 src/Markdig/Syntax/Inlines/EscapedCharacterInline.cs diff --git a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs index 03de579a..4631c1e9 100644 --- a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs @@ -35,6 +35,7 @@ namespace Markdig.Parsers.Inlines // Match the opened sticks int openSticks = slice.CountAndSkipChar(match); + int contentStart = slice.Start; int closeSticks = 0; char c = slice.CurrentChar; @@ -53,6 +54,7 @@ namespace Markdig.Parsers.Inlines // whitespace from the opening or closing backtick strings. bool allSpace = true; + var contentEnd = -1; while (c != '\0') { @@ -64,6 +66,7 @@ namespace Markdig.Parsers.Inlines if (c == match) { + contentEnd = slice.Start; closeSticks = slice.CountAndSkipChar(match); if (openSticks == closeSticks) @@ -87,7 +90,6 @@ namespace Markdig.Parsers.Inlines } bool isMatching = false; - bool firstAndLastWasSpace = false; if (closeSticks == openSticks) { string content; @@ -96,7 +98,6 @@ namespace Markdig.Parsers.Inlines if (!allSpace && builder.Length > 2 && builder[0] == ' ' && builder[builder.Length - 1] == ' ') { content = builder.ToString(1, builder.Length - 2); - firstAndLastWasSpace = true; } else { @@ -104,15 +105,17 @@ namespace Markdig.Parsers.Inlines } int delimiterCount = Math.Min(openSticks, closeSticks); + var spanStart = processor.GetSourcePosition(startPosition, out int line, out int column); + var spanEnd = processor.GetSourcePosition(slice.Start - 1); processor.Inline = new CodeInline() { Delimiter = match, Content = content, - Span = new SourceSpan(processor.GetSourcePosition(startPosition, out int line, out int column), processor.GetSourcePosition(slice.Start - 1)), + ContentWithTrivia = new StringSlice(slice.Text, contentStart, contentEnd - 1), + Span = new SourceSpan(spanStart, spanEnd), Line = line, Column = column, DelimiterCount = delimiterCount, - FirstAndLastWasSpace = firstAndLastWasSpace }; isMatching = true; } diff --git a/src/Markdig/Parsers/Inlines/EscapeInlineParser.cs b/src/Markdig/Parsers/Inlines/EscapeInlineParser.cs index d59c06b6..320499f2 100644 --- a/src/Markdig/Parsers/Inlines/EscapeInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/EscapeInlineParser.cs @@ -41,15 +41,21 @@ namespace Markdig.Parsers.Inlines } // A backslash at the end of the line is a [hard line break]: - if (c == '\n') + if (c == '\n' || c == '\r') { + var newline = c == '\n' ? Newline.LineFeed : Newline.CarriageReturn; + if (c == '\r' && slice.PeekChar() == '\n') + { + newline = Newline.CarriageReturnLineFeed; + } processor.Inline = new LineBreakInline() { IsHard = true, IsBackslash = true, Span = { Start = processor.GetSourcePosition(startPosition, out line, out column) }, Line = line, - Column = column + Column = column, + Newline = newline }; processor.Inline.Span.End = processor.Inline.Span.Start + 1; slice.NextChar(); diff --git a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs index c9ac4663..327c97a9 100644 --- a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs +++ b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs @@ -16,17 +16,9 @@ namespace Markdig.Renderers.Normalize.Inlines { var delimiterRun = new string(obj.Delimiter, obj.DelimiterCount); renderer.Write(delimiterRun); - if (obj.FirstAndLastWasSpace) - { - renderer.Write(' '); - } if (obj.Content.Length != 0) { - renderer.Write(obj.Content); - } - if (obj.FirstAndLastWasSpace) - { - renderer.Write(' '); + renderer.Write(obj.ContentWithTrivia); } renderer.Write(delimiterRun); } diff --git a/src/Markdig/Syntax/Inlines/CodeInline.cs b/src/Markdig/Syntax/Inlines/CodeInline.cs index 0d0bb63c..7aa6bff8 100644 --- a/src/Markdig/Syntax/Inlines/CodeInline.cs +++ b/src/Markdig/Syntax/Inlines/CodeInline.cs @@ -29,6 +29,8 @@ namespace Markdig.Syntax.Inlines /// public string Content { get; set; } + public StringSlice ContentWithTrivia { get; set; } + public bool FirstAndLastWasSpace { get; set; } } } \ No newline at end of file diff --git a/src/Markdig/Syntax/Inlines/EscapedCharacterInline.cs b/src/Markdig/Syntax/Inlines/EscapedCharacterInline.cs new file mode 100644 index 00000000..1a4d11df --- /dev/null +++ b/src/Markdig/Syntax/Inlines/EscapedCharacterInline.cs @@ -0,0 +1,12 @@ +using System.Diagnostics; + +namespace Markdig.Syntax.Inlines +{ + [DebuggerDisplay("\\{Character}")] + public class EscapedCharacterInline : LeafInline + { + public char Character { get; set; } + + public override string ToString() => $@"\\{Character}"; + } +}