@appthreat/atom-parsetools 1.0.16 → 1.1.1

package/astgen.js

@@ -262,34 +262,29 @@ const toEjsAst = (file) => {
   let arr = originalCode.split("");
   const scriptRegex = /(<script>)([\s\S]*?)(<\/script>)/gi;
   let match;
-
   while ((match = scriptRegex.exec(originalCode)) !== null) {
     const openStart = match.index;
     const openLen = match[1].length;
     arr[openStart] = "<";
     arr[openStart + 1] = "%";
-    for (let i = 2; i < openLen; i++) arr[openStart + i] = " ";
+    for (let i = 2; i < openLen; i++) {
+      arr[openStart + i] = " ";
+    }
     const closeStart = match.index + match[0].length - match[3].length;
     const closeLen = match[3].length;
     arr[closeStart] = "%";
     arr[closeStart + 1] = ">";
-    for (let i = 2; i < closeLen; i++) arr[closeStart + i] = " ";
+    for (let i = 2; i < closeLen; i++) {
+      arr[closeStart + i] = " ";
+    }
     const content = match[2];
     const contentOffset = openStart + openLen;
     const innerRegex = /(<%[=\-_#]?)([\s\S]*?)([-_#]?%>)/g;
     let innerMatch;
     while ((innerMatch = innerRegex.exec(content)) !== null) {
       const innerAbsStart = contentOffset + innerMatch.index;
-      if (innerMatch[1] === "<%" && innerMatch[3] === "-%>") {
-        for (let k = 0; k < innerMatch[0].length; k++)
-          arr[innerAbsStart + k] = " ";
-      } else {
-        for (let k = 0; k < innerMatch[1].length; k++)
-          arr[innerAbsStart + k] = " ";
-        const endDelimStart =
-          innerAbsStart + innerMatch[0].length - innerMatch[3].length;
-        for (let k = 0; k < innerMatch[3].length; k++)
-          arr[endDelimStart + k] = " ";
+      for (let k = 0; k < innerMatch[0].length; k++) {
+        arr[innerAbsStart + k] = " ";
       }
     }
   }
@@ -299,26 +294,55 @@ const toEjsAst = (file) => {
     const c = codeWithoutScriptTag[i];
     if (c === "\n" || c === "\r") out[i] = c;
   }
-
   const tagRegex = /(<%[=\-_#]?)([\s\S]*?)([-_#]?%>)/g;
   let tagMatch;
   while ((tagMatch = tagRegex.exec(codeWithoutScriptTag)) !== null) {
     const [fullMatch, openTag, content, closeTag] = tagMatch;
     if (openTag === "<%#" || content.trim().startsWith("include ")) continue;
-    const startIndex = tagMatch.index + openTag.length;
-    const endIndex = tagMatch.index + fullMatch.length - closeTag.length;
-    for (let k = startIndex; k < endIndex; k++) {
-      out[k] = codeWithoutScriptTag[k];
+    let processedContent = content.trim();
+    if (processedContent === "end") {
+      processedContent = "}";
+    } else if (processedContent === "else") {
+      processedContent = "} else {";
+    } else if (processedContent.startsWith("else if")) {
+      let sub = processedContent.substring(4).trim();
+      const controlMatch = sub.match(/^(if)\s+(?!\()(.+)$/);
+      if (controlMatch) {
+        sub = `if (${controlMatch[2]})`;
+      }
+      processedContent = `} else ${sub} {`;
+    } else {
+      const controlMatch = processedContent.match(
+        /^(if|while|for)\s+(?!\()(.+)$/
+      );
+      if (controlMatch) {
+        const keyword = controlMatch[1];
+        const condition = controlMatch[2];
+        processedContent = `${keyword} (${condition})`;
+      }
+      if (
+        /^(if|while|for|try|switch|catch)/.test(processedContent) &&
+        !processedContent.endsWith("{") &&
+        !processedContent.endsWith("}") &&
+        !processedContent.endsWith(";")
+      ) {
+        processedContent += " {";
+      }
     }
-    const trimmed = content.trim();
     const needsSemi =
-      trimmed.length > 0 &&
-      !trimmed.endsWith("{") &&
-      !trimmed.endsWith("}") &&
-      !trimmed.endsWith(";");
-
+      processedContent.length > 0 &&
+      !processedContent.endsWith("{") &&
+      !processedContent.endsWith("}") &&
+      !processedContent.endsWith(";");
     if (needsSemi) {
-      out[endIndex] = ";";
+      processedContent += ";";
+    }
+    const startIndex = tagMatch.index;
+    const maxLen = fullMatch.length;
+    for (let k = 0; k < processedContent.length; k++) {
+      if (k < maxLen) {
+        out[startIndex + k] = processedContent[k];
+      }
     }
   }
 

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@appthreat/atom-parsetools",
-  "version": "1.0.16",
+  "version": "1.1.1",
   "description": "Parsing tools that complement the @appthreat/atom project.",
   "main": "./index.js",
   "type": "module",
   "scripts": {
-    "pretty": "prettier --write *.cjs *.js --trailing-comma=none",
+    "pretty": "prettier --write *.js --trailing-comma=none",
     "lint": "eslint *.mjs *.js"
   },
   "dependencies": {
-    "@appthreat/atom-common": "^1.0.16",
+    "@appthreat/atom-common": "^1.1.0",
     "@babel/parser": "^7.28.5",
     "typescript": "^5.9.3",
-    "hermes-parser": "^0.33.0",
+    "hermes-parser": "^0.33.1",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
@@ -29,7 +29,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/AppThreat/atom.git"
+    "url": "git+https://github.com/AppThreat/atom-parsetools.git"
   },
   "keywords": [
     "atom",
@@ -42,9 +42,9 @@
   "author": "Team AppThreat <cloud@appthreat.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/AppThreat/atom/issues"
+    "url": "https://github.com/AppThreat/atom-parsetools/issues"
   },
-  "homepage": "https://github.com/AppThreat/atom#readme",
+  "homepage": "https://github.com/AppThreat/atom-parsetools#readme",
   "files": [
     "*.js",
     "plugins/",

package/plugins/autoload.php

@@ -19,4 +19,4 @@ if (PHP_VERSION_ID < 50600) {
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e::getLoader();
+return ComposerAutoloaderInit4ada460927b79cef097dac97641f1695::getLoader();

package/plugins/bin/bundler

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/gems/bundler-2.6.7/exe/bundler", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/4.0.0/gems/bundler-2.6.7/exe/bundler", __dir__

package/plugins/bin/ruby_ast_gen

@@ -11,4 +11,4 @@
 $:.unshift File.expand_path "../rubyastgen/bundle", __dir__
 
 require "bundler/setup"
-load File.expand_path "../rubyastgen/bundle/ruby/3.4.0/bundler/gems/ruby_ast_gen-e7cf7549b7ea/exe/ruby_ast_gen", __dir__
+load File.expand_path "../rubyastgen/bundle/ruby/4.0.0/bundler/gems/ruby_ast_gen-e58f82cd4b36/exe/ruby_ast_gen", __dir__

package/plugins/composer/autoload_real.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e
+class ComposerAutoloaderInit4ada460927b79cef097dac97641f1695
 {
     private static $loader;
 
@@ -22,12 +22,12 @@ class ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit4ada460927b79cef097dac97641f1695', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitd7e37b2ee70cda83d020f124a964979e', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit4ada460927b79cef097dac97641f1695', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit4ada460927b79cef097dac97641f1695::getInitializer($loader));
 
         $loader->register(true);
 

package/plugins/composer/autoload_static.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitd7e37b2ee70cda83d020f124a964979e
+class ComposerStaticInit4ada460927b79cef097dac97641f1695
 {
     public static $prefixLengthsPsr4 = array (
         'P' =>
@@ -295,9 +295,9 @@ class ComposerStaticInitd7e37b2ee70cda83d020f124a964979e
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitd7e37b2ee70cda83d020f124a964979e::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit4ada460927b79cef097dac97641f1695::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit4ada460927b79cef097dac97641f1695::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit4ada460927b79cef097dac97641f1695::$classMap;
 
         }, null, ClassLoader::class);
     }

package/plugins/composer/installed.json

@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.2",
-            "version_normalized": "5.6.2.0",
+            "version": "v5.7.0",
+            "version_normalized": "5.7.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
-                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/dca41cd15c2ac9d055ad70dbfd011130757d1f82",
+                "reference": "dca41cd15c2ac9d055ad70dbfd011130757d1f82",
                 "shasum": ""
             },
             "require": {
@@ -25,7 +25,7 @@
                 "ircmaxell/php-yacc": "^0.0.7",
                 "phpunit/phpunit": "^9.0"
             },
-            "time": "2025-10-21T19:32:17+00:00",
+            "time": "2025-12-06T11:56:16+00:00",
             "bin": [
                 "bin/php-parse"
             ],
@@ -57,7 +57,7 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.7.0"
             },
             "install-path": "../nikic/php-parser"
         }

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v2.4.7',
-        'version' => '2.4.7.0',
-        'reference' => '6480d9444422711061b2a514508ee8cf5feea3a8',
+        'pretty_version' => 'v1.1.1',
+        'version' => '1.1.1.0',
+        'reference' => 'f6576535af9e41e44bbfaf278b32edc0dfbaef01',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,18 +11,18 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v2.4.7',
-            'version' => '2.4.7.0',
-            'reference' => '6480d9444422711061b2a514508ee8cf5feea3a8',
+            'pretty_version' => 'v1.1.1',
+            'version' => '1.1.1.0',
+            'reference' => 'f6576535af9e41e44bbfaf278b32edc0dfbaef01',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
             'dev_requirement' => false,
         ),
         'nikic/php-parser' => array(
-            'pretty_version' => 'v5.6.2',
-            'version' => '5.6.2.0',
-            'reference' => '3a454ca033b9e06b63282ce19562e892747449bb',
+            'pretty_version' => 'v5.7.0',
+            'version' => '5.7.0.0',
+            'reference' => 'dca41cd15c2ac9d055ad70dbfd011130757d1f82',
             'type' => 'library',
             'install_path' => __DIR__ . '/../nikic/php-parser',
             'aliases' => array(),

package/plugins/nikic/php-parser/bin/php-parse

@@ -169,11 +169,11 @@ function parseArgs($args) {
                 $operations[] = 'var-dump';
                 break;
             case '--resolve-names':
-            case '-N';
+            case '-N':
                 $operations[] = 'resolve-names';
                 break;
             case '--with-column-info':
-            case '-c';
+            case '-c':
                 $attributes['with-column-info'] = true;
                 break;
             case '--with-positions':
@@ -185,7 +185,7 @@ function parseArgs($args) {
                 $attributes['with-recovery'] = true;
                 break;
             case '--help':
-            case '-h';
+            case '-h':
                 showHelp();
                 break;
             case '--':

package/plugins/nikic/php-parser/lib/PhpParser/NodeTraverser.php

@@ -174,9 +174,9 @@ class NodeTraverser implements NodeTraverserInterface {
     /**
      * Recursively traverse array (usually of nodes).
      *
-     * @param array $nodes Array to traverse
+     * @param Node[] $nodes Array to traverse
      *
-     * @return array Result of traversal (may be original array or changed one)
+     * @return Node[] Result of traversal (may be original array or changed one)
      */
     protected function traverseArray(array $nodes): array {
         $doNodes = [];

package/plugins/nikic/php-parser/lib/PhpParser/Parser/Php7.php

@@ -2445,7 +2445,12 @@ class Php7 extends \PhpParser\ParserAbstract
                  $self->semValue = new Expr\Instanceof_($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]));
             },
             476 => static function ($self, $stackPos) {
-                 $self->semValue = $self->semStack[$stackPos-(3-2)];
+
+          $self->semValue = $self->semStack[$stackPos-(3-2)];
+          if ($self->semValue instanceof Expr\ArrowFunction) {
+              $self->parenthesizedArrowFunctions->offsetSet($self->semValue);
+          }
+
             },
             477 => static function ($self, $stackPos) {
                  $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]));

package/plugins/nikic/php-parser/lib/PhpParser/Parser/Php8.php

@@ -2440,13 +2440,21 @@ class Php8 extends \PhpParser\ParserAbstract
                  $self->semValue = new Expr\BinaryOp\GreaterOrEqual($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]));
             },
             477 => static function ($self, $stackPos) {
-                 $self->semValue = new Expr\BinaryOp\Pipe($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]));
+
+          $self->semValue = new Expr\BinaryOp\Pipe($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]));
+          $self->checkPipeOperatorParentheses($self->semStack[$stackPos-(3-3)]);
+
             },
             478 => static function ($self, $stackPos) {
                  $self->semValue = new Expr\Instanceof_($self->semStack[$stackPos-(3-1)], $self->semStack[$stackPos-(3-3)], $self->getAttributes($self->tokenStartStack[$stackPos-(3-1)], $self->tokenEndStack[$stackPos]));
             },
             479 => static function ($self, $stackPos) {
-                 $self->semValue = $self->semStack[$stackPos-(3-2)];
+
+          $self->semValue = $self->semStack[$stackPos-(3-2)];
+          if ($self->semValue instanceof Expr\ArrowFunction) {
+              $self->parenthesizedArrowFunctions->offsetSet($self->semValue);
+          }
+
             },
             480 => static function ($self, $stackPos) {
                  $self->semValue = new Expr\Ternary($self->semStack[$stackPos-(5-1)], $self->semStack[$stackPos-(5-3)], $self->semStack[$stackPos-(5-5)], $self->getAttributes($self->tokenStartStack[$stackPos-(5-1)], $self->tokenEndStack[$stackPos]));

package/plugins/nikic/php-parser/lib/PhpParser/ParserAbstract.php

@@ -132,6 +132,11 @@ abstract class ParserAbstract implements Parser {
     /** @var \SplObjectStorage<Array_, null>|null Array nodes created during parsing, for postprocessing of empty elements. */
     protected ?\SplObjectStorage $createdArrays;
 
+    /** @var \SplObjectStorage<Expr\ArrowFunction, null>|null
+     *       Arrow functions that are wrapped in parentheses, to enforce the pipe operator parentheses requirements.
+     */
+    protected ?\SplObjectStorage $parenthesizedArrowFunctions;
+
     /** @var Token[] Tokens for the current parse */
     protected array $tokens;
     /** @var int Current position in token array */
@@ -182,6 +187,7 @@ abstract class ParserAbstract implements Parser {
     public function parse(string $code, ?ErrorHandler $errorHandler = null): ?array {
         $this->errorHandler = $errorHandler ?: new ErrorHandler\Throwing();
         $this->createdArrays = new \SplObjectStorage();
+        $this->parenthesizedArrowFunctions = new \SplObjectStorage();
 
         $this->tokens = $this->lexer->tokenize($code, $this->errorHandler);
         $result = $this->doParse();
@@ -205,6 +211,7 @@ abstract class ParserAbstract implements Parser {
         $this->semStack = [];
         $this->semValue = null;
         $this->createdArrays = null;
+        $this->parenthesizedArrowFunctions = null;
 
         if ($result !== null) {
             $traverser = new NodeTraverser(new CommentAnnotatingVisitor($this->tokens));
@@ -1237,6 +1244,13 @@ abstract class ParserAbstract implements Parser {
         }
     }
 
+    protected function checkPipeOperatorParentheses(Expr $node): void {
+        if ($node instanceof Expr\ArrowFunction && !$this->parenthesizedArrowFunctions->offsetExists($node)) {
+            $this->emitError(new Error(
+                'Arrow functions on the right hand side of |> must be parenthesized', $node->getAttributes()));
+        }
+    }
+
     /**
      * @param Property|Param $node
      */

package/plugins/nikic/php-parser/lib/PhpParser/PhpVersion.php

@@ -168,4 +168,8 @@ class PhpVersion {
     public function supportsAttributes(): bool {
         return $this->id >= 80000;
     }
+
+    public function supportsNewDereferenceWithoutParentheses(): bool {
+        return $this->id >= 80400;
+    }
 }

package/plugins/nikic/php-parser/lib/PhpParser/PrettyPrinter/Standard.php

@@ -197,6 +197,10 @@ class Standard extends PrettyPrinterAbstract {
     }
 
     protected function pScalar_Int(Scalar\Int_ $node): string {
+        if ($node->getAttribute('shouldPrintRawValue') === true) {
+            return $node->getAttribute('rawValue');
+        }
+
         if ($node->value === -\PHP_INT_MAX - 1) {
             // PHP_INT_MIN cannot be represented as a literal,
             // because the sign is not part of the literal
@@ -204,6 +208,7 @@ class Standard extends PrettyPrinterAbstract {
         }
 
         $kind = $node->getAttribute('kind', Scalar\Int_::KIND_DEC);
+
         if (Scalar\Int_::KIND_DEC === $kind) {
             return (string) $node->value;
         }
@@ -426,6 +431,10 @@ class Standard extends PrettyPrinterAbstract {
     }
 
     protected function pExpr_BinaryOp_Pipe(BinaryOp\Pipe $node, int $precedence, int $lhsPrecedence): string {
+        if ($node->right instanceof Expr\ArrowFunction) {
+            // Force parentheses around arrow functions.
+            $lhsPrecedence = $this->precedenceMap[Expr\ArrowFunction::class][0];
+        }
         return $this->pInfixOp(BinaryOp\Pipe::class, $node->left, ' |> ', $node->right, $precedence, $lhsPrecedence);
     }
 

package/plugins/nikic/php-parser/lib/PhpParser/PrettyPrinterAbstract.php

@@ -166,8 +166,9 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
      * @var array<string, array{int|string|null, string, string}>
      */
     protected array $emptyListInsertionMap;
-    /** @var array<string, array{string, int}> Map from "{$class}->{$subNode}" to [$printFn, $token]
-     *       where $printFn is the function to print the modifiers and $token is the token before which
+    /** @var array<string, array{string, int, int}>
+     *       Map from "{$class}->{$subNode}" to [$printFn, $skipToken, $findToken] where $printFn is the function to
+     *       print the modifiers, $skipToken is the token to skip at the start and $findToken is the token before which
      *       the modifiers should be reprinted. */
     protected array $modifierChangeMap;
 
@@ -677,8 +678,8 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
                     return $this->pFallback($fallbackNode, $precedence, $lhsPrecedence);
                 }
 
-                [$printFn, $findToken] = $this->modifierChangeMap[$key];
-                $skipWSPos = $this->origTokens->skipRightWhitespace($pos);
+                [$printFn, $skipToken, $findToken] = $this->modifierChangeMap[$key];
+                $skipWSPos = $this->origTokens->skipRight($pos, $skipToken);
                 $result .= $this->origTokens->getTokenCode($pos, $skipWSPos, $indentAdjustment);
                 $result .= $this->$printFn($subNode);
                 $pos = $this->origTokens->findRight($skipWSPos, $findToken);
@@ -1147,6 +1148,9 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
      * @return bool Whether parentheses are required
      */
     protected function callLhsRequiresParens(Node $node): bool {
+        if ($node instanceof Expr\New_) {
+            return !$this->phpVersion->supportsNewDereferenceWithoutParentheses();
+        }
         return !($node instanceof Node\Name
             || $node instanceof Expr\Variable
             || $node instanceof Expr\ArrayDimFetch
@@ -1178,6 +1182,9 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
      * @return bool Whether parentheses are required
      */
     protected function staticDereferenceLhsRequiresParens(Node $node): bool {
+        if ($node instanceof Expr\New_) {
+            return !$this->phpVersion->supportsNewDereferenceWithoutParentheses();
+        }
         return !($node instanceof Expr\Variable
             || $node instanceof Node\Name
             || $node instanceof Expr\ArrayDimFetch
@@ -1678,15 +1685,15 @@ abstract class PrettyPrinterAbstract implements PrettyPrinter {
         }
 
         $this->modifierChangeMap = [
-            Stmt\ClassConst::class . '->flags' => ['pModifiers', \T_CONST],
-            Stmt\ClassMethod::class . '->flags' => ['pModifiers', \T_FUNCTION],
-            Stmt\Class_::class . '->flags' => ['pModifiers', \T_CLASS],
-            Stmt\Property::class . '->flags' => ['pModifiers', \T_VARIABLE],
-            PrintableNewAnonClassNode::class . '->flags' => ['pModifiers', \T_CLASS],
-            Param::class . '->flags' => ['pModifiers', \T_VARIABLE],
-            PropertyHook::class . '->flags' => ['pModifiers', \T_STRING],
-            Expr\Closure::class . '->static' => ['pStatic', \T_FUNCTION],
-            Expr\ArrowFunction::class . '->static' => ['pStatic', \T_FN],
+            Stmt\ClassConst::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_CONST],
+            Stmt\ClassMethod::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_FUNCTION],
+            Stmt\Class_::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_CLASS],
+            Stmt\Property::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_VARIABLE],
+            PrintableNewAnonClassNode::class . '->flags' => ['pModifiers', \T_NEW, \T_CLASS],
+            Param::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_VARIABLE],
+            PropertyHook::class . '->flags' => ['pModifiers', \T_WHITESPACE, \T_STRING],
+            Expr\Closure::class . '->static' => ['pStatic', \T_WHITESPACE, \T_FUNCTION],
+            Expr\ArrowFunction::class . '->static' => ['pStatic', \T_WHITESPACE, \T_FN],
             //Stmt\TraitUseAdaptation\Alias::class . '->newModifier' => 0, // TODO
         ];
 

package/plugins/rubyastgen/Gemfile

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
 
-ruby ">=3.1.4"
-
 source "https://rubygems.org"
 
 group :frontend do
-    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.1.1'
+    gem "ruby_ast_gen", github: 'appthreat/ruby_ast_gen', ref: 'v1.2.0'
     gem "parser", "~> 3.3.10.0"
-    gem "prism", "~> 1.6"
+    gem "prism", "~> 1.7"
     gem "ostruct", "~> 0.6.3"
     gem "racc", "~> 1.8.1"
 end

package/plugins/rubyastgen/Gemfile.lock

@@ -1,9 +1,9 @@
 GIT
   remote: https://github.com/appthreat/ruby_ast_gen.git
-  revision: e7cf7549b7ea2fb91878d94efba3401fe72d5e60
-  ref: v1.1.1
+  revision: e58f82cd4b3677fe03d60061aa58f7e221716ee2
+  ref: v1.2.0
   specs:
-    ruby_ast_gen (1.1.1)
+    ruby_ast_gen (1.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -13,7 +13,7 @@ GEM
     parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    prism (1.6.0)
+    prism (1.7.0)
     racc (1.8.1)
 
 PLATFORMS
@@ -25,12 +25,9 @@ PLATFORMS
 DEPENDENCIES
   ostruct (~> 0.6.3)
   parser (~> 3.3.10.0)
-  prism (~> 1.6)
+  prism (~> 1.7)
   racc (~> 1.8.1)
   ruby_ast_gen!
 
-RUBY VERSION
-   ruby 3.4.4p34
-
 BUNDLED WITH
    2.6.7

package/plugins/rubyastgen/bundle/bundler/setup.rb

@@ -39,6 +39,6 @@ $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-linux/#{Gem.extension_api_version}/racc-1.8.1")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/racc-1.8.1/lib")
 $:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/parser-3.3.10.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-linux/#{Gem.extension_api_version}/prism-1.6.0")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-1.6.0/lib")
-$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-e7cf7549b7ea/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/extensions/x86_64-linux/#{Gem.extension_api_version}/prism-1.7.0")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/gems/prism-1.7.0/lib")
+$:.unshift File.expand_path("#{__dir__}/../#{RUBY_ENGINE}/#{Gem.ruby_api_version}/bundler/gems/ruby_ast_gen-e58f82cd4b36/lib")

package/plugins/rubyastgen/bundle/ruby/{3.4.0 → 4.0.0}/bin/bundle

@@ -15,15 +15,14 @@ if str
   str = str.b[/\A_(.*)_\z/, 1]
   if str and Gem::Version.correct?(str)
     version = str
-    ENV['BUNDLER_VERSION'] = str
+ENV['BUNDLER_VERSION'] = str
 
     ARGV.shift
   end
 end
 
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('bundler', 'bundle', version)
+if Gem.respond_to?(:activate_and_load_bin_path)
+  Gem.activate_and_load_bin_path('bundler', 'bundle', version)
 else
-gem "bundler", version
-load Gem.bin_path("bundler", "bundle", version)
+  load Gem.activate_bin_path('bundler', 'bundle', version)
 end

package/plugins/rubyastgen/bundle/ruby/{3.4.0 → 4.0.0}/bin/bundler

@@ -15,15 +15,14 @@ if str
   str = str.b[/\A_(.*)_\z/, 1]
   if str and Gem::Version.correct?(str)
     version = str
-    ENV['BUNDLER_VERSION'] = str
+ENV['BUNDLER_VERSION'] = str
 
     ARGV.shift
   end
 end
 
-if Gem.respond_to?(:activate_bin_path)
-load Gem.activate_bin_path('bundler', 'bundler', version)
+if Gem.respond_to?(:activate_and_load_bin_path)
+  Gem.activate_and_load_bin_path('bundler', 'bundler', version)
 else
-gem "bundler", version
-load Gem.bin_path("bundler", "bundler", version)
+  load Gem.activate_bin_path('bundler', 'bundler', version)
 end