extract the logic into a trait

I want to extract the logic in order to reuse it in
DoctrineAnnotationCompletor
Inheritance is not suited in this case, the only remaining options I can
think of are:
* Using a static method in an helper class
* Injecting a new dependency

I don't think injecting a dependency is a good solution here since I
can't think of a different implementation I might want to inject.
The helper class with a static method is a possibility but I think trait
are also meant for scenarios like this one.

So I kept the trait to open a new debate :)

Author: camilledejoye

lib/Bridge/TolerantParser/ChainTolerantCompletor.php

@@ -5,15 +5,15 @@
 use Generator;
 use Microsoft\PhpParser\Node;
 use Microsoft\PhpParser\Parser;
-use Microsoft\PhpParser\ResolvedName;
 use Phpactor\Completion\Core\Completor;
-use Phpactor\Completion\Core\Suggestion;
 use Phpactor\Completion\Core\Util\OffsetHelper;
 use Phpactor\TextDocument\ByteOffset;
 use Phpactor\TextDocument\TextDocument;
 
 class ChainTolerantCompletor implements Completor
 {
+    use ResolveAliasSuggestionsTrait;
+
     /**
      * @var Parser
      */
@@ -55,11 +55,13 @@ public function complete(TextDocument $source, ByteOffset $byteOffset): Generato
                 continue;
             }
 
+            $importTable = $this->getClassImportTablesForNode($completionNode);
             $suggestions = $tolerantCompletor->complete($completionNode, $source, $byteOffset);
+
             foreach ($suggestions as $suggestion) {
                 // Trick to avoid any BC break when converting to an array
                 // https://www.php.net/manual/fr/language.generators.syntax.php#control-structures.yield.from
-                foreach ($this->resolveAliasSuggestions($completionNode, $suggestion) as $resolvedSuggestion) {
+                foreach ($this->resolveAliasSuggestions($importTable, $suggestion) as $resolvedSuggestion) {
                     yield $resolvedSuggestion;
                 }
             }
@@ -97,39 +99,4 @@ private function filterNonQualifyingClasses(Node $node): array
             return $completor->qualifier()->couldComplete($node);
         });
     }
-
-    /**
-     * Add suggestions when a class is already imported with an alias or when a relative name is abailable.
-     *
-     * Will update the suggestion to remove the import_name option if already imported.
-     * Will add a suggestion if the class is imported under an alias.
-     * Will add a suggestion if part of the namespace is imported (i.e. ORM\Column is a relative name).
-     *
-     * @return Suggestion[]
-     */
-    private function resolveAliasSuggestions(Node $completionNode, Suggestion $suggestion): array
-    {
-        if (Suggestion::TYPE_CLASS !== $suggestion->type()) {
-            return [$suggestion];
-        }
-
-        /** @var ResolvedName[] $importTable */
-        [$importTable] = $completionNode->getImportTablesForCurrentScope();
-
-        $suggestionFqcn = $suggestion->classImport();
-        $suggestions = [$suggestion->name() => $suggestion];
-        foreach ($importTable as $alias => $resolvedName) {
-            $importFqcn = $resolvedName->getFullyQualifiedNameText();
-
-            if (0 !== strpos($suggestionFqcn, $importFqcn)) {
-                continue;
-            }
-
-            $name = $alias.substr($suggestionFqcn, strlen($importFqcn));
-
-            $suggestions[$alias] = $suggestion->withoutNameImport()->withName($name);
-        }
-
-        return array_values($suggestions);
-    }
 }

lib/Bridge/TolerantParser/ResolveAliasSuggestionsTrait.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Phpactor\Completion\Bridge\TolerantParser;
+
+use Microsoft\PhpParser\Node;
+use Microsoft\PhpParser\ResolvedName;
+use Phpactor\Completion\Core\Suggestion;
+
+trait ResolveAliasSuggestionsTrait
+{
+    /**
+     * Add suggestions when a class is already imported with an alias or when a relative name is abailable.
+     *
+     * Will update the suggestion to remove the import_name option if already imported.
+     * Will add a suggestion if the class is imported under an alias.
+     * Will add a suggestion if part of the namespace is imported (i.e. ORM\Column is a relative name).
+     *
+     * @param ResolvedName[] $importTable
+     *
+     * @return Suggestion[]
+     */
+    private function resolveAliasSuggestions(array $importTable, Suggestion $suggestion): array
+    {
+        if (Suggestion::TYPE_CLASS !== $suggestion->type()) {
+            return [$suggestion];
+        }
+
+        $suggestionFqcn = $suggestion->classImport();
+        $suggestions = [$suggestion->name() => $suggestion];
+        foreach ($importTable as $alias => $resolvedName) {
+            $importFqcn = $resolvedName->getFullyQualifiedNameText();
+
+            if (0 !== strpos($suggestionFqcn, $importFqcn)) {
+                continue;
+            }
+
+            $name = $alias.substr($suggestionFqcn, strlen($importFqcn));
+
+            $suggestions[$alias] = $suggestion->withoutNameImport()->withName($name);
+        }
+
+        return array_values($suggestions);
+    }
+
+    /**
+     * @return ResolvedName[]
+     */
+    private function getClassImportTablesForNode(Node $node): array
+    {
+        try {
+            [$importTable] = $node->getImportTablesForCurrentScope();
+        } catch (\Exception $e) {
+            $importTable = [];
+        }
+
+        return $importTable;
+    }
+}