use tree representation index

Author: nicolasmure

src/CompletionProvider.php

@@ -207,7 +207,7 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi
                 foreach ($this->index->getDefinitionsForFqn($parentFqn) as $fqn => $def) {
                     // Add the object access operator to only get members of all parents
                     $prefix = $parentFqn . '->';
-                    if (substr($fqn, 0, strlen($prefix)) === $prefix && !$def->isMember) {
+                    if (substr($fqn, 0, strlen($prefix)) === $prefix && $def->isMember) {
                         $list->items[] = CompletionItem::fromDefinition($def);
                     }
                 }
@@ -237,7 +237,7 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi
                 foreach ($this->index->getDefinitionsForFqn($parentFqn) as $fqn => $def) {
                     // Append :: operator to only get static members of all parents
                     $prefix = strtolower($parentFqn . '::');
-                    if (substr(strtolower($fqn), 0, strlen($prefix)) === $prefix && !$def->isMember) {
+                    if (substr(strtolower($fqn), 0, strlen($prefix)) === $prefix && $def->isMember) {
                         $list->items[] = CompletionItem::fromDefinition($def);
                     }
                 }
@@ -301,25 +301,29 @@ public function provideCompletion(PhpDocument $doc, Position $pos): CompletionLi
                 }
             }
 
-            // Suggest global symbols that either
+            // Suggest global (ie non member) symbols that either
             //  - start with the current namespace + prefix, if the Name node is not fully qualified
             //  - start with just the prefix, if the Name node is fully qualified
-            foreach ($this->index->getGlobalDefinitions() as $fqn => $def) {
+            foreach ($this->index->getDefinitions() as $fqn => $def) {
 
                 $fqnStartsWithPrefix = substr($fqn, 0, $prefixLen) === $prefix;
 
                 if (
-                    !$prefix
-                    || (
-                        // Either not qualified, but a matching prefix with global fallback
-                        ($def->roamed && !$isQualified && $fqnStartsWithPrefix)
-                        // Or not in a namespace or a fully qualified name or AND matching the prefix
-                        || ((!$namespaceNode || $isFullyQualified) && $fqnStartsWithPrefix)
-                        // Or in a namespace, not fully qualified and matching the prefix + current namespace
+                    // Exclude methods, properties etc.
+                    !$def->isMember
+                    && (
+                        !$prefix
                         || (
-                            $namespaceNode
-                            && !$isFullyQualified
-                            && substr($fqn, 0, $namespacedPrefixLen) === $namespacedPrefix
+                            // Either not qualified, but a matching prefix with global fallback
+                            ($def->roamed && !$isQualified && $fqnStartsWithPrefix)
+                            // Or not in a namespace or a fully qualified name or AND matching the prefix
+                            || ((!$namespaceNode || $isFullyQualified) && $fqnStartsWithPrefix)
+                            // Or in a namespace, not fully qualified and matching the prefix + current namespace
+                            || (
+                                $namespaceNode
+                                && !$isFullyQualified
+                                && substr($fqn, 0, $namespacedPrefixLen) === $namespacedPrefix
+                            )
                         )
                     )
                     // Only suggest classes for `new`

src/Index/AbstractAggregateIndex.php

@@ -107,24 +107,11 @@ public function isStaticComplete(): bool
     public function getDefinitions(): \Generator
     {
         foreach ($this->getIndexes() as $index) {
-            foreach ($index->getDefinitions() as $fqn => $definitions) {
-                yield $fqn => $definition;
-            }
-        }
-    }
+            // foreach ($index->getDefinitions() as $fqn => $definition) {
+            //     yield $fqn => $definition;
+            // }
 
-    /**
-     * Returns a Generator providing an associative array [string => Definition]
-     * that maps fully qualified symbol names to global Definitions
-     *
-     * @return \Generator providing Definitions[]
-     */
-    public function getGlobalDefinitions(): \Generator
-    {
-        foreach ($this->getIndexes() as $index) {
-            foreach ($index->getGlobalDefinitions() as $fqn => $definition) {
-                yield $fqn => $definition;
-            }
+            yield from $index->getDefinitions();
         }
     }
 
@@ -137,9 +124,11 @@ public function getGlobalDefinitions(): \Generator
     public function getDefinitionsForFqn(string $fqn): \Generator
     {
         foreach ($this->getIndexes() as $index) {
-            foreach ($index->getDefinitionsForFqn($fqn) as $symbolFqn => $definition) {
-                yield $symbolFqn => $definition;
-            }
+            // foreach ($index->getDefinitionsForFqn($fqn) as $symbolFqn => $definition) {
+            //     yield $symbolFqn => $definition;
+            // }
+
+            yield from $index->getDefinitionsForFqn($fqn);
         }
     }
 
@@ -168,9 +157,11 @@ public function getDefinition(string $fqn, bool $globalFallback = false)
     public function getReferenceUris(string $fqn): \Generator
     {
         foreach ($this->getIndexes() as $index) {
-            foreach ($index->getReferenceUris($fqn) as $uri) {
-                yield $uri;
-            }
+            // foreach ($index->getReferenceUris($fqn) as $uri) {
+            //     yield $uri;
+            // }
+
+            yield from $index->getReferenceUris($fqn);
         }
     }
 }