Allow multiple spaces between type name and type definition

vimeo · Feb 15, 2024 · ae21430 · ae21430
1 parent 86224af
commit ae21430
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php b/src/Psalm/Internal/PhpVisitor/Reflector/ClassLikeNodeScanner.php
@@ -1933,7 +1933,7 @@ private static function getTypeAliasesFromCommentLines(
                 continue;
             }
 
-            if ($var_line_parts[0] === ' ') {
+            while (isset($var_line_parts[0]) && $var_line_parts[0] === ' ') {
                 array_shift($var_line_parts);
             }
 
@@ -1949,6 +1949,10 @@ private static function getTypeAliasesFromCommentLines(
                 continue;
             }
 
+            while (isset($var_line_parts[0]) && $var_line_parts[0] === ' ') {
+                array_shift($var_line_parts);
+            }
+
             $type_string = implode('', $var_line_parts);
             $type_string = ltrim($type_string, "* \n\r");
             try {

diff --git a/tests/TypeAnnotationTest.php b/tests/TypeAnnotationTest.php
@@ -916,6 +916,22 @@ public function bar(array $foo): void {}
                     }
                 PHP,
             ],
+            'typeWithMultipleSpaces' => [
+                'code' => <<<'PHP'
+                    <?php
+                    /**
+                     * @psalm-type Foo      =     string
+                     * @psalm-type Bar           int
+                     */
+                    class A {
+                        /**
+                         * @psalm-param Foo $foo
+                         * @psalm-param Bar $bar
+                         */
+                        public function bar(string $foo, int $bar): void {}
+                    }
+                PHP,
+            ],
         ];
     }