feat(phpstan): support nested array types

This only adds support for "list" array types, though. We can add support for more variations as requests come in. Ref: pulsar-edit/pulsar#876 (comment)
claytonrcarter · Jan 20, 2024 · 24feb93 · 24feb93
1 parent 915a527
commit 24feb93
Show file tree

Hide file tree

Showing 5 changed files with 11,218 additions and 11,090 deletions.
diff --git a/corpus/psalm.txt b/corpus/psalm.txt
@@ -50,6 +50,24 @@ Psalm style array types
         value: (named_type (name))))
     (variable_name (name))))
 
+=====================
+PHPStan style nested array types
+=====================
+/** @var array<array<array<int>>> $foo */
+---
+(document
+  (tag
+    (tag_name)
+    (type_list
+      (array_type
+        array: (primitive_type)
+        value: (array_type
+          array: (primitive_type)
+          value: (array_type
+            array: (primitive_type)
+            value: (primitive_type)))))
+    (variable_name (name))))
+
 =====================
 Psalm scalar class-string type
 =====================

diff --git a/grammar.js b/grammar.js
@@ -602,7 +602,7 @@ module.exports = grammar({
     _psalm_list_array_types: $ => seq(
       field('array', choice(alias("list", $.primitive_type), $._regular_types)),
       "<",
-      field('value', $._regular_types),
+      field('value', $._types),
       ">"
     ),
 

diff --git a/src/grammar.json b/src/grammar.json
@@ -1839,7 +1839,7 @@
           "name": "value",
           "content": {
             "type": "SYMBOL",
-            "name": "_regular_types"
+            "name": "_types"
           }
         },
         {

diff --git a/src/node-types.json b/src/node-types.json
@@ -43,6 +43,10 @@
         "multiple": false,
         "required": false,
         "types": [
+          {
+            "type": "array_type",
+            "named": true
+          },
           {
             "type": "named_type",
             "named": true