Fix incorrect endLine positions (#187)

This requires manually passing in the appropriate endLine to `AbstractBlock::finalize()`
as a new parameter.

CHANGELOG.md

@@ -4,6 +4,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 
 ## [Unreleased][unreleased]
 
+## Changed
+ - `AbstractBlock::finalize()` now reqires a second parameter, `$endLineNumber`
+
+## Fixed
+ - Fixed incorrect `endLine` positions (#187)
+
 ## Removed
  - Removed protected function Context::addChild()
    - It was a duplicate of the Context::addBlock() method

src/Block/Element/AbstractBlock.php

@@ -250,19 +250,16 @@ public function isOpen()
      * Finalize the block; mark it closed for modification
      *
      * @param ContextInterface $context
+     * @param int              $endLineNumber
      */
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
         if (!$this->open) {
             return; // TODO: Throw AlreadyClosedException?
         }
 
         $this->open = false;
-        if ($context->getLineNumber() > $this->getStartLine()) {
-            $this->endLine = $context->getLineNumber() - 1;
-        } else {
-            $this->endLine = $context->getLineNumber();
-        }
+        $this->endLine = $endLineNumber;
 
         $context->setTip($context->getTip()->parent());
     }

src/Block/Element/FencedCode.php

@@ -178,9 +178,9 @@ public function matchesNextLine(Cursor $cursor)
         return true;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         // first line becomes info string
         $this->info = RegexHelper::unescape(trim($this->strings->first()));

src/Block/Element/Header.php

@@ -44,9 +44,9 @@ public function getLevel()
         return $this->level;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         $this->finalStringContents = implode("\n", $this->getStrings());
     }

src/Block/Element/HtmlBlock.php

@@ -100,9 +100,9 @@ public function matchesNextLine(Cursor $cursor)
         return true;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         $this->finalStringContents = implode("\n", $this->getStrings());
     }
@@ -118,7 +118,7 @@ public function handleRemainingContents(ContextInterface $context, Cursor $curso
         // Check for end condition
         if ($this->type >= self::TYPE_1_CODE_CONTAINER && $this->type <= self::TYPE_5_CDATA) {
             if ($cursor->match(RegexHelper::getHtmlBlockCloseRegex($this->type)) !== null) {
-                $this->finalize($context);
+                $this->finalize($context, $context->getLineNumber());
             }
         }
     }

src/Block/Element/IndentedCode.php

@@ -64,9 +64,9 @@ public function matchesNextLine(Cursor $cursor)
         return true;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         $reversed = array_reverse($this->getStrings(), true);
         foreach ($reversed as $index => $line) {

src/Block/Element/ListBlock.php

@@ -100,9 +100,9 @@ public function matchesNextLine(Cursor $cursor)
         return true;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         $this->tight = true; // tight by default
 

src/Block/Element/Paragraph.php

@@ -62,9 +62,9 @@ public function matchesNextLine(Cursor $cursor)
         return true;
     }
 
-    public function finalize(ContextInterface $context)
+    public function finalize(ContextInterface $context, $endLineNumber)
     {
-        parent::finalize($context);
+        parent::finalize($context, $endLineNumber);
 
         $this->finalStringContents = preg_replace('/^  */m', '', implode("\n", $this->getStrings()));
 

src/Context.php

@@ -170,7 +170,7 @@ public function addBlock(AbstractBlock $block)
         $this->getBlockCloser()->closeUnmatchedBlocks();
         $block->setStartLine($this->lineNumber);
         while (!$this->tip->canContain($block)) {
-            $this->tip->finalize($this);
+            $this->tip->finalize($this, $this->lineNumber);
         }
 
         $this->tip->appendChild($block);

src/DocParser.php

@@ -87,7 +87,7 @@ public function parse($input)
         }
 
         while ($context->getTip()) {
-            $context->getTip()->finalize($context);
+            $context->getTip()->finalize($context, count($lines));
         }
 
         $this->processInlines($context, $context->getDocument()->walker());
@@ -175,10 +175,10 @@ private function breakOutOfLists(ContextInterface $context, AbstractBlock $block
 
         if ($lastList) {
             while ($block !== $lastList) {
-                $block->finalize($context);
+                $block->finalize($context, $context->getLineNumber());
                 $block = $block->parent();
             }
-            $lastList->finalize($context);
+            $lastList->finalize($context, $context->getLineNumber());
         }
 
         $context->setContainer($context->getTip());

src/UnmatchedBlockCloser.php

@@ -55,7 +55,7 @@ public function closeUnmatchedBlocks()
     {
         while ($this->oldTip !== $this->lastMatchedContainer) {
             $oldTip = $this->oldTip->parent();
-            $this->oldTip->finalize($this->context);
+            $this->oldTip->finalize($this->context, $this->context->getLineNumber() - 1);
             $this->oldTip = $oldTip;
         }
     }