Skip inline docblocks like {@see ...}

vimeo · Nov 3, 2023 · 70a83c8 · 70a83c8
1 parent e76db14
commit 70a83c8
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 3 deletions.
diff --git a/src/Psalm/Internal/Type/ParseTreeCreator.php b/src/Psalm/Internal/Type/ParseTreeCreator.php
@@ -31,6 +31,7 @@
 use function in_array;
 use function preg_match;
 use function strlen;
+use function strpos;
 use function strtolower;
 
 /**
@@ -825,13 +826,30 @@ private function handleValue(array $type_token): void
                 break;
 
             case '{':
+                ++$this->t;
+
+                $nexter_token = $this->t + 1 < $this->type_token_count ? $this->type_tokens[$this->t + 1] : null;
+
+                if ($nexter_token && strpos($nexter_token[0], '@') !== false) {
+                    $this->t = $this->type_token_count;
+                    if ($type_token[0] === '$this') {
+                        $type_token[0] = 'static';
+                    }
+
+                    $new_leaf = new Value(
+                        $type_token[0],
+                        $type_token[1],
+                        $type_token[1] + strlen($type_token[0]),
+                        $type_token[2] ?? null,
+                        $new_parent,
+                    );
+                    break;
+                }
+
                 $new_leaf = new KeyedArrayTree(
                     $type_token[0],
                     $new_parent,
                 );
-                ++$this->t;
-
-                $nexter_token = $this->t + 1 < $this->type_token_count ? $this->type_tokens[$this->t + 1] : null;
 
                 if ($nexter_token !== null && $nexter_token[0] === '}') {
                     $new_leaf->terminated = true;

diff --git a/tests/MethodSignatureTest.php b/tests/MethodSignatureTest.php
@@ -400,6 +400,15 @@ public static function foo() {
                     '$b' => 'B',
                 ],
             ],
+            'returnIgnoresInlineComments' => [
+                'code' => '<?php
+                    class A {
+                        /** @return bool {@see true}*/
+                        public static function foo():bool {
+                            return true;
+                        }
+                    }',
+            ],
             'allowSomeCovariance' => [
                 'code' => '<?php
                     interface I1 {