Fix #1696 - decrease memory usage by keeping parser

vimeo · May 27, 2019 · c5e682d · c5e682d
1 parent 4302596
commit c5e682d
Showing 1 changed file with 15 additions and 4 deletions.
diff --git a/src/Psalm/Internal/Provider/StatementsProvider.php b/src/Psalm/Internal/Provider/StatementsProvider.php
@@ -53,6 +53,11 @@ class StatementsProvider
      */
     private static $lexer;
 
+    /**
+     * @var PhpParser\Parser|null
+     */
+    private static $parser;
+
     public function __construct(
         FileProvider $file_provider,
         ParserCacheProvider $parser_cache_provider = null,
@@ -352,7 +357,13 @@ public static function parseStatements(
             self::$lexer = new PhpParser\Lexer([ 'usedAttributes' => $attributes ]);
         }
 
-        $parser = (new PhpParser\ParserFactory())->create(PhpParser\ParserFactory::PREFER_PHP7, self::$lexer);
+        if (!self::$parser) {
+            $attributes = [
+                'comments', 'startLine', 'startFilePos', 'endFilePos',
+            ];
+
+            self::$parser = (new PhpParser\ParserFactory())->create(PhpParser\ParserFactory::PREFER_PHP7, self::$lexer);
+        }
 
         $used_cached_statements = false;
 
@@ -361,7 +372,7 @@ public static function parseStatements(
         if ($existing_statements && $file_changes && $existing_file_contents) {
             $clashing_traverser = new \Psalm\Internal\Traverser\CustomTraverser;
             $offset_analyzer = new \Psalm\Internal\Visitor\PartialParserVisitor(
-                $parser,
+                self::$parser,
                 $error_handler,
                 $file_changes,
                 $existing_file_contents,
@@ -376,7 +387,7 @@ public static function parseStatements(
             } else {
                 try {
                     /** @var array<int, \PhpParser\Node\Stmt> */
-                    $stmts = $parser->parse($file_contents, $error_handler) ?: [];
+                    $stmts = self::$parser->parse($file_contents, $error_handler) ?: [];
                 } catch (\Throwable $t) {
                     $stmts = [];
 
@@ -386,7 +397,7 @@ public static function parseStatements(
         } else {
             try {
                 /** @var array<int, \PhpParser\Node\Stmt> */
-                $stmts = $parser->parse($file_contents, $error_handler) ?: [];
+                $stmts = self::$parser->parse($file_contents, $error_handler) ?: [];
             } catch (\Throwable $t) {
                 $stmts = [];