Merge pull request #6 from php-school/various-fixes

Various Improvements

Author: AydinHassan

src/Factory.php

@@ -17,11 +17,17 @@ class Factory
      */
     public function __invoke()
     {
+        $lexer = new Lexer([
+            'usedAttributes' => [
+                'comments', 'startLine', 'endLine', 'startFilePos', 'endFilePos', 'startTokenPos', 'endTokenPos'
+            ]
+        ]);
+        
         $parserFactory = new ParserFactory;
         $color = new Color;
         $color->setForceStyle(true);
         return new SyntaxHighlighter(
-            $parserFactory->create(ParserFactory::PREFER_PHP7),
+            $parserFactory->create(ParserFactory::PREFER_PHP7, $lexer),
             new SyntaxHighlightPrinter(
                 new SyntaxHighlighterConfig,
                 new ColorsAdapter($color)

src/Lexer.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace PhpSchool\PSX;
+
+use PhpParser\Lexer\Emulative;
+use PhpParser\Parser\Tokens;
+
+/**
+ * Class Lexer
+ * @package PhpSchool\PSX
+ * @author Aydin Hassan <[email protected]>
+ */
+class Lexer extends Emulative
+{
+    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null)
+    {
+        $tokenId = parent::getNextToken($value, $startAttributes, $endAttributes);
+
+        if ($tokenId == Tokens::T_ARRAY) {
+            $startAttributes['traditionalArray'] = true;
+        }
+
+        if ($tokenId == Tokens::T_EXIT) {
+            $startAttributes['isDie'] = strtolower($value) === 'die';
+        }
+        
+        return $tokenId;
+    }
+}

src/SyntaxHighlightPrinter.php

@@ -53,7 +53,8 @@ public function __construct(
      *
      * @return string Pretty printed statements
      */
-    public function prettyPrintFile(array $stmts) {
+    public function prettyPrintFile(array $stmts)
+    {
         $p = rtrim($this->prettyPrint($stmts));
         $p = preg_replace('/^\?>\n?/', '', $p, -1, $count);
         $p = preg_replace('/<\?php$/', '', $p);
@@ -492,6 +493,57 @@ public function pExpr_New(Expr\New_ $node)
         );
     }
 
+    /**
+     * @param Expr\Array_ $node
+     * @return string
+     */
+    public function pExpr_Array(Expr\Array_ $node)
+    {
+        if ($this->options['shortArraySyntax'] || !$node->hasAttribute('traditionalArray')) {
+            return '[' . $this->pArrayList($node, $node->items) . ']';
+        } else {
+            return 'array(' . $this->pArrayList($node, $node->items) . ')';
+        }
+    }
+
+    /**
+     * @param Expr\Array_ $parent
+     * @param array $nodes
+     * @return string
+     */
+    public function pArrayList(Expr\Array_ $parent, array $nodes)
+    {
+        $lineNumbers = [$parent->getAttribute('startLine', null)];
+        foreach ($nodes as $node) {
+            $lineNumbers[] = $node->getAttribute('startLine', null);
+        }
+        
+        //all the same line
+        if (count(array_unique($lineNumbers)) == 1) {
+            return $this->pCommaSeparated($nodes);
+        }
+        
+        $output = "\n";
+        foreach ($nodes as $key => $node) {
+            $output .= sprintf("    %s,\n", $this->p($node));
+        }
+        return $output;
+    }
+
+    /**
+     * @param Expr\Exit_ $node
+     * @return string
+     */
+    public function pExpr_Exit(Expr\Exit_ $node)
+    {
+        $construct = 'exit';
+        if ($node->getAttribute('isDie', false)) {
+            $construct = 'die';
+        }
+        
+        return $construct . (null !== $node->expr ? '(' . $this->p($node->expr) . ')' : '');
+    }
+
     /**
      * @param string $string
      * @param string $type