Disable interpolation in comments

phug-php · May 16, 2020 · b53a717 · b53a717
1 parent 512263a
commit b53a717
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 34 deletions.
diff --git a/src/Phug/Lexer/Lexer/AbstractToken.php b/src/Phug/Lexer/Lexer/AbstractToken.php
@@ -42,4 +42,9 @@ public function markAsHandled()
     {
         $this->handled = true;
     }
+
+    public function __toString()
+    {
+        return '['.get_class($this).']';
+    }
 }
diff --git a/src/Phug/Lexer/Lexer/Analyzer/LineAnalyzer.php b/src/Phug/Lexer/Lexer/Analyzer/LineAnalyzer.php
@@ -122,17 +122,7 @@ public function getLines()
     public function getFlatLines()
     {
         return array_map(function ($line) {
-            $rawText = '';
-
-            foreach ($line as $chunk) {
-                if ($chunk instanceof TokenInterface) {
-                    continue;
-                }
-
-                $rawText .= $chunk;
-            }
-
-            return $rawText;
+            return implode('', $line);
         }, $this->lines);
     }
 

diff --git a/src/Phug/Lexer/Lexer/Scanner/CommentScanner.php b/src/Phug/Lexer/Lexer/Scanner/CommentScanner.php
@@ -42,6 +42,7 @@ public function scan(State $state)
         $token = $state->createToken(TextToken::class);
 
         $analyzer = new LineAnalyzer($state, $reader, $lines);
+        $analyzer->disallowInterpolation();
         $analyzer->analyze(false);
         $lines = $analyzer->getFlatLines();
 

diff --git a/src/Phug/Lexer/Lexer/Scanner/InterpolationScanner.php b/src/Phug/Lexer/Lexer/Scanner/InterpolationScanner.php
@@ -18,6 +18,35 @@
 
 class InterpolationScanner implements ScannerInterface
 {
+    protected $interpolationChars = [
+        'tagInterpolation' => ['[', ']'],
+        'interpolation'    => ['{', '}'],
+    ];
+
+    protected $regExp;
+
+    public function __construct()
+    {
+        $interpolations = [];
+        $backIndex = 2;
+
+        foreach ($this->interpolationChars as $name => list($start, $end)) {
+            $start = preg_quote($start, '/');
+            $end = preg_quote($end, '/');
+            $interpolations[] = $start.'(?<'.$name.'>'.
+                '(?>"(?:\\\\[\\S\\s]|[^"\\\\])*"|\'(?:\\\\[\\S\\s]|[^\'\\\\])*\'|[^'.
+                $start.$end.
+                '\'"]++|(?-'.$backIndex.'))*+'.
+                ')'.$end;
+            $backIndex++;
+        }
+
+        $this->regExp = '(?<text>.*?)'.
+            '(?<!\\\\)'.
+            '(?<escape>#|!(?='.preg_quote($this->interpolationChars['interpolation'][0], '/').'))'.
+            '(?<wrap>'.implode('|', $interpolations).')';
+    }
+
     protected function throwEndOfLineExceptionIf(State $state, $condition)
     {
         if ($condition) {
@@ -103,21 +132,9 @@ public function scan(State $state)
     {
         $reader = $state->getReader();
 
-        //TODO: $state->endToken
-        while ($reader->match(
-            '(?<text>.*?)'.
-            '(?<!\\\\)'.
-            '(?<escape>#|!(?=\{))(?<wrap>'.
-                '\\[(?<tagInterpolation>'.
-                    '(?>"(?:\\\\[\\S\\s]|[^"\\\\])*"|\'(?:\\\\[\\S\\s]|[^\'\\\\])*\'|[^\\[\\]\'"]++|(?-2))*+'.
-                ')\\]|'.
-                '\\{(?<interpolation>'.
-                    '(?>"(?:\\\\[\\S\\s]|[^"\\\\])*"|\'(?:\\\\[\\S\\s]|[^\'\\\\])*\'|[^{}\'"]++|(?-3))*+'.
-                ')\\}'.
-            ')'
-        )) {
+        while ($reader->match($this->regExp)) {
             $text = $reader->getMatch('text');
-            $text = preg_replace('/\\\\([#!]\\[|#\\{)/', '$1', $text);
+            $text = preg_replace('/\\\\([#!]\\[|#{)/', '$1', $text);
 
             if (mb_strlen($text) > 0) {
                 /** @var TextToken $token */
@@ -142,6 +159,7 @@ public function scan(State $state)
                 /** @var TextToken $token */
                 $token = $state->createToken(TextToken::class);
                 $token->setValue("\n");
+
                 yield $token;
             }
         }

diff --git a/tests/Phug/Lexer/Scanner/CommentScannerTest.php b/tests/Phug/Lexer/Scanner/CommentScannerTest.php
@@ -151,25 +151,31 @@ public function testCommentInIndent()
      */
     public function testInterpolationInComment()
     {
-        $code = implode("\n", [
-            '//',
+        $comment = implode("\n", [
+            '',
             '  p.',
             '    go to #[a(href=\'\') page]',
         ]);
 
-        $this->assertTokens($code, [
+        $this->assertTokens("//$comment", [
             CommentToken::class,
             TextToken::class,
         ], null, $tokens);
 
         /** @var TextToken $text */
         $text = $tokens[1];
 
-        $this->assertSame(implode("\n", [
-            '',
-            '  p.',
-            '    go to page',
-        ]), $text->getValue());
+        $this->assertSame($comment, $text->getValue());
+
+        $this->assertTokens("//-$comment", [
+            CommentToken::class,
+            TextToken::class,
+        ], null, $tokens);
+
+        /** @var TextToken $text */
+        $text = $tokens[1];
+
+        $this->assertSame($comment, $text->getValue());
     }
 
     /**

diff --git a/tests/Phug/Lexer/Scanner/InterpolationScannerTest.php b/tests/Phug/Lexer/Scanner/InterpolationScannerTest.php
@@ -172,7 +172,7 @@ public function testNewLineInTagInterpolation()
         $this->expectMessageToBeThrown('End of line was reached with no closing bracket for interpolation.');
 
         $input = "p #[em\n]";
-        $tokens = iterator_to_array($this->lexer->lex($input));
+        iterator_to_array($this->lexer->lex($input));
     }
 
     /**

diff --git a/tests/Phug/Lexer/Token/InterpolationStartTokenTest.php b/tests/Phug/Lexer/Token/InterpolationStartTokenTest.php
@@ -23,4 +23,14 @@ public function testEnd()
         $start->setEnd($end);
         self::assertSame($end, $start->getEnd());
     }
+
+    /**
+     * @covers ::__toString
+     */
+    public function testStringification()
+    {
+        $start = new InterpolationStartToken();
+
+        self::assertSame('['.InterpolationStartToken::class.']', "$start");
+    }
 }