From 6f1d39e1bbcc352dee01e616c41b7d415550db20 Mon Sep 17 00:00:00 2001 From: Alexandre Mutel Date: Wed, 15 Jun 2016 15:01:41 +0900 Subject: [PATCH] Add precise position for definition lists --- src/Markdig.Tests/TestSourcePosition.cs | 58 +++++++++++++++++++ .../DefinitionLists/DefinitionListParser.cs | 32 ++++++++-- 2 files changed, 85 insertions(+), 5 deletions(-) diff --git a/src/Markdig.Tests/TestSourcePosition.cs b/src/Markdig.Tests/TestSourcePosition.cs index aaca944b..649e4f9b 100644 --- a/src/Markdig.Tests/TestSourcePosition.cs +++ b/src/Markdig.Tests/TestSourcePosition.cs @@ -302,6 +302,64 @@ abbreviation ( 2,61) 99-102 ", "abbreviations"); } + [Test] + public void TestCitation() + { + // 0123 4 567 8 + Check("01 \"\"23\"\"", @" +paragraph ( 0, 0) 0-8 +literal ( 0, 0) 0-2 +emphasis ( 0, 3) 3-8 +literal ( 0, 5) 5-6 +", "citations"); + } + + [Test] + public void TestCustomContainer() + { + // 01 2345 678 9ABC DEF + Check("0\n:::\n23\n:::\n45\n", @" +paragraph ( 0, 0) 0-0 +literal ( 0, 0) 0-0 +customcontainer ( 1, 0) 2-11 +paragraph ( 2, 0) 6-7 +literal ( 2, 0) 6-7 +paragraph ( 4, 0) 13-14 +literal ( 4, 0) 13-14 +", "customcontainers"); + } + + [Test] + public void TestDefinitionList() + { + // 012 3456789A + Check("a0\n: 1234", @" +definitionlist ( 0, 0) 0-10 +definitionitem ( 1, 0) 3-10 +definitionterm ( 0, 0) 0-1 +literal ( 0, 0) 0-1 +paragraph ( 1, 4) 7-10 +literal ( 1, 4) 7-10 +", "definitionlists"); + } + + [Test] + public void TestDefinitionList2() + { + // 012 3456789AB CDEF01234 + Check("a0\n: 1234\n: 5678", @" +definitionlist ( 0, 0) 0-20 +definitionitem ( 1, 0) 3-10 +definitionterm ( 0, 0) 0-1 +literal ( 0, 0) 0-1 +paragraph ( 1, 4) 7-10 +literal ( 1, 4) 7-10 +definitionitem ( 2, 4) 12-20 +paragraph ( 2, 5) 17-20 +literal ( 2, 5) 17-20 +", "definitionlists"); + } + private static void Check(string text, string expectedResult, string extensions = null) { diff --git a/src/Markdig/Extensions/DefinitionLists/DefinitionListParser.cs b/src/Markdig/Extensions/DefinitionLists/DefinitionListParser.cs index 340288a8..788c2b07 100644 --- a/src/Markdig/Extensions/DefinitionLists/DefinitionListParser.cs +++ b/src/Markdig/Extensions/DefinitionLists/DefinitionListParser.cs @@ -30,6 +30,8 @@ namespace Markdig.Extensions.DefinitionLists return BlockState.None; } + var startPosition = processor.Start; + var column = processor.ColumnBeforeIndent; processor.NextChar(); processor.ParseIndent(); @@ -62,16 +64,24 @@ namespace Markdig.Extensions.DefinitionLists if (currentDefinitionList == null) { - currentDefinitionList = new DefinitionList(this); + currentDefinitionList = new DefinitionList(this) + { + SourceStartPosition = paragraphBlock.SourceStartPosition, + SourceEndPosition = processor.Line.End, + Column = paragraphBlock.Column, + Line = paragraphBlock.Line, + }; previousParent.Add(currentDefinitionList); } var definitionItem = new DefinitionItem(this) { - Column = processor.Column, + Line = processor.LineIndex, + Column = column, + SourceStartPosition = startPosition, + SourceEndPosition = processor.Line.End, OpeningCharacter = processor.CurrentChar, }; - currentDefinitionList.Add(definitionItem); for (int i = 0; i < paragraphBlock.Lines.Count; i++) { @@ -80,14 +90,19 @@ namespace Markdig.Extensions.DefinitionLists { Column = paragraphBlock.Column, Line = line.Line, + SourceStartPosition = paragraphBlock.SourceStartPosition, + SourceEndPosition = paragraphBlock.SourceEndPosition, IsOpen = false }; term.AppendLine(ref line.Slice, line.Column, line.Line, line.Position); definitionItem.Add(term); } - + currentDefinitionList.Add(definitionItem); processor.Open(definitionItem); + // Update the end position + currentDefinitionList.SourceEndPosition = processor.Line.End; + return BlockState.Continue; } @@ -100,11 +115,13 @@ namespace Markdig.Extensions.DefinitionLists return BlockState.Continue; } + var list = (DefinitionList)definitionItem.Parent; var lastBlankLine = definitionItem.LastChild as BlankLineBlock; // Check if we have another definition list if (Array.IndexOf(OpeningCharacters, processor.CurrentChar) >= 0) { + var startPosition = processor.Start; var column = processor.ColumnBeforeIndent; processor.NextChar(); processor.ParseIndent(); @@ -118,6 +135,8 @@ namespace Markdig.Extensions.DefinitionLists { definitionItem.RemoveAt(definitionItem.Count - 1); } + + list.SourceEndPosition = list.LastChild.SourceEndPosition; return BlockState.None; } @@ -126,10 +145,12 @@ namespace Markdig.Extensions.DefinitionLists processor.GoToColumn(column + 4); } - var list = (DefinitionList) definitionItem.Parent; processor.Close(definitionItem); var nextDefinitionItem = new DefinitionItem(this) { + SourceStartPosition = startPosition, + SourceEndPosition = processor.Line.End, + Line = processor.LineIndex, Column = processor.Column, OpeningCharacter = processor.CurrentChar, }; @@ -161,6 +182,7 @@ namespace Markdig.Extensions.DefinitionLists definitionItem.RemoveAt(definitionItem.Count - 1); } + list.SourceEndPosition = list.LastChild.SourceEndPosition; return BlockState.Break; } }