Allow Reader to display file path in its error messages

Author: kylekatarnls

src/Phug/Reader.php

@@ -2,13 +2,16 @@
 
 namespace Phug;
 
+use Phug\Util\Partial\PathTrait;
 use Phug\Util\SourceLocation;
 
 /**
  * A string reading utility that searches strings byte by byte.
  */
 class Reader
 {
+    use PathTrait;
+
     /**
      * An array of PREG errors with a good error message.
      *
@@ -910,12 +913,14 @@ protected function getPregErrorText($code = null)
      */
     protected function throwException($message)
     {
+        $path = $this->getPath();
         $exception = new ReaderException(
             new SourceLocation(null, $this->line, $this->offset),
             sprintf(
-                "Failed to read: %s \nNear: %s \nLine: %s \nOffset: %s \nPosition: %s",
+                "Failed to read: %s \nNear: %s%s\nLine: %s \nOffset: %s \nPosition: %s",
                 $message,
                 $this->peek(20),
+                $path ? "\nFile: $path" : '',
                 $this->line,
                 $this->offset,
                 $this->position

tests/Phug/ReaderTest.php

@@ -243,6 +243,19 @@ public function testMatchFailsOnPregError()
         (new Reader('foobar foobar foobar'))->match('(?:\D+|<\d+>)*[!?]');
     }
 
+    /**
+     * @covers ::throwException
+     * @covers \Phug\ReaderException
+     * @expectedException \Phug\ReaderException
+     * @expectedExceptionMessage File: path.pug
+     */
+    public function testPathInErrors()
+    {
+        $reader = new Reader('foobar foobar foobar');
+        $reader->setPath('path.pug');
+        $reader->match('(?:\D+|<\d+>)*[!?]');
+    }
+
     /**
      * @covers ::match
      * @covers ::getMatch