zobo · zobo · Feb 20, 2023
diff --git a/src/DefinitionResolver.php b/src/DefinitionResolver.php
@@ -6,6 +6,7 @@
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Factory\SymbolInformationFactory;
 use LanguageServerProtocol\SymbolInformation;
+use LanguageServerProtocol\SymbolKind;
 use Microsoft\PhpParser;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\FunctionLike;
@@ -58,10 +59,45 @@ public function __construct(ReadableIndex $index)
      * Builds the declaration line for a given node. Declarations with multiple lines are trimmed.
      *
      * @param Node $node
+     * @param SymbolInformation|null $symbolInformation
+     * @param Type|null $type
      * @return string
      */
-    public function getDeclarationLineFromNode($node): string
+    public function getDeclarationLineFromNode($node, $symbolInformation, $type): string
     {
+        if ($symbolInformation !== null) {
+            if ($symbolInformation->kind === SymbolKind::VARIABLE) {
+                $defLine = 'var ';
+                if ($type !== null) {
+                    $defLine .= (string)$type . ' ';
+                }
+                $defLine .= '$' . $symbolInformation->name;
+                return $defLine;
+            } elseif ($symbolInformation->kind === SymbolKind::CONSTANT) {
+                $defLine = 'const ';
+                if ($type !== null) {
+                    $defLine .= (string)$type . ' ';
+                }
+                $defLine .= $symbolInformation->name;
+                return $defLine;
+            } elseif ($symbolInformation->kind === SymbolKind::INTERFACE) {
+                $defLine = 'interface ';
+                $defLine .= $symbolInformation->name;
+
+                $namespaceNode = $node->getNamespaceDefinition();
+                if ($namespaceNode !== null) {
+                    $defLine = $namespaceNode->getText() . "\n\n" . $defLine;
+                }
+                return $defLine;
+            } elseif ($symbolInformation->kind === SymbolKind::PROPERTY) {
+                $defLine = 'property ';
+                if ($type !== null) {
+                    $defLine .= (string)$type . ' ';
+                }
+                $defLine .= '$' . $symbolInformation->name;
+                return $defLine;
+            }
+        }
         // If node is part of a declaration list, build a declaration line that discludes other elements in the list
         //  - [PropertyDeclaration] // public $a, [$b = 3], $c; => public $b = 3;
         //  - [ConstDeclaration|ClassConstDeclaration] // "const A = 3, [B = 4];" => "const B = 4;"
@@ -86,6 +122,22 @@ public function getDeclarationLineFromNode($node): string
             // cut at body start and replace all newlines
             $defLine = \str_replace(["\n", "\r"], " ", \strtok($defLine, "{"));
             $defLine = \preg_replace('!\s+!', " ", \trim($defLine));
+
+            if ($node instanceof Node\MethodDeclaration) {
+                $classNode = $node->getFirstAncestor(Node\Statement\ClassDeclaration::class, Node\Statement\InterfaceDeclaration::class, Node\Statement\TraitDeclaration::class);
+                if ($classNode !== null) {
+                    $fqn = (string)$classNode->getNamespacedName();
+                    if ($fqn) {
+                        $defLine = str_replace('function ', 'function ' . $fqn . '::', $defLine);
+                    }
+                }
+            }
+        } elseif ($node instanceof Node\Statement\ClassDeclaration) {
+            $defLine = \rtrim(\strtok($defLine, "\n"), "\r");
+            $namespaceNode = $node->getNamespaceDefinition();
+            if ($namespaceNode !== null) {
+                $defLine = $namespaceNode->getText() . "\n\n" . $defLine;
+            }
         } else {
             // Trim string to only include first line
             $defLine = \rtrim(\strtok($defLine, "\n"), "\r");
@@ -250,11 +302,13 @@ public function createDefinitionFromNode(Node $node, string $fqn = null): Defini
             }
         }
 
+        // TODO add also @method doc entries
+
         $def->symbolInformation = SymbolInformationFactory::fromNode($node, $fqn);
 
         if ($def->symbolInformation !== null) {
             $def->type = $this->getTypeFromNode($node);
-            $def->declarationLine = $this->getDeclarationLineFromNode($node);
+            $def->declarationLine = $this->getDeclarationLineFromNode($node, $def->symbolInformation, $def->type);
             $def->documentation = $this->getDocumentationFromNode($node);
         }
 
@@ -719,6 +773,15 @@ private static function isVariableDeclaration(Node $n, string $name)
             return true;
         }
 
+        if (
+            $n instanceof Node\Expression\Variable &&
+            $n->getName() === $name &&
+            $n->parent != null && $n->parent->parent != null &&
+            $n->parent->parent->parent instanceof Node\Expression\ListIntrinsicExpression
+        ) {
+            return true;
+        }
+
         return false;
     }
 
@@ -1329,6 +1392,16 @@ public function getTypeFromNode($node)
             return new Types\Mixed_();
         }
 
