diff --git a/src/Markdig.Tests/RoundtripSpecs/Inlines/TestCodeInline.cs b/src/Markdig.Tests/RoundtripSpecs/Inlines/TestCodeInline.cs index 7fe63124..6e6c9a1d 100644 --- a/src/Markdig.Tests/RoundtripSpecs/Inlines/TestCodeInline.cs +++ b/src/Markdig.Tests/RoundtripSpecs/Inlines/TestCodeInline.cs @@ -11,26 +11,28 @@ namespace Markdig.Tests.RoundtripSpecs.Inlines [TestCase("`` ")] [TestCase(" `` ")] - [TestCase("`a`")] - [TestCase(" `a`")] - [TestCase("`a` ")] - [TestCase(" `a` ")] + [TestCase("`c`")] + [TestCase(" `c`")] + [TestCase("`c` ")] + [TestCase(" `c` ")] - [TestCase("` a`")] - [TestCase(" ` a`")] - [TestCase("` a` ")] - [TestCase(" ` a` ")] + [TestCase("` c`")] + [TestCase(" ` c`")] + [TestCase("` c` ")] + [TestCase(" ` c` ")] - [TestCase("`a `")] - [TestCase(" `a `")] - [TestCase("`a ` ")] - [TestCase(" `a ` ")] - - [TestCase("``a``")] - [TestCase("- ```a```")] - [TestCase("p ```a``` p")] + [TestCase("`c `")] + [TestCase(" `c `")] + [TestCase("`c ` ")] + [TestCase(" `c ` ")] + [TestCase("``c``")] [TestCase("```c```")] + [TestCase("````c````")] + + [TestCase("p `a` p")] + [TestCase("p ``a`` p")] + [TestCase("p ```a``` p")] // broken //[TestCase("```a```")] @@ -41,10 +43,15 @@ namespace Markdig.Tests.RoundtripSpecs.Inlines /// : intentionally trimmed. TODO: decide on how to handle //[TestCase("` a `")] - //[TestCase(" ` a `")] - //[TestCase("` a ` ")] - //[TestCase(" ` a ` ")] - public void Test_CodeInline(string value) + [TestCase(" ` a `")] + [TestCase("` a ` ")] + [TestCase(" ` a ` ")] + public void Test(string value) + { + RoundTrip(value); + } + + public void TestParagraph(string value) { RoundTrip(value); } diff --git a/src/Markdig.Tests/RoundtripSpecs/TestUnorderedList.cs b/src/Markdig.Tests/RoundtripSpecs/TestUnorderedList.cs index 8669318c..83aa2afa 100644 --- a/src/Markdig.Tests/RoundtripSpecs/TestUnorderedList.cs +++ b/src/Markdig.Tests/RoundtripSpecs/TestUnorderedList.cs @@ -69,6 +69,7 @@ namespace Markdig.Tests.RoundtripSpecs RoundTrip(value); } + [TestCase("- ```a```")] [TestCase("- i1\n - i1.1\n ```\n code\n ```")] public void TestCodeBlock(string value) { diff --git a/src/Markdig/Parsers/FencedBlockParserBase.cs b/src/Markdig/Parsers/FencedBlockParserBase.cs index b56502be..572d0193 100644 --- a/src/Markdig/Parsers/FencedBlockParserBase.cs +++ b/src/Markdig/Parsers/FencedBlockParserBase.cs @@ -95,6 +95,10 @@ namespace Markdig.Parsers for (int i = line.Start; i <= line.End; i++) { char c = line.Text[i]; + if (c == '`') + { + return false; + } switch (state) { case ParseState.AfterFence: diff --git a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs index 00cbff4e..03de579a 100644 --- a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs @@ -87,6 +87,7 @@ namespace Markdig.Parsers.Inlines } bool isMatching = false; + bool firstAndLastWasSpace = false; if (closeSticks == openSticks) { string content; @@ -95,6 +96,7 @@ 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 { @@ -109,7 +111,8 @@ namespace Markdig.Parsers.Inlines Span = new SourceSpan(processor.GetSourcePosition(startPosition, out int line, out int column), processor.GetSourcePosition(slice.Start - 1)), Line = line, Column = column, - DelimiterCount = delimiterCount + DelimiterCount = delimiterCount, + FirstAndLastWasSpace = firstAndLastWasSpace }; isMatching = true; } diff --git a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs index e7a8aab9..b1fdce46 100644 --- a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs +++ b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs @@ -32,6 +32,10 @@ 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) { if (obj.Content[0] == obj.Delimiter) @@ -48,6 +52,10 @@ namespace Markdig.Renderers.Normalize.Inlines { renderer.Write(' '); } + if (obj.FirstAndLastWasSpace) + { + renderer.Write(' '); + } renderer.Write(delimiterRun); } } diff --git a/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs index 7d09de36..5d02108f 100644 --- a/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs +++ b/src/Markdig/Renderers/Normalize/ParagraphRenderer.cs @@ -19,7 +19,6 @@ namespace Markdig.Renderers.Normalize renderer.RenderLinesBefore(paragraph); renderer.Write(paragraph.BeforeWhitespace); renderer.WriteLeafInline(paragraph); - //renderer.FinishBlock(); renderer.RenderLineAfterIfNeeded(paragraph); renderer.RenderLinesAfter(paragraph); } diff --git a/src/Markdig/Syntax/Inlines/CodeInline.cs b/src/Markdig/Syntax/Inlines/CodeInline.cs index 1aae6a7b..0d0bb63c 100644 --- a/src/Markdig/Syntax/Inlines/CodeInline.cs +++ b/src/Markdig/Syntax/Inlines/CodeInline.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 System.Diagnostics; namespace Markdig.Syntax.Inlines @@ -28,5 +29,6 @@ namespace Markdig.Syntax.Inlines /// public string Content { get; set; } + public bool FirstAndLastWasSpace { get; set; } } } \ No newline at end of file