Fixing the document symbol provider (phpactor#2678)

Author: mamazu

lib/Extension/LanguageServerSymbolProvider/Adapter/TolerantDocumentSymbolProvider.php

@@ -11,6 +11,8 @@
 use Microsoft\PhpParser\Node\DelimitedList\ExpressionList;
 use Microsoft\PhpParser\Node\EnumCaseDeclaration;
 use Microsoft\PhpParser\Node\EnumMembers;
+use Microsoft\PhpParser\Node\Expression;
+use Microsoft\PhpParser\Node\Expression\AssignmentExpression;
 use Microsoft\PhpParser\Node\Expression\Variable;
 use Microsoft\PhpParser\Node\InterfaceMembers;
 use Microsoft\PhpParser\Node\MethodDeclaration;
@@ -141,21 +143,13 @@ private function buildNode(Node $node, string $source): ?DocumentSymbol
         }
 
         if ($node instanceof Variable) {
-            if ($node->getFirstAncestor(PropertyDeclaration::class)) {
-                return new DocumentSymbol(
-                    (string)$node->getName(),
-                    SymbolKind::PROPERTY,
-                    new Range(
-                        PositionConverter::intByteOffsetToPosition($node->parent->getStartPosition(), $source),
-                        PositionConverter::intByteOffsetToPosition($node->parent->getEndPosition(), $source)
-                    ),
-                    new Range(
-                        PositionConverter::intByteOffsetToPosition($node->getStartPosition(), $source),
-                        PositionConverter::intByteOffsetToPosition($node->getEndPosition(), $source)
-                    ),
-                    children: []
-                );
-            }
+            return $this->resolvePropertyVariable($node, $source);
+        }
+
+        if ($node instanceof AssignmentExpression) {
+            /** @var Expression $left */
+            $left = $node->leftOperand;
+            return $this->resolvePropertyVariable($left, $source);
         }
 
         if ($node instanceof ConstElement) {
@@ -209,6 +203,30 @@ private function buildNode(Node $node, string $source): ?DocumentSymbol
         return null;
     }
 
+
+    private function resolvePropertyVariable(Node $node, string $source): ?DocumentSymbol
+    {
+        if (!$node instanceof Variable) {
+            return null;
+        }
+        if (!$node->getFirstAncestor(PropertyDeclaration::class)) {
+            return null;
+        }
+        return new DocumentSymbol(
+            (string)$node->getName(),
+            SymbolKind::PROPERTY,
+            new Range(
+                PositionConverter::intByteOffsetToPosition($node->parent->getStartPosition(), $source),
+                PositionConverter::intByteOffsetToPosition($node->parent->getEndPosition(), $source)
+            ),
+            new Range(
+                PositionConverter::intByteOffsetToPosition($node->getStartPosition(), $source),
+                PositionConverter::intByteOffsetToPosition($node->getEndPosition(), $source)
+            ),
+            children: []
+        );
+    }
+
     private function memberNodes(Node $node): Generator
     {
         return $node->getDescendantNodes(function (Node $node) {

lib/Extension/LanguageServerSymbolProvider/Tests/Unit/Adapter/TolerantDocumentSymbolProviderTest.php

@@ -116,6 +116,27 @@ public function provideClasses(): Generator
             ]
         ];
 
+        yield 'class property with value' => [
+            '<?php class Foo { private $bar = "Hallo"; }',
+            [
+                DocumentSymbol::fromArray([
+                    'name' => 'Foo',
+                    'kind' => SymbolKind::CLASS_,
+                    'range' => $this->dummyRange(),
+                    'selectionRange' => $this->dummyRange(),
+                    'children' => [
+                        DocumentSymbol::fromArray([
+                            'name' => 'bar',
+                            'kind' => SymbolKind::PROPERTY,
+                            'range' => $this->dummyRange(),
+                            'selectionRange' => $this->dummyRange(),
+                            'children' => [],
+                        ]),
+                    ]
+                ])
+            ]
+        ];
+
         yield 'class property' => [
             '<?php class Foo { private $bar; }',
             [