+        // LIST DECLARATION
+        if (
+            $node instanceof Node\Expression\Variable &&
+            $node->parent != null && $node->parent->parent != null &&
+            $node->parent->parent->parent instanceof Node\Expression\ListIntrinsicExpression
+        ) {
+            // TODO implement actual list type from right side assignment
+            return new Types\Mixed_();
+        }
+
         // PROPERTIES, CONSTS, CLASS CONSTS, ASSIGNMENT EXPRESSIONS
         // Get the documented type the assignment resolves to.
         if (

diff --git a/src/Factory/SymbolInformationFactory.php b/src/Factory/SymbolInformationFactory.php
@@ -60,6 +60,7 @@ public static function fromNode($node, string $fqn = null)
             )
             || $node instanceof Node\UseVariableName
             || $node instanceof Node\Parameter
+            || $node->parent->parent->parent instanceof Node\Expression\ListIntrinsicExpression
         ) {
             $symbol->kind = SymbolKind::VARIABLE;
         } else {

diff --git a/src/Server/TextDocument.php b/src/Server/TextDocument.php
@@ -14,12 +14,14 @@
     Hover,
     Location,
     MarkedString,
+    MarkupContent,
     Position,
     Range,
     ReferenceContext,
     SymbolDescriptor,
     PackageDescriptor,
     SymbolLocationInformation,
+    SymbolKind,
     TextDocumentIdentifier,
     TextDocumentItem,
     VersionedTextDocumentIdentifier,
@@ -348,6 +350,15 @@ public function hover(TextDocumentIdentifier $textDocument, Position $position):
             if ($def->documentation) {
                 $contents[] = $def->documentation;
             }
+            if ($def->signatureInformation && $def->signatureInformation->parameters) {
+                $contents[] = new MarkedString('markdown', implode("\n", array_map(function (\LanguageServerProtocol\ParameterInformation $p) {
+                    return "@param {$p->label}" . ($p->documentation ? " {$p->documentation}" : '');
+                }, $def->signatureInformation->parameters)));
+            }
+            $type_kind = $def->symbolInformation !== null && in_array($def->symbolInformation->kind, [SymbolKind::METHOD, SymbolKind::FUNCTION]) ? "@return" : "@type";
+            if ($def->type) {
+                $contents[] = new MarkedString('markdown', $type_kind . " " . (string)$def->type);
+            }
             return new Hover($contents, $range);
         });
     }

diff --git a/tests/Validation/cases/WithReturnTypehints.php.expected.json b/tests/Validation/cases/WithReturnTypehints.php.expected.json
@@ -52,7 +52,7 @@
                 "containerName": "Fixtures\\Prophecy"
             },
             "type": null,
-            "declarationLine": "class WithReturnTypehints extends EmptyClass",
+            "declarationLine": "namespace Fixtures\\Prophecy;\n\nclass WithReturnTypehints extends EmptyClass",
             "documentation": null,
             "signatureInformation": null
         },
@@ -73,7 +73,7 @@
             },
             "type__tostring": "\\Fixtures\\Prophecy\\WithReturnTypehints",
             "type": {},
-            "declarationLine": "public function getSelf(): self",
+            "declarationLine": "public function Fixtures\\Prophecy\\WithReturnTypehints::getSelf(): self",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",
@@ -97,7 +97,7 @@
             },
             "type__tostring": "string",
             "type": {},
-            "declarationLine": "public function getName(): string",
+            "declarationLine": "public function Fixtures\\Prophecy\\WithReturnTypehints::getName(): string",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",
@@ -121,7 +121,7 @@
             },
             "type__tostring": "\\Fixtures\\Prophecy\\EmptyClass",
             "type": {},
-            "declarationLine": "public function getParent(): parent",
+            "declarationLine": "public function Fixtures\\Prophecy\\WithReturnTypehints::getParent(): parent",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",
@@ -145,7 +145,7 @@
             },
             "type__tostring": "static",
             "type": {},
-            "declarationLine": "public function getStatic(): static",
+            "declarationLine": "public function Fixtures\\Prophecy\\WithReturnTypehints::getStatic(): static",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",

diff --git a/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json b/tests/Validation/cases/arrayValueShouldBeBoolean.php.expected.json
@@ -38,7 +38,7 @@
             },
             "type__tostring": "array<string,bool>",
             "type": {},
-            "declarationLine": "protected $foo;",
+            "declarationLine": "property array<string,bool> $foo",
             "documentation": null,
             "signatureInformation": null
         }

diff --git a/tests/Validation/cases/classDefinition1.php.expected.json b/tests/Validation/cases/classDefinition1.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "TestNamespace"
             },
             "type": null,
-            "declarationLine": "class A {",
+            "declarationLine": "namespace TestNamespace;\n\nclass A {",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "int",
             "type": {},
-            "declarationLine": "public $a;",
+            "declarationLine": "property int $a",
             "documentation": null,
             "signatureInformation": null
         }

diff --git a/tests/Validation/cases/classProperty1.php.expected.json b/tests/Validation/cases/classProperty1.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "TestNamespace"
             },
             "type": null,
-            "declarationLine": "class TestClass",
+            "declarationLine": "namespace TestNamespace;\n\nclass TestClass",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public $testProperty;",
+            "declarationLine": "property mixed $testProperty",
             "documentation": null,
             "signatureInformation": null
         },
@@ -86,7 +86,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public function testMethod($testParameter)",
+            "declarationLine": "public function TestNamespace\\TestClass::testMethod($testParameter)",
             "documentation": null,
             "signatureInformation": {
                 "label": "(mixed $testParameter)",

diff --git a/tests/Validation/cases/constants.php.expected.json b/tests/Validation/cases/constants.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "MyNamespace"
             },
             "type": null,
-            "declarationLine": "class A",
+            "declarationLine": "namespace MyNamespace;\n\nclass A",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public static function suite()",
+            "declarationLine": "public static function MyNamespace\\A::suite()",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",

diff --git a/tests/Validation/cases/constants2.php.expected.json b/tests/Validation/cases/constants2.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "MyNamespace"
             },
             "type": null,
-            "declarationLine": "class A",
+            "declarationLine": "namespace MyNamespace;\n\nclass A",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public static function suite()",
+            "declarationLine": "public static function MyNamespace\\A::suite()",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",

diff --git a/tests/Validation/cases/constants3.php.expected.json b/tests/Validation/cases/constants3.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "MyNamespace"
             },
             "type": null,
-            "declarationLine": "class A",
+            "declarationLine": "namespace MyNamespace;\n\nclass A",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public static function suite()",
+            "declarationLine": "public static function MyNamespace\\A::suite()",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",

diff --git a/tests/Validation/cases/constants4.php.expected.json b/tests/Validation/cases/constants4.php.expected.json
@@ -44,7 +44,7 @@
                 "containerName": "MyNamespace"
             },
             "type": null,
-            "declarationLine": "class A",
+            "declarationLine": "namespace MyNamespace;\n\nclass A",
             "documentation": null,
             "signatureInformation": null
         },
@@ -65,7 +65,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "public function suite()",
+            "declarationLine": "public function MyNamespace\\A::suite()",
             "documentation": null,
             "signatureInformation": {
                 "label": "()",

diff --git a/tests/Validation/cases/constants5.php.expected.json b/tests/Validation/cases/constants5.php.expected.json
@@ -41,7 +41,7 @@
                 "containerName": "MyNamespace"
             },
             "type": null,
-            "declarationLine": "class Mbstring",
+            "declarationLine": "namespace MyNamespace;\n\nclass Mbstring",
             "documentation": null,
             "signatureInformation": null
         },
@@ -62,7 +62,7 @@
             },
             "type__tostring": "\\MyNamespace\\PHP_INT_MAX",
             "type": {},
-            "declarationLine": "const MB_CASE_FOLD = PHP_INT_MAX;",
+            "declarationLine": "const \\MyNamespace\\PHP_INT_MAX MB_CASE_FOLD",
             "documentation": null,
             "signatureInformation": null
         }

diff --git a/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json b/tests/Validation/cases/constantsInFunctionParamDefault.php.expected.json
@@ -21,7 +21,7 @@
                 "containerName": ""
             },
             "type": null,
-            "declarationLine": "interface A {",
+            "declarationLine": "interface A",
             "documentation": null,
             "signatureInformation": null
         },
@@ -42,7 +42,7 @@
             },
             "type__tostring": "mixed",
             "type": {},
-            "declarationLine": "function b ($a = MY_CONSTANT);",
+            "declarationLine": "function A::b ($a = MY_CONSTANT);",
             "documentation": null,
             "signatureInformation": {
                 "label": "(\\MY_CONSTANT $a = MY_CONSTANT)",

diff --git a/tests/Validation/cases/interfaceProperty.php.expected.json b/tests/Validation/cases/interfaceProperty.php.expected.json
@@ -17,7 +17,7 @@
                 "containerName": ""
             },
             "type": null,
-            "declarationLine": "interface A  {",
+            "declarationLine": "interface A",
             "documentation": null,
             "signatureInformation": null
         }

diff --git a/tests/Validation/cases/magicConsts.php.expected.json b/tests/Validation/cases/magicConsts.php.expected.json
@@ -42,7 +42,7 @@
             },
             "type__tostring": "array<\\__CLASS__,bool>",
             "type": {},
-            "declarationLine": "private static $deprecationsTriggered;",
+            "declarationLine": "property array<\\__CLASS__,bool> $deprecationsTriggered",
             "documentation": null,
             "signatureInformation": null
         }