From 137a404bdce89bdc732cd646c92fa93746b337a7 Mon Sep 17 00:00:00 2001 From: Alexandre Mutel Date: Fri, 17 Jun 2016 13:44:39 +0900 Subject: [PATCH] Add property handling of precise position for links --- src/Markdig.Tests/TestSourcePosition.cs | 44 +++++++++++++++++++ .../Parsers/Inlines/LinkInlineParser.cs | 15 +++---- src/Markdig/Syntax/Inlines/LinkInline.cs | 4 +- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/src/Markdig.Tests/TestSourcePosition.cs b/src/Markdig.Tests/TestSourcePosition.cs index 9978e949..8994e0cc 100644 --- a/src/Markdig.Tests/TestSourcePosition.cs +++ b/src/Markdig.Tests/TestSourcePosition.cs @@ -3,10 +3,13 @@ // See the license.txt file in the project root for more information. using System; +using System.Collections.Generic; +using System.Linq; using System.Text; using Markdig.Helpers; using Markdig.Renderers.Html; using Markdig.Syntax; +using Markdig.Syntax.Inlines; using NUnit.Framework; namespace Markdig.Tests @@ -162,6 +165,47 @@ literal ( 0, 4) 4-5 "); } + [Test] + public void TestLinkParts1() + { + // 0 1 + // 01 2 3456789012345 + var link = Markdown.Parse("0\n\n01 [234](/56)", new MarkdownPipelineBuilder().UsePreciseSourceLocation().Build()).Descendants().OfType().FirstOrDefault(); + Assert.NotNull(link); + + Assert.AreEqual(new SourceSpan(7, 9), link.LabelSpan); + Assert.AreEqual(new SourceSpan(12, 14), link.UrlSpan); + Assert.AreEqual(SourceSpan.Empty, link.TitleSpan); + } + + [Test] + public void TestLinkParts2() + { + // 0 1 + // 01 2 34567890123456789 + var link = Markdown.Parse("0\n\n01 [234](/56 'yo')", new MarkdownPipelineBuilder().UsePreciseSourceLocation().Build()).Descendants().OfType().FirstOrDefault(); + Assert.NotNull(link); + + Assert.AreEqual(new SourceSpan(7, 9), link.LabelSpan); + Assert.AreEqual(new SourceSpan(12, 14), link.UrlSpan); + Assert.AreEqual(new SourceSpan(16, 19), link.TitleSpan); + } + + + [Test] + public void TestLinkParts3() + { + // 0 1 + // 01 2 3456789012345 + var link = Markdown.Parse("0\n\n01![234](/56)", new MarkdownPipelineBuilder().UsePreciseSourceLocation().Build()).Descendants().OfType().FirstOrDefault(); + Assert.NotNull(link); + + Assert.AreEqual(new SourceSpan(5, 15), link.SourceSpan); + Assert.AreEqual(new SourceSpan(7, 9), link.LabelSpan); + Assert.AreEqual(new SourceSpan(12, 14), link.UrlSpan); + Assert.AreEqual(SourceSpan.Empty, link.TitleSpan); + } + [Test] public void TestHtmlInline() { diff --git a/src/Markdig/Parsers/Inlines/LinkInlineParser.cs b/src/Markdig/Parsers/Inlines/LinkInlineParser.cs index 414cf606..4d2cb276 100644 --- a/src/Markdig/Parsers/Inlines/LinkInlineParser.cs +++ b/src/Markdig/Parsers/Inlines/LinkInlineParser.cs @@ -68,7 +68,7 @@ namespace Markdig.Parsers.Inlines { Type = DelimiterType.Open, Label = label, - LabelSpan = label != null ? processor.GetSourcePositionFromLocalSpan(labelSpan) : SourceSpan.Empty, + LabelSpan = processor.GetSourcePositionFromLocalSpan(labelSpan), IsImage = isImage, SourceSpan = new SourceSpan(startPosition, processor.GetSourcePosition(slice.Start - 1)), Line = line, @@ -225,19 +225,13 @@ namespace Markdig.Parsers.Inlines Url = HtmlHelper.Unescape(url), Title = HtmlHelper.Unescape(title), IsImage = openParent.IsImage, + LabelSpan = openParent.LabelSpan, + UrlSpan = inlineState.GetSourcePositionFromLocalSpan(linkSpan), + TitleSpan = inlineState.GetSourcePositionFromLocalSpan(titleSpan), SourceSpan = new SourceSpan(openParent.SourceSpan.Start, inlineState.GetSourcePosition(text.Start -1)), Line = openParent.Line, Column = openParent.Column, }; - if (url != null) - { - link.UrlSourceSpan = inlineState.GetSourcePositionFromLocalSpan(linkSpan); - } - - if (title != null) - { - link.TitleSourceSpan = inlineState.GetSourcePositionFromLocalSpan(titleSpan); - } openParent.ReplaceBy(link); // Notifies processor as we are creating an inline locally @@ -312,6 +306,7 @@ namespace Markdig.Parsers.Inlines var literal = new LiteralInline() { + SourceSpan = openParent.SourceSpan, Content = new StringSlice(openParent.IsImage ? "![" : "[") }; diff --git a/src/Markdig/Syntax/Inlines/LinkInline.cs b/src/Markdig/Syntax/Inlines/LinkInline.cs index 93589484..f189ef41 100644 --- a/src/Markdig/Syntax/Inlines/LinkInline.cs +++ b/src/Markdig/Syntax/Inlines/LinkInline.cs @@ -72,12 +72,12 @@ namespace Markdig.Syntax.Inlines /// /// The URL source span. /// - public SourceSpan? UrlSourceSpan; + public SourceSpan? UrlSpan; /// /// The title source span. /// - public SourceSpan? TitleSourceSpan; + public SourceSpan? TitleSpan; /// /// The label span