Remove original DefinitionResolver, remove "Tolerant" on file names

Performance.php

@@ -7,7 +7,7 @@ use Exception;
 use LanguageServer\Index\Index;
 use LanguageServer\ParserKind;
 use LanguageServer\PhpDocument;
-use LanguageServer\TolerantDefinitionResolver;
+use LanguageServer\DefinitionResolver;
 use Microsoft\PhpParser as Tolerant;
 use phpDocumentor\Reflection\DocBlockFactory;
 use RecursiveDirectoryIterator;
@@ -57,7 +57,7 @@ foreach($frameworks as $framework) {
             $maxRecursion = [];
             $definitions = [];
 
-            $definitionResolver = new TolerantDefinitionResolver($index);
+            $definitionResolver = new DefinitionResolver($index);
             $parser = new Tolerant\Parser();
 
             try {

src/CompletionProvider.php

@@ -90,7 +90,7 @@ class CompletionProvider
     ];
 
     /**
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     private $definitionResolver;
 
@@ -105,10 +105,10 @@ class CompletionProvider
     private $index;
 
     /**
-     * @param TolerantDefinitionResolver $definitionResolver
+     * @param DefinitionResolver $definitionResolver
      * @param ReadableIndex $index
      */
-    public function __construct(TolerantDefinitionResolver $definitionResolver, ReadableIndex $index)
+    public function __construct(DefinitionResolver $definitionResolver, ReadableIndex $index)
     {
         $this->definitionResolver = $definitionResolver;
         $this->index = $index;
@@ -228,7 +228,7 @@ class CompletionProvider
                     }
                 }
             }
-        } elseif (TolerantParserHelpers::isConstantFetch($node) ||
+        } elseif (ParserHelpers::isConstantFetch($node) ||
             ($creation = $node->parent) instanceof Tolerant\Node\Expression\ObjectCreationExpression ||
             (($creation = $node) instanceof Tolerant\Node\Expression\ObjectCreationExpression)) {
 
@@ -298,7 +298,7 @@ class CompletionProvider
                     $list->items[] = $item;
                 }
             }
-        } elseif (TolerantParserHelpers::isConstantFetch($node)) {
+        } elseif (ParserHelpers::isConstantFetch($node)) {
             $prefix = (string) ($node->getResolvedName() ?? Tolerant\ResolvedName::buildName($node->nameParts, $node->getFileContents()));
             foreach (self::KEYWORDS as $keyword) {
                 $item = new CompletionItem($keyword, CompletionItemKind::KEYWORD);
@@ -355,7 +355,7 @@ class CompletionProvider
 
         // Walk the AST upwards until a scope boundary is met
         $level = $node;
-        while ($level && !TolerantParserHelpers::isFunctionLike($level)) {
+        while ($level && !ParserHelpers::isFunctionLike($level)) {
             // Walk siblings before the node
             $sibling = $level;
             while ($sibling = $sibling->getPreviousSibling()) {
@@ -369,7 +369,7 @@ class CompletionProvider
 
         // If the traversal ended because a function was met,
         // also add its parameters and closure uses to the result list
-        if ($level && TolerantParserHelpers::isFunctionLike($level) && $level->parameters !== null) {
+        if ($level && ParserHelpers::isFunctionLike($level) && $level->parameters !== null) {
             foreach ($level->parameters->getValues() as $param) {
                 $paramName = $param->getName();
                 if (empty($namePrefix) || strpos($paramName, $namePrefix) !== false) {
@@ -409,7 +409,7 @@ class CompletionProvider
         };
         $isNotFunctionLike = function($node) {
             return !(
-                TolerantParserHelpers::isFunctionLike($node) ||
+                ParserHelpers::isFunctionLike($node) ||
                 $node instanceof Tolerant\Node\Statement\ClassDeclaration ||
                 $node instanceof Tolerant\Node\Statement\InterfaceDeclaration ||
                 $node instanceof Tolerant\Node\Statement\TraitDeclaration

src/ComposerScripts.php

@@ -31,7 +31,7 @@ class ComposerScripts
             $contentRetriever = new FileSystemContentRetriever;
             $docBlockFactory = DocBlockFactory::createInstance();
             $parser = new Tolerant\Parser();
-            $definitionResolver = new TolerantDefinitionResolver($index);
+            $definitionResolver = new DefinitionResolver($index);
 
             $stubsLocation = null;
             foreach ([__DIR__ . '/../../../jetbrains/phpstorm-stubs', __DIR__ . '/../vendor/jetbrains/phpstorm-stubs'] as $dir) {

src/FqnUtilities.php

@@ -20,7 +20,7 @@ class FqnUtilities
         if ($node instanceof Node) {
             return DefinitionResolver::getDefinedFqn($node);
         } elseif ($node instanceof Tolerant\Node) {
-            return TolerantDefinitionResolver::getDefinedFqn($node);
+            return DefinitionResolver::getDefinedFqn($node);
         }
 
         throw new \TypeError("Unspported Node class");

src/LanguageServer.php

@@ -101,7 +101,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
     protected $projectIndex;
 
     /**
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     protected $definitionResolver;
 
@@ -187,7 +187,7 @@ class LanguageServer extends AdvancedJsonRpc\Dispatcher
             $this->globalIndex = new GlobalIndex($stubsIndex, $this->projectIndex);
 
             // The DefinitionResolver should look in stubs, the project source and dependencies
-            $this->definitionResolver = new TolerantDefinitionResolver($this->globalIndex);
+            $this->definitionResolver = new DefinitionResolver($this->globalIndex);
 
             $this->documentLoader = new PhpDocumentLoader(
                 $this->contentRetriever,

src/NodeVisitor/DefinitionCollector.php

@@ -5,7 +5,7 @@ namespace LanguageServer\NodeVisitor;
 
 use PhpParser\{NodeVisitorAbstract, Node};
 use LanguageServer\{
-    Definition, FqnUtilities, TolerantDefinitionResolver
+    Definition, FqnUtilities, DefinitionResolver
 };
 
 /**
@@ -30,7 +30,7 @@ class DefinitionCollector extends NodeVisitorAbstract
 
     private $definitionResolver;
 
-    public function __construct(TolerantDefinitionResolver $definitionResolver)
+    public function __construct(DefinitionResolver $definitionResolver)
     {
         $this->definitionResolver = $definitionResolver;
     }

src/NodeVisitor/ReferencesCollector.php

@@ -22,14 +22,14 @@ class ReferencesCollector extends NodeVisitorAbstract
     public $nodes = [];
 
     /**
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     private $definitionResolver;
 
     /**
-     * @param TolerantDefinitionResolver $definitionResolver The definition resolver to resolve reference nodes to definitions
+     * @param DefinitionResolver $definitionResolver The definition resolver to resolve reference nodes to definitions
      */
-    public function __construct(TolerantDefinitionResolver $definitionResolver)
+    public function __construct(DefinitionResolver $definitionResolver)
     {
         $this->definitionResolver = $definitionResolver;
     }

src/ParserHelpers.php

@@ -5,7 +5,7 @@ namespace LanguageServer;
 
 use Microsoft\PhpParser as Tolerant;
 
-class TolerantParserHelpers {
+class ParserHelpers {
     public static function isConstantFetch(Tolerant\Node $node) : bool {
         $parent = $node->parent;
         return
@@ -70,7 +70,7 @@ class TolerantParserHelpers {
         return false;
     }
 
-    
+
     /**
      * Tries to get the parent property declaration given a Node
      * @param Tolerant\Node $node

src/PhpDocument.php

@@ -35,7 +35,7 @@ class PhpDocument
     /**
      * The DefinitionResolver instance to resolve reference nodes to definitions
      *
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     private $definitionResolver;
 
@@ -99,7 +99,7 @@ class PhpDocument
      * @param Index $index The Index to register definitions and references to
      * @param Parser $parser The PHPParser instance
      * @param DocBlockFactory $docBlockFactory The DocBlockFactory instance to parse docblocks
-     * @param TolerantDefinitionResolver $definitionResolver The DefinitionResolver to resolve definitions to symbols in the workspace
+     * @param DefinitionResolver $definitionResolver The DefinitionResolver to resolve definitions to symbols in the workspace
      */
     public function __construct(
         string $uri,
@@ -107,7 +107,7 @@ class PhpDocument
         Index $index,
         $parser,
         DocBlockFactory $docBlockFactory,
-        TolerantDefinitionResolver $definitionResolver
+        DefinitionResolver $definitionResolver
     ) {
         $this->uri = $uri;
         $this->index = $index;
@@ -158,7 +158,7 @@ class PhpDocument
         $this->definitions = null;
         $this->definitionNodes = null;
 
-        $treeAnalyzer = new TolerantTreeAnalyzer($this->parser, $content, $this->docBlockFactory, $this->definitionResolver, $this->uri);
+        $treeAnalyzer = new TreeAnalyzer($this->parser, $content, $this->docBlockFactory, $this->definitionResolver, $this->uri);
 
         $this->diagnostics = $treeAnalyzer->getDiagnostics();
 

src/PhpDocumentLoader.php

@@ -48,20 +48,20 @@ class PhpDocumentLoader
     private $docBlockFactory;
 
     /**
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     private $definitionResolver;
 
     /**
      * @param ContentRetriever $contentRetriever
      * @param ProjectIndex $projectIndex
-     * @param TolerantDefinitionResolver $definitionResolver
+     * @param DefinitionResolver $definitionResolver
      * @internal param ProjectIndex $project
      */
     public function __construct(
         ContentRetriever $contentRetriever,
         ProjectIndex $projectIndex,
-        TolerantDefinitionResolver $definitionResolver
+        DefinitionResolver $definitionResolver
     ) {
         $this->contentRetriever = $contentRetriever;
         $this->projectIndex = $projectIndex;

src/Protocol/SymbolInformation.php

@@ -3,6 +3,7 @@
 namespace LanguageServer\Protocol;
 
 use PhpParser\Node;
+use Microsoft\PhpParser as Tolerant;
 use Exception;
 
 /**
@@ -42,53 +43,65 @@ class SymbolInformation
     /**
      * Converts a Node to a SymbolInformation
      *
-     * @param Node $node
+     * @param Tolerant\Node $node
      * @param string $fqn If given, $containerName will be extracted from it
-     * @return self|null
+     * @return SymbolInformation|null
      */
     public static function fromNode($node, string $fqn = null)
     {
-        $parent = $node->getAttribute('parentNode');
         $symbol = new self;
-        if ($node instanceof Node\Stmt\Class_) {
+        if ($node instanceof Tolerant\Node\Statement\ClassDeclaration) {
             $symbol->kind = SymbolKind::CLASS_;
-        } else if ($node instanceof Node\Stmt\Trait_) {
+        } else if ($node instanceof Tolerant\Node\Statement\TraitDeclaration) {
             $symbol->kind = SymbolKind::CLASS_;
-        } else if ($node instanceof Node\Stmt\Interface_) {
+        } else if ($node instanceof Tolerant\Node\Statement\InterfaceDeclaration) {
             $symbol->kind = SymbolKind::INTERFACE;
-        } else if ($node instanceof Node\Name && $parent instanceof Node\Stmt\Namespace_) {
+        } else if ($node instanceof Tolerant\Node\Statement\NamespaceDefinition) {
             $symbol->kind = SymbolKind::NAMESPACE;
-        } else if ($node instanceof Node\Stmt\Function_) {
+        } else if ($node instanceof Tolerant\Node\Statement\FunctionDeclaration) {
             $symbol->kind = SymbolKind::FUNCTION;
-        } else if ($node instanceof Node\Stmt\ClassMethod) {
+        } else if ($node instanceof Tolerant\Node\MethodDeclaration) {
             $symbol->kind = SymbolKind::METHOD;
-        } else if ($node instanceof Node\Stmt\PropertyProperty) {
+        } else if ($node instanceof Tolerant\Node\Expression\Variable && $node->getFirstAncestor(Tolerant\Node\PropertyDeclaration::class) !== null) {
             $symbol->kind = SymbolKind::PROPERTY;
-        } else if ($node instanceof Node\Const_) {
+        } else if ($node instanceof Tolerant\Node\ConstElement) {
             $symbol->kind = SymbolKind::CONSTANT;
-        } else if (
+        }
+
+        else if (
             (
-                ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp)
+                ($node instanceof Tolerant\Node\Expression\AssignmentExpression)
-                && $node->var instanceof Node\Expr\Variable
+                && $node->leftOperand instanceof Tolerant\Node\Expression\Variable
             )
-            || $node instanceof Node\Expr\ClosureUse
+            || $node instanceof Tolerant\Node\UseVariableName
-            || $node instanceof Node\Param
+            || $node instanceof Tolerant\Node\Parameter
         ) {
             $symbol->kind = SymbolKind::VARIABLE;
         } else {
             return null;
         }
-        if ($node instanceof Node\Name) {
+
-            $symbol->name = (string)$node;
+        if ($node instanceof Tolerant\Node\Expression\AssignmentExpression) {
-        } else if ($node instanceof Node\Expr\Assign || $node instanceof Node\Expr\AssignOp) {
+            if ($node->leftOperand instanceof Tolerant\Node\Expression\Variable) {
-            $symbol->name = $node->var->name;
+                $symbol->name = $node->leftOperand->getName();
-        } else if ($node instanceof Node\Expr\ClosureUse) {
+            } elseif ($node->leftOperand instanceof Tolerant\Token) {
-            $symbol->name = $node->var;
+                $symbol->name = trim($node->leftOperand->getText($node->getFileContents()), "$");
+            }
+
+        } else if ($node instanceof Tolerant\Node\UseVariableName) {
+            $symbol->name = $node->getName();
         } else if (isset($node->name)) {
-            $symbol->name = (string)$node->name;
+            if ($node->name instanceof Tolerant\Node\QualifiedName) {
+                $symbol->name = (string)Tolerant\ResolvedName::buildName($node->name->nameParts, $node->getFileContents());
+            } else {
+                $symbol->name = ltrim((string)$node->name->getText($node->getFileContents()), "$");
+            }
+        } else if (isset($node->variableName)) {
+            $symbol->name = $node->variableName->getText($node);
         } else {
             return null;
         }
+
         $symbol->location = Location::fromNode($node);
         if ($fqn !== null) {
             $parts = preg_split('/(::|->|\\\\)/', $fqn);

src/Protocol/TolerantSymbolInformation.php

@@ -1,85 +0,0 @@
-<?php
-
-namespace LanguageServer\Protocol;
-
-use PhpParser\Node;
-use Microsoft\PhpParser as Tolerant;
-use Exception;
-
-/**
- * Represents information about programming constructs like variables, classes,
- * interfaces etc.
- */
-class TolerantSymbolInformation
-{
-    /**
-     * Converts a Node to a SymbolInformation
-     *
-     * @param Tolerant\Node $node
-     * @param string $fqn If given, $containerName will be extracted from it
-     * @return SymbolInformation|null
-     */
-    public static function fromNode($node, string $fqn = null)
-    {
-        $symbol = new SymbolInformation();
-        if ($node instanceof Tolerant\Node\Statement\ClassDeclaration) {
-            $symbol->kind = SymbolKind::CLASS_;
-        } else if ($node instanceof Tolerant\Node\Statement\TraitDeclaration) {
-            $symbol->kind = SymbolKind::CLASS_;
-        } else if ($node instanceof Tolerant\Node\Statement\InterfaceDeclaration) {
-            $symbol->kind = SymbolKind::INTERFACE;
-        } else if ($node instanceof Tolerant\Node\Statement\NamespaceDefinition) {
-            $symbol->kind = SymbolKind::NAMESPACE;
-        } else if ($node instanceof Tolerant\Node\Statement\FunctionDeclaration) {
-            $symbol->kind = SymbolKind::FUNCTION;
-        } else if ($node instanceof Tolerant\Node\MethodDeclaration) {
-            $symbol->kind = SymbolKind::METHOD;
-        } else if ($node instanceof Tolerant\Node\Expression\Variable && $node->getFirstAncestor(Tolerant\Node\PropertyDeclaration::class) !== null) {
-            $symbol->kind = SymbolKind::PROPERTY;
-        } else if ($node instanceof Tolerant\Node\ConstElement) {
-            $symbol->kind = SymbolKind::CONSTANT;
-        }
-
-        else if (
-            (
-                ($node instanceof Tolerant\Node\Expression\AssignmentExpression)
-                && $node->leftOperand instanceof Tolerant\Node\Expression\Variable
-            )
-            || $node instanceof Tolerant\Node\UseVariableName
-            || $node instanceof Tolerant\Node\Parameter
-        ) {
-            $symbol->kind = SymbolKind::VARIABLE;
-        } else {
-            return null;
-        }
-
-        if ($node instanceof Tolerant\Node\Expression\AssignmentExpression) {
-            if ($node->leftOperand instanceof Tolerant\Node\Expression\Variable) {
-                $symbol->name = $node->leftOperand->getName();
-            } elseif ($node->leftOperand instanceof Tolerant\Token) {
-                $symbol->name = trim($node->leftOperand->getText($node->getFileContents()), "$");
-            }
-
-        } else if ($node instanceof Tolerant\Node\UseVariableName) {
-            $symbol->name = $node->getName();
-        } else if (isset($node->name)) {
-            if ($node->name instanceof Tolerant\Node\QualifiedName) {
-                $symbol->name = (string)Tolerant\ResolvedName::buildName($node->name->nameParts, $node->getFileContents());
-            } else {
-                $symbol->name = ltrim((string)$node->name->getText($node->getFileContents()), "$");
-            }
-        } else if (isset($node->variableName)) {
-            $symbol->name = $node->variableName->getText($node);
-        } else {
-            return null;
-        }
-
-        $symbol->location = Location::fromNode($node);
-        if ($fqn !== null) {
-            $parts = preg_split('/(::|->|\\\\)/', $fqn);
-            array_pop($parts);
-            $symbol->containerName = implode('\\', $parts);
-        }
-        return $symbol;
-    }
-}

src/Server/TextDocument.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Server;
 
 use LanguageServer\{
-    CompletionProvider, FqnUtilities, LanguageClient, PhpDocument, PhpDocumentLoader, TolerantDefinitionResolver
+    CompletionProvider, FqnUtilities, LanguageClient, PhpDocument, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\ReadableIndex;
 use LanguageServer\Protocol\{
@@ -36,7 +36,7 @@ class TextDocument
     protected $project;
 
     /**
-     * @var TolerantDefinitionResolver
+     * @var DefinitionResolver
      */
     protected $definitionResolver;
 
@@ -62,7 +62,7 @@ class TextDocument
 
     /**
      * @param PhpDocumentLoader $documentLoader
-     * @param TolerantDefinitionResolver $definitionResolver
+     * @param DefinitionResolver $definitionResolver
      * @param LanguageClient $client
      * @param ReadableIndex $index
      * @param \stdClass $composerJson
@@ -70,7 +70,7 @@ class TextDocument
      */
     public function __construct(
         PhpDocumentLoader $documentLoader,
-        TolerantDefinitionResolver $definitionResolver,
+        DefinitionResolver $definitionResolver,
         LanguageClient $client,
         ReadableIndex $index,
         \stdClass $composerJson = null,

src/TolerantTreeAnalyzer.php

@@ -1,186 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace LanguageServer;
-
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, TextEdit};
-use LanguageServer\NodeVisitor\{
-    NodeAtPositionFinder,
-    ReferencesAdder,
-    DocBlockParser,
-    DefinitionCollector,
-    ColumnCalculator,
-    ReferencesCollector
-};
-use LanguageServer\Index\Index;
-use PhpParser\{Error, ErrorHandler, Node, NodeTraverser, Parser};
-use PhpParser\NodeVisitor\NameResolver;
-use phpDocumentor\Reflection\DocBlockFactory;
-use Sabre\Uri;
-use Microsoft\PhpParser as Tolerant;
-
-class TolerantTreeAnalyzer implements TreeAnalyzerInterface {
-    private $parser;
-
-    /** @var Tolerant\Node */
-    private $stmts;
-
-    private $diagnostics;
-
-    private $content;
-
-    /**
-     * TolerantTreeAnalyzer constructor.
-     * @param Tolerant\Parser $parser
-     * @param $content
-     * @param $docBlockFactory
-     * @param TolerantDefinitionResolver $definitionResolver
-     * @param $uri
-     */
-    public function __construct($parser, $content, $docBlockFactory, $definitionResolver, $uri) {
-        $this->uri = $uri;
-        $this->parser = $parser;
-        $this->docBlockFactory = $docBlockFactory;
-        $this->definitionResolver = $definitionResolver;
-        $this->content = $content;
-        $this->stmts = $this->parser->parseSourceFile($content, $uri);
-
-        // TODO - docblock errors
-
-        $this->collectDefinitionsAndReferences($this->stmts);
-    }
-
-    public function collectDefinitionsAndReferences(Tolerant\Node $stmts) {
-        foreach ($stmts::CHILD_NAMES as $name) {
-            $node = $stmts->$name;
-
-            if ($node === null) {
-                continue;
-            }
-
-            if (\is_array($node)) {
-                foreach ($node as $child) {
-                    if ($child instanceof Tolerant\Node) {
-                        $this->update($child);
-                    }
-                }
-                continue;
-            }
-
-            if ($node instanceof Tolerant\Node) {
-                $this->update($node);
-            }
-
-            if (($_error = Tolerant\DiagnosticsProvider::checkDiagnostics($node)) !== null) {
-                $range = Tolerant\PositionUtilities::getRangeFromPosition($_error->start, $_error->length, $this->content);
-
-                $this->diagnostics[] = new Diagnostic(
-                    $_error->message,
-                    new Range(
-                        new Position($range->start->line, $range->start->character),
-                        new Position($range->end->line, $range->start->character)
-                    ),
-                    null,
-                    DiagnosticSeverity::ERROR,
-                    'php'
-                );
-            }
-        }
-    }
-
-    public function update($node) {
-        $fqn = ($this->definitionResolver)::getDefinedFqn($node);
-        // Only index definitions with an FQN (no variables)
-        if ($fqn !== null) {
-            $this->definitionNodes[$fqn] = $node;
-            $this->definitions[$fqn] = $this->definitionResolver->createDefinitionFromNode($node, $fqn);
-        } else {
-            $parent = $node->parent;
-            if (!(
-                (
-                    // $node->parent instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
-                    ($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
-                    $node instanceof Tolerant\Node\Expression\MemberAccessExpression)
-                    && !(
-                        $node->parent instanceof Tolerant\Node\Expression\CallExpression ||
-                        $node->memberName instanceof Tolerant\Token
-                    ))
-                || ($parent instanceof Tolerant\Node\Statement\NamespaceDefinition && $parent->name !== null && $parent->name->getStart() === $node->getStart()))
-            ) {
-
-                $fqn = $this->definitionResolver->resolveReferenceNodeToFqn($node);
-                if ($fqn !== null) {
-                    $this->addReference($fqn, $node);
-
-                    if (
-                        $node instanceof Tolerant\Node\QualifiedName
-                        && ($node->isQualifiedName() || $node->parent instanceof Tolerant\Node\NamespaceUseClause)
-                        && !($parent instanceof Tolerant\Node\Statement\NamespaceDefinition && $parent->name->getStart() === $node->getStart()
-                        )
-                    ) {
-                        // Add references for each referenced namespace
-                        $ns = $fqn;
-                        while (($pos = strrpos($ns, '\\')) !== false) {
-                            $ns = substr($ns, 0, $pos);
-                            $this->addReference($ns, $node);
-                        }
-                    }
-
-                    // Namespaced constant access and function calls also need to register a reference
-                    // to the global version because PHP falls back to global at runtime
-                    // http://php.net/manual/en/language.namespaces.fallback.php
-                    if (TolerantParserHelpers::isConstantFetch($node) ||
-                        ($parent instanceof Tolerant\Node\Expression\CallExpression
-                            && !(
-                                $node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
-                                $node instanceof Tolerant\Node\Expression\MemberAccessExpression
-                            ))) {
-                        $parts = explode('\\', $fqn);
-                        if (count($parts) > 1) {
-                            $globalFqn = end($parts);
-                            $this->addReference($globalFqn, $node);
-                        }
-                    }
-                }
-            }
-        }
-        $this->collectDefinitionsAndReferences($node);
-    }
-
-    public function getDiagnostics() {
-        return $this->diagnostics ?? [];
-    }
-
-    private function addReference(string $fqn, Tolerant\Node $node)
-    {
-        if (!isset($this->referenceNodes[$fqn])) {
-            $this->referenceNodes[$fqn] = [];
-        }
-        $this->referenceNodes[$fqn][] = $node;
-    }
-
-    public function getDefinitions() {
-        return $this->definitions ?? [];
-    }
-
-    public function getDefinitionNodes() {
-        return $this->definitionNodes ?? [];
-    }
-
-    public function getReferenceNodes() {
-        return $this->referenceNodes ?? [];
-    }
-
-    public function getStmts() {
-        return $this->stmts;
-    }
-    /**
-     * Returns the URI of the document
-     *
-     * @return string
-     */
-    public function getUri(): string
-    {
-        return $this->uri;
-    }
-}

src/TreeAnalyzer.php

@@ -19,83 +19,144 @@ use phpDocumentor\Reflection\DocBlockFactory;
 use Sabre\Uri;
 use Microsoft\PhpParser as Tolerant;
 
-class TreeAnalyzer implements TreeAnalyzerInterface {
+class TreeAnalyzer {
     private $parser;
 
+    /** @var Tolerant\Node */
     private $stmts;
 
-    private $errorHandler;
-
     private $diagnostics;
 
+    private $content;
+
+    /**
+     * TreeAnalyzer constructor.
+     * @param Tolerant\Parser $parser
+     * @param $content
+     * @param $docBlockFactory
+     * @param DefinitionResolver $definitionResolver
+     * @param $uri
+     */
     public function __construct($parser, $content, $docBlockFactory, $definitionResolver, $uri) {
         $this->uri = $uri;
         $this->parser = $parser;
         $this->docBlockFactory = $docBlockFactory;
         $this->definitionResolver = $definitionResolver;
         $this->content = $content;
-        $errorHandler = new ErrorHandler\Collecting;
+        $this->stmts = $this->parser->parseSourceFile($content, $uri);
-        $stmts = $this->parser->parse($content, $errorHandler);
 
-        $this->diagnostics = [];
+        // TODO - docblock errors
-        foreach ($errorHandler->getErrors() as $error) {
-            $this->diagnostics[] = Diagnostic::fromError($error, $this->content, DiagnosticSeverity::ERROR, 'php');
-        }
 
-        // $stmts can be null in case of a fatal parsing error <- Interesting. When do fatal parsing errors occur?
+        $this->collectDefinitionsAndReferences($this->stmts);
-        if ($stmts) {
+    }
-            $traverser = new NodeTraverser;
 
-            // Resolve aliased names to FQNs
+    public function collectDefinitionsAndReferences(Tolerant\Node $stmts) {
-            $traverser->addVisitor(new NameResolver($errorHandler));
+        foreach ($stmts::CHILD_NAMES as $name) {
+            $node = $stmts->$name;
 
-            // Add parentNode, previousSibling, nextSibling attributes
+            if ($node === null) {
-            $traverser->addVisitor(new ReferencesAdder($this));
+                continue;
-
-            // Add column attributes to nodes
-            $traverser->addVisitor(new ColumnCalculator($content));
-
-            // Parse docblocks and add docBlock attributes to nodes
-            $docBlockParser = new DocBlockParser($this->docBlockFactory);
-            $traverser->addVisitor($docBlockParser);
-
-            $traverser->traverse($stmts);
-
-            // Report errors from parsing docblocks
-            foreach ($docBlockParser->errors as $error) {
-                $this->diagnostics[] = Diagnostic::fromError($error, $this->content, DiagnosticSeverity::WARNING, 'php');
             }
 
-            $traverser = new NodeTraverser;
+            if (\is_array($node)) {
-
+                foreach ($node as $child) {
-            // Collect all definitions
+                    if ($child instanceof Tolerant\Node) {
-            $definitionCollector = new DefinitionCollector($this->definitionResolver);
+                        $this->update($child);
-            $traverser->addVisitor($definitionCollector);
+                    }
-
+                }
-            // Collect all references
+                continue;
-            $referencesCollector = new ReferencesCollector($this->definitionResolver);
-            $traverser->addVisitor($referencesCollector);
-
-            $traverser->traverse($stmts);
-
-            // Register this document on the project for all the symbols defined in it
-            $this->definitions = $definitionCollector->definitions;
-            $this->definitionNodes = $definitionCollector->nodes;
-            foreach ($definitionCollector->definitions as $fqn => $definition) {
-                // $this->index->setDefinition($fqn, $definition);
-            }
-            // Register this document on the project for references
-            $this->referenceNodes = $referencesCollector->nodes;
-            foreach ($referencesCollector->nodes as $fqn => $nodes) {
-                // $this->index->addReferenceUri($fqn, $this->uri);
             }
 
-            $this->stmts = $stmts;
+            if ($node instanceof Tolerant\Node) {
+                $this->update($node);
+            }
+
+            if (($_error = Tolerant\DiagnosticsProvider::checkDiagnostics($node)) !== null) {
+                $range = Tolerant\PositionUtilities::getRangeFromPosition($_error->start, $_error->length, $this->content);
+
+                $this->diagnostics[] = new Diagnostic(
+                    $_error->message,
+                    new Range(
+                        new Position($range->start->line, $range->start->character),
+                        new Position($range->end->line, $range->start->character)
+                    ),
+                    null,
+                    DiagnosticSeverity::ERROR,
+                    'php'
+                );
+            }
         }
     }
 
+    public function update($node) {
+        $fqn = ($this->definitionResolver)::getDefinedFqn($node);
+        // Only index definitions with an FQN (no variables)
+        if ($fqn !== null) {
+            $this->definitionNodes[$fqn] = $node;
+            $this->definitions[$fqn] = $this->definitionResolver->createDefinitionFromNode($node, $fqn);
+        } else {
+            $parent = $node->parent;
+            if (!(
+                (
+                    // $node->parent instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                    ($node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                    $node instanceof Tolerant\Node\Expression\MemberAccessExpression)
+                    && !(
+                        $node->parent instanceof Tolerant\Node\Expression\CallExpression ||
+                        $node->memberName instanceof Tolerant\Token
+                    ))
+                || ($parent instanceof Tolerant\Node\Statement\NamespaceDefinition && $parent->name !== null && $parent->name->getStart() === $node->getStart()))
+            ) {
+
+                $fqn = $this->definitionResolver->resolveReferenceNodeToFqn($node);
+                if ($fqn !== null) {
+                    $this->addReference($fqn, $node);
+
+                    if (
+                        $node instanceof Tolerant\Node\QualifiedName
+                        && ($node->isQualifiedName() || $node->parent instanceof Tolerant\Node\NamespaceUseClause)
+                        && !($parent instanceof Tolerant\Node\Statement\NamespaceDefinition && $parent->name->getStart() === $node->getStart()
+                        )
+                    ) {
+                        // Add references for each referenced namespace
+                        $ns = $fqn;
+                        while (($pos = strrpos($ns, '\\')) !== false) {
+                            $ns = substr($ns, 0, $pos);
+                            $this->addReference($ns, $node);
+                        }
+                    }
+
+                    // Namespaced constant access and function calls also need to register a reference
+                    // to the global version because PHP falls back to global at runtime
+                    // http://php.net/manual/en/language.namespaces.fallback.php
+                    if (ParserHelpers::isConstantFetch($node) ||
+                        ($parent instanceof Tolerant\Node\Expression\CallExpression
+                            && !(
+                                $node instanceof Tolerant\Node\Expression\ScopedPropertyAccessExpression ||
+                                $node instanceof Tolerant\Node\Expression\MemberAccessExpression
+                            ))) {
+                        $parts = explode('\\', $fqn);
+                        if (count($parts) > 1) {
+                            $globalFqn = end($parts);
+                            $this->addReference($globalFqn, $node);
+                        }
+                    }
+                }
+            }
+        }
+        $this->collectDefinitionsAndReferences($node);
+    }
+
     public function getDiagnostics() {
-        return $this->diagnostics;
+        return $this->diagnostics ?? [];
+    }
+
+    private function addReference(string $fqn, Tolerant\Node $node)
+    {
+        if (!isset($this->referenceNodes[$fqn])) {
+            $this->referenceNodes[$fqn] = [];
+        }
+        $this->referenceNodes[$fqn][] = $node;
     }
 
     public function getDefinitions() {

src/TreeAnalyzerInterface.php

@@ -1,34 +0,0 @@
-<?php
-declare(strict_types = 1);
-
-namespace LanguageServer;
-
-use LanguageServer\Protocol\{Diagnostic, DiagnosticSeverity, Range, Position, TextEdit};
-use LanguageServer\NodeVisitor\{
-    NodeAtPositionFinder,
-    ReferencesAdder,
-    DocBlockParser,
-    DefinitionCollector,
-    ColumnCalculator,
-    ReferencesCollector
-};
-use LanguageServer\Index\Index;
-use PhpParser\{Error, ErrorHandler, Node, NodeTraverser, Parser};
-use PhpParser\NodeVisitor\NameResolver;
-use phpDocumentor\Reflection\DocBlockFactory;
-use Sabre\Uri;
-use Microsoft\PhpParser as Tolerant;
-
-interface TreeAnalyzerInterface {
-    public function __construct($parser, $content, $docBlockFactory, $definitionResolver, $uri);
-
-    public function getDiagnostics();
-
-    public function getDefinitions();
-
-    public function getDefinitionNodes();
-
-    public function getReferenceNodes();
-
-    public function getStmts();
-}

tests/NodeVisitor/DefinitionCollectorTest.php

@@ -7,7 +7,7 @@ use PHPUnit\Framework\TestCase;
 use PhpParser\{Node};
 use phpDocumentor\Reflection\DocBlockFactory;
 use LanguageServer\{
-    TolerantDefinitionResolver, TolerantTreeAnalyzer
+    DefinitionResolver, TreeAnalyzer
 };
 use LanguageServer\Index\{Index};
 use function LanguageServer\pathToUri;
@@ -71,10 +71,10 @@ class DefinitionCollectorTest extends TestCase
 
         $docBlockFactory = DocBlockFactory::createInstance();
         $index = new Index;
-        $definitionResolver = new TolerantDefinitionResolver($index);
+        $definitionResolver = new DefinitionResolver($index);
         $content = file_get_contents($path);
 
-        $treeAnalyzer = new TolerantTreeAnalyzer($parser, $content, $docBlockFactory, $definitionResolver, $uri);
+        $treeAnalyzer = new TreeAnalyzer($parser, $content, $docBlockFactory, $definitionResolver, $uri);
         return $treeAnalyzer->getDefinitionNodes();
     }
 }

tests/PhpDocumentLoaderTest.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests\Server;
 
 use LanguageServer\{
-    PhpDocument, PhpDocumentLoader, Project, TolerantDefinitionResolver
+    PhpDocument, PhpDocumentLoader, Project, DefinitionResolver
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{
@@ -26,7 +26,7 @@ class PhpDocumentLoaderTest extends TestCase
         $this->loader = new PhpDocumentLoader(
             new FileSystemContentRetriever,
             $projectIndex,
-            new TolerantDefinitionResolver($projectIndex)
+            new DefinitionResolver($projectIndex)
         );
     }
 

tests/PhpDocumentTest.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests\Server;
 
 use LanguageServer\{
-    PhpDocument, TolerantDefinitionResolver
+    PhpDocument, DefinitionResolver
 };
 use LanguageServer\Index\{
     Index
@@ -25,7 +25,7 @@ class PhpDocumentTest extends TestCase
         $parser = new Tolerant\Parser();
         $docBlockFactory = DocBlockFactory::createInstance();
         $index = new Index;
-        $definitionResolver = new TolerantDefinitionResolver($index);
+        $definitionResolver = new DefinitionResolver($index);
         return new PhpDocument($uri, $content, $index, $parser, $docBlockFactory, $definitionResolver);
     }
 

tests/Server/ServerTestCase.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\{ProjectIndex, DependenciesIndex, Index};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
@@ -51,7 +51,7 @@ abstract class ServerTestCase extends TestCase
         $projectIndex      = new ProjectIndex($sourceIndex, $dependenciesIndex);
         $projectIndex->setComplete();
 
-        $definitionResolver   = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver   = new DefinitionResolver($projectIndex);
         $client               = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
         $this->documentLoader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $this->textDocument   = new Server\TextDocument($this->documentLoader, $definitionResolver, $client, $projectIndex);

tests/Server/TextDocument/CompletionTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
@@ -37,7 +37,7 @@ class CompletionTest extends TestCase
     {
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $contentRetriever = new FileSystemContentRetriever;
         $this->loader = new PhpDocumentLoader($contentRetriever, $projectIndex, $definitionResolver);
         $this->loader->load(pathToUri(__DIR__ . '/../../../fixtures/global_symbols.php'))->wait();

tests/Server/TextDocument/Definition/GlobalFallbackTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument\Definition;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\Tests\Server\ServerTestCase;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
@@ -19,7 +19,7 @@ class GlobalFallbackTest extends ServerTestCase
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
         $projectIndex->setComplete();
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $contentRetriever = new FileSystemContentRetriever;
         $loader = new PhpDocumentLoader($contentRetriever, $projectIndex, $definitionResolver);
         $this->textDocument = new Server\TextDocument($loader, $definitionResolver, $client, $projectIndex);

tests/Server/TextDocument/DidChangeTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
@@ -23,7 +23,7 @@ class DidChangeTest extends TestCase
     {
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $loader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $textDocument = new Server\TextDocument($loader, $definitionResolver, $client, $projectIndex);
         $phpDocument = $loader->open('whatever', "<?php\necho 'Hello, World'\n");

tests/Server/TextDocument/DidCloseTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
@@ -18,7 +18,7 @@ class DidCloseTest extends TestCase
     {
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $loader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $textDocument = new Server\TextDocument($loader, $definitionResolver, $client, $projectIndex);
         $phpDocument = $loader->open('whatever', "<?php\necho 'Hello, World'\n");

tests/Server/TextDocument/FormattingTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, LanguageClient, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, LanguageClient, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
@@ -26,7 +26,7 @@ class FormattingTest extends TestCase
     {
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
         $client = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $loader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $textDocument = new Server\TextDocument($loader, $definitionResolver, $client, $projectIndex);
 

tests/Server/TextDocument/ParseErrorsTest.php

@@ -6,7 +6,7 @@ namespace LanguageServer\Tests\Server\TextDocument;
 use PHPUnit\Framework\TestCase;
 use LanguageServer\Tests\MockProtocolStream;
 use LanguageServer\{
-    Server, Client, LanguageClient, ClientHandler, PhpDocumentLoader, TolerantDefinitionResolver
+    Server, Client, LanguageClient, ClientHandler, PhpDocumentLoader, DefinitionResolver
 };
 use LanguageServer\Index\{Index, ProjectIndex, DependenciesIndex};
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
@@ -40,7 +40,7 @@ class ParseErrorsTest extends TestCase
             }
         };
         $projectIndex = new ProjectIndex(new Index, new DependenciesIndex);
-        $definitionResolver = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver = new DefinitionResolver($projectIndex);
         $loader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $this->textDocument = new Server\TextDocument($loader, $definitionResolver, $client, $projectIndex);
     }

tests/Server/TextDocument/References/GlobalFallbackTest.php

@@ -4,7 +4,7 @@ declare(strict_types = 1);
 namespace LanguageServer\Tests\Server\TextDocument\References;
 
 use LanguageServer\{
-    LanguageClient, PhpDocumentLoader, Server, TolerantDefinitionResolver
+    LanguageClient, PhpDocumentLoader, Server, DefinitionResolver
 };
 use LanguageServer\ContentRetriever\FileSystemContentRetriever;
 use LanguageServer\Index\{
@@ -22,7 +22,7 @@ class GlobalFallbackTest extends ServerTestCase
     {
         $projectIndex         = new ProjectIndex(new Index, new DependenciesIndex);
         $projectIndex->setComplete();
-        $definitionResolver   = new TolerantDefinitionResolver($projectIndex);
+        $definitionResolver   = new DefinitionResolver($projectIndex);
         $client               = new LanguageClient(new MockProtocolStream, new MockProtocolStream);
         $this->documentLoader = new PhpDocumentLoader(new FileSystemContentRetriever, $projectIndex, $definitionResolver);
         $this->textDocument   = new Server\TextDocument($this->documentLoader, $definitionResolver, $client, $projectIndex);

tests/Validation/ValidationTest.php

@@ -9,7 +9,7 @@ use LanguageServer\Definition;
 use LanguageServer\Index\Index;
 use LanguageServer\ParserKind;
 use LanguageServer\PhpDocument;
-use LanguageServer\TolerantDefinitionResolver;
+use LanguageServer\DefinitionResolver;
 use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlockFactory;
 use PHPUnit\Framework\TestCase;
@@ -96,7 +96,7 @@ class ValidationTest extends TestCase
         $index = new Index();
         $parser = new Tolerant\Parser();
         $docBlockFactory = DocBlockFactory::createInstance();
-        $definitionResolver = new TolerantDefinitionResolver($index);
+        $definitionResolver = new DefinitionResolver($index);
 
         $document = new PhpDocument($filename, $fileContents, $index, $parser, $docBlockFactory, $definitionResolver);