diff --git a/src/Markdig.Tests/TestCst.cs b/src/Markdig.Tests/TestCst.cs index 8e6650bb..6137de8e 100644 --- a/src/Markdig.Tests/TestCst.cs +++ b/src/Markdig.Tests/TestCst.cs @@ -360,6 +360,16 @@ namespace Markdig.Tests [TestCase("`a ` ")] [TestCase(" `a ` ")] + [TestCase("``a``")] + [TestCase("- ```a```")] + [TestCase("p ```a``` p")] + + // broken + //[TestCase("```a```")] + [TestCase("```a``` p")] + //[TestCase("p\n\n```a``` p")] + //[TestCase("```a``` p\n```a``` p")] + /// : intentionally trimmed. TODO: decide on how to handle //[TestCase("` a `")] //[TestCase(" ` a `")] diff --git a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs index 16cb1abe..00cbff4e 100644 --- a/src/Markdig/Parsers/Inlines/CodeInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/CodeInlineParser.cs @@ -5,6 +5,7 @@ using Markdig.Helpers; using Markdig.Syntax; using Markdig.Syntax.Inlines; +using System; namespace Markdig.Parsers.Inlines { @@ -100,13 +101,15 @@ namespace Markdig.Parsers.Inlines content = builder.ToString(); } + int delimiterCount = Math.Min(openSticks, closeSticks); 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)), Line = line, - Column = column + Column = column, + DelimiterCount = delimiterCount }; isMatching = true; } diff --git a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs index 46fd6b67..e7a8aab9 100644 --- a/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs +++ b/src/Markdig/Renderers/Normalize/Inlines/CodeInlineRenderer.cs @@ -15,22 +15,22 @@ namespace Markdig.Renderers.Normalize.Inlines protected override void Write(NormalizeRenderer renderer, CodeInline obj) { var delimiterCount = 0; - for (var i = 0; i < obj.Content.Length; i++) - { - var index = obj.Content.IndexOf(obj.Delimiter, i); - if (index == -1) break; + //for (var i = 0; i < obj.Content.Length; i++) + //{ + // var index = obj.Content.IndexOf(obj.Delimiter, i); + // if (index == -1) break; - var count = 1; - for (i = index + 1; i < obj.Content.Length; i++) - { - if (obj.Content[i] == obj.Delimiter) count++; - else break; - } + // var count = 1; + // for (i = index + 1; i < obj.Content.Length; i++) + // { + // if (obj.Content[i] == obj.Delimiter) count++; + // else break; + // } - if (delimiterCount < count) - delimiterCount = count; - } - var delimiterRun = new string(obj.Delimiter, delimiterCount + 1); + // if (delimiterCount < count) + // delimiterCount = count; + //} + var delimiterRun = new string(obj.Delimiter, obj.DelimiterCount); renderer.Write(delimiterRun); if (obj.Content.Length != 0) { diff --git a/src/Markdig/Syntax/Inlines/CodeInline.cs b/src/Markdig/Syntax/Inlines/CodeInline.cs index c445fa38..1aae6a7b 100644 --- a/src/Markdig/Syntax/Inlines/CodeInline.cs +++ b/src/Markdig/Syntax/Inlines/CodeInline.cs @@ -18,9 +18,15 @@ namespace Markdig.Syntax.Inlines /// public char Delimiter { get; set; } + /// + /// Gets or sets the amount of delimiter characters used + /// + public int DelimiterCount { get; set; } + /// /// Gets or sets the content of the span. /// public string Content { get; set; } + } } \ No newline at end of file