Merge pull request microsoft#358 from TysonAndre/fix-delimiter-edge-case

Fix regression after supporting intersection types

Author: roblourens

src/Node/Expression/YieldExpression.php

@@ -14,7 +14,7 @@ class YieldExpression extends Expression {
     /** @var Token */
     public $yieldOrYieldFromKeyword;
 
-    /** @var ArrayElement */
+    /** @var ArrayElement|null */
     public $arrayElement;
 
     const CHILD_NAMES = ['yieldOrYieldFromKeyword', 'arrayElement'];

src/Parser.php

@@ -839,7 +839,7 @@ private function parseParameterFn() {
                     array_pop($parameter->typeDeclarationList->children);
                     $parameter->byRefToken = array_pop($parameter->typeDeclarationList->children);
                     if (!$parameter->typeDeclarationList->children) {
-                        unset($parameter->typeDeclarationList);
+                        $parameter->typeDeclarationList = null;
                     }
                 }
             } elseif ($parameter->questionToken) {
@@ -1546,7 +1546,7 @@ private function isParameterStartFn() {
 
     /**
      * @param string $className (name of subclass of DelimitedList)
-     * @param int $delimiter
+     * @param int|int[] $delimiter
      * @param callable $isElementStartFn
      * @param callable $parseElementFn
      * @param Node $parentNode
@@ -1560,7 +1560,7 @@ private function parseDelimitedList($className, $delimiter, $isElementStartFn, $
         do {
             if ($isElementStartFn($token)) {
                 $node->addElement($parseElementFn($node));
-            } elseif (!$allowEmptyElements || ($allowEmptyElements && !$this->checkToken($delimiter))) {
+            } elseif (!$allowEmptyElements || ($allowEmptyElements && !$this->checkAnyToken($delimiter))) {
                 break;
             }
 
@@ -1572,7 +1572,6 @@ private function parseDelimitedList($className, $delimiter, $isElementStartFn, $
             // TODO ERROR CASE - no delimiter, but a param follows
         } while ($delimiterToken !== null);
 
-
         $node->parent = $parentNode;
         if ($node->children === null) {
             return null;
@@ -1772,10 +1771,17 @@ private function lookahead(...$expectedKinds) : bool {
         return $succeeded;
     }
 
+    /** @param int $expectedKind */
     private function checkToken($expectedKind) : bool {
         return $this->getCurrentToken()->kind === $expectedKind;
     }
 
+    /** @param int|int[] $expectedKind */
+    private function checkAnyToken($expectedKind) : bool {
+        $kind = $this->getCurrentToken()->kind;
+        return \is_array($expectedKind) ? \in_array($kind, $expectedKind, true) : $kind === $expectedKind;
+    }
+
     private function parseIfStatement($parentNode) {
         $ifStatement = new IfStatementNode();
         $ifStatement->parent = $parentNode;

tests/cases/parser/propertyDeclaration7.php

@@ -0,0 +1,4 @@
+<?php
+class X {
+    public |string $var;
+}

tests/cases/parser/propertyDeclaration7.php.diag

@@ -0,0 +1 @@
+[]

tests/cases/parser/propertyDeclaration7.php.tree

@@ -0,0 +1,95 @@
+{
+    "SourceFileNode": {
+        "statementList": [
+            {
+                "InlineHtml": {
+                    "scriptSectionEndTag": null,
+                    "text": null,
+                    "scriptSectionStartTag": {
+                        "kind": "ScriptSectionStartTag",
+                        "textLength": 6
+                    }
+                }
+            },
+            {
+                "ClassDeclaration": {
+                    "attributes": null,
+                    "abstractOrFinalModifier": null,
+                    "classKeyword": {
+                        "kind": "ClassKeyword",
+                        "textLength": 5
+                    },
+                    "name": {
+                        "kind": "Name",
+                        "textLength": 1
+                    },
+                    "classBaseClause": null,
+                    "classInterfaceClause": null,
+                    "classMembers": {
+                        "ClassMembersNode": {
+                            "openBrace": {
+                                "kind": "OpenBraceToken",
+                                "textLength": 1
+                            },
+                            "classMemberDeclarations": [
+                                {
+                                    "PropertyDeclaration": {
+                                        "attributes": null,
+                                        "modifiers": [
+                                            {
+                                                "kind": "PublicKeyword",
+                                                "textLength": 6
+                                            }
+                                        ],
+                                        "questionToken": null,
+                                        "typeDeclarationList": {
+                                            "QualifiedNameList": {
+                                                "children": [
+                                                    {
+                                                        "kind": "BarToken",
+                                                        "textLength": 1
+                                                    },
+                                                    {
+                                                        "kind": "StringReservedWord",
+                                                        "textLength": 6
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "propertyElements": {
+                                            "ExpressionList": {
+                                                "children": [
+                                                    {
+                                                        "Variable": {
+                                                            "dollar": null,
+                                                            "name": {
+                                                                "kind": "VariableName",
+                                                                "textLength": 4
+                                                            }
+                                                        }
+                                                    }
+                                                ]
+                                            }
+                                        },
+                                        "semicolon": {
+                                            "kind": "SemicolonToken",
+                                            "textLength": 1
+                                        }
+                                    }
+                                }
+                            ],
+                            "closeBrace": {
+                                "kind": "CloseBraceToken",
+                                "textLength": 1
+                            }
+                        }
+                    }
+                }
+            }
+        ],
+        "endOfFileToken": {
+            "kind": "EndOfFileToken",
+            "textLength": 0
+        }
+    }
+}