Fixed unhandled exception #87

Knagis · Jul 13, 2016 · 63a6bb1 · 63a6bb1
1 parent 7089a14
commit 63a6bb1
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/CommonMark.Tests/SourcePositionTests.cs b/CommonMark.Tests/SourcePositionTests.cs
@@ -671,6 +671,21 @@ public void SourcePositionHtmlBlock1()
                 data.Substring(block.Block.SourcePosition, block.Block.SourceLength));
         }
 
+        [TestMethod]
+        [TestCategory("SourcePosition - HTML Blocks")]
+        public void SourcePositionHtmlBlock1a()
+        {
+            var data = "<pre>\n</pre\n\n\nfoo";
+            var doc = Helpers.ParseDocument(data, Settings);
+
+            var block = doc.AsEnumerable()
+                .FirstOrDefault(o => o.Block != null && o.Block.Tag == Syntax.BlockTag.HtmlBlock);
+
+            Assert.IsNotNull(block);
+            Assert.AreEqual("<pre>\n</pre\n\n\nfoo",
+                data.Substring(block.Block.SourcePosition, block.Block.SourceLength));
+        }
+
         [TestMethod]
         [TestCategory("SourcePosition - HTML Blocks")]
         public void SourcePositionHtmlBlock2()

diff --git a/CommonMark/Parser/BlockMethods.cs b/CommonMark/Parser/BlockMethods.cs
@@ -116,9 +116,9 @@ public static void Finalize(Block b, LineInfo line)
                 var includesThisLine = b.HtmlBlockType != HtmlBlockType.None && b.HtmlBlockType != HtmlBlockType.InterruptingBlock && b.HtmlBlockType != HtmlBlockType.NonInterruptingBlock;
 
                 // (b.SourcePosition >= line.LineOffset) determines if the block started on this line.
-                includesThisLine = includesThisLine || b.SourcePosition >= line.LineOffset && line.Line != null;
+                includesThisLine = includesThisLine || b.SourcePosition >= line.LineOffset;
 
-                if (includesThisLine)
+                if (includesThisLine && line.Line != null)
                     b.SourceLastPosition = line.CalculateOrigin(line.Line.Length, false);
                 else
                     b.SourceLastPosition = line.CalculateOrigin(0, false);