Merge pull request #12 from php-school/fix-new-line-printing

Fix newlines being interpolated

Author: AydinHassan

src/Lexer.php

@@ -23,6 +23,10 @@ public function getNextToken(&$value = null, &$startAttributes = null, &$endAttr
         if ($tokenId == Tokens::T_EXIT) {
             $startAttributes['isDie'] = strtolower($value) === 'die';
         }
+
+        if ($tokenId == Tokens::T_CONSTANT_ENCAPSED_STRING) {
+            $endAttributes['originalValue'] = $value;
+        }
 
         return $tokenId;
     }

src/SyntaxHighlightPrinter.php

@@ -81,7 +81,11 @@ public function pStmt_Echo(Stmt\Echo_ $node)
      */
     public function pScalar_String(Scalar\String_ $node)
     {
-        $string = '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\'';
+        if ($node->hasAttribute('originalValue')) {
+            $string = $node->getAttribute('originalValue');
+        } else {
+            $string = '\'' . $this->pNoIndent(addcslashes($node->value, '\'\\')) . '\'';
+        }
         return $this->color($string, SyntaxHighlighterConfig::TYPE_STRING);
     }
 

test/LexerTest.php

@@ -140,7 +140,7 @@ public function provideTestLex()
                 array(
                     array(
                         Tokens::T_CONSTANT_ENCAPSED_STRING, '"foo' . "\n" . 'bar"',
-                        array('startLine' => 1), array('endLine' => 2)
+                        array('startLine' => 1), array('endLine' => 2, 'originalValue' => "\"foo\nbar\"")
                     ),
                 )
             ),
@@ -151,15 +151,15 @@ public function provideTestLex()
                 array(
                     array(
                         Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"',
-                        array('startFilePos' => 6), array('endFilePos' => 8)
+                        array('startFilePos' => 6), array('endFilePos' => 8, 'originalValue' => '"a"')
                     ),
                     array(
                         ord(';'), ';',
                         array('startFilePos' => 9), array('endFilePos' => 9)
                     ),
                     array(
                         Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"',
-                        array('startFilePos' => 18), array('endFilePos' => 20)
+                        array('startFilePos' => 18), array('endFilePos' => 20, 'originalValue' => '"b"')
                     ),
                     array(
                         ord(';'), ';',
@@ -174,15 +174,15 @@ public function provideTestLex()
                 array(
                     array(
                         Tokens::T_CONSTANT_ENCAPSED_STRING, '"a"',
-                        array('startTokenPos' => 1), array('endTokenPos' => 1)
+                        array('startTokenPos' => 1), array('endTokenPos' => 1, 'originalValue' => '"a"')
                     ),
                     array(
                         ord(';'), ';',
                         array('startTokenPos' => 2), array('endTokenPos' => 2)
                     ),
                     array(
                         Tokens::T_CONSTANT_ENCAPSED_STRING, '"b"',
-                        array('startTokenPos' => 5), array('endTokenPos' => 5)
+                        array('startTokenPos' => 5), array('endTokenPos' => 5, 'originalValue' => '"b"')
                     ),
                     array(
                         ord(';'), ';',

test/SyntaxHighlighterTest.php

@@ -43,7 +43,7 @@ public function testSyntaxHighlighter()
     {
         $code = '<?php echo "hello world!";';
         $highlighter = $this->getHighlighter();
-        $expected = "[36m<?php[0m\n\n[33mecho[0m [32m'hello world!'[0m;";
+        $expected = "[36m<?php[0m\n\n[33mecho[0m [32m\"hello world!\"[0m;";
         $this->assertEquals($expected, $highlighter->highlight($code));
     }
 

test/code/literals.test

@@ -120,12 +120,11 @@ INF;
 'a';
 'a
 b';
-'a';
-'a
-b';
+"a";
+"a\nb";
 'a\'b';
-'a\'b';
-'a\\b';
+"a'b";
+"a\b";
 'a\\nb$a
 {$b}';
 // strings (normalized to double quoted)
@@ -146,10 +145,9 @@ b';
 // make sure indentation doesn't mess anything up
 function foo()
 {
-    'a
-b';
-    'a
-b';
+    "a\nb";
     'a
     b';
-}
+    'a
+        b';
+}