-
Notifications
You must be signed in to change notification settings - Fork 185
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
perf: change index to a tree to speed up completion (#680)
Refactors Index into a tree structure, rather than an array of Fqns to definitions. Closes #274
- Loading branch information
1 parent
18c6ccd
commit 24388bc
Showing
16 changed files
with
945 additions
and
242 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,89 @@ | ||
<?php | ||
|
||
namespace LanguageServer\Tests; | ||
require __DIR__ . '/../vendor/autoload.php'; | ||
|
||
use Composer\XdebugHandler\XdebugHandler; | ||
use Exception; | ||
use LanguageServer\CompletionProvider; | ||
use LanguageServer\DefinitionResolver; | ||
use LanguageServer\Index\Index; | ||
use LanguageServer\PhpDocument; | ||
use LanguageServer\StderrLogger; | ||
use LanguageServerProtocol\Position; | ||
use Microsoft\PhpParser; | ||
use phpDocumentor\Reflection\DocBlockFactory; | ||
use RecursiveDirectoryIterator; | ||
use RecursiveIteratorIterator; | ||
|
||
$logger = new StderrLogger(); | ||
$xdebugHandler = new XdebugHandler('PHPLS'); | ||
$xdebugHandler->setLogger($logger); | ||
$xdebugHandler->check(); | ||
unset($xdebugHandler); | ||
|
||
$totalSize = 0; | ||
|
||
$framework = "symfony"; | ||
|
||
$iterator = new RecursiveDirectoryIterator(__DIR__ . "/../validation/frameworks/$framework"); | ||
$testProviderArray = array(); | ||
|
||
foreach (new RecursiveIteratorIterator($iterator) as $file) { | ||
if (strpos((string)$file, ".php") !== false) { | ||
$totalSize += $file->getSize(); | ||
$testProviderArray[] = $file->getRealPath(); | ||
} | ||
} | ||
|
||
if (count($testProviderArray) === 0) { | ||
throw new Exception("ERROR: Validation testsuite frameworks not found - run `git submodule update --init --recursive` to download."); | ||
} | ||
|
||
$index = new Index; | ||
$definitionResolver = new DefinitionResolver($index); | ||
$completionProvider = new CompletionProvider($definitionResolver, $index); | ||
$docBlockFactory = DocBlockFactory::createInstance(); | ||
$completionFile = realpath(__DIR__ . '/../validation/frameworks/symfony/src/Symfony/Component/HttpFoundation/Request.php'); | ||
$parser = new PhpParser\Parser(); | ||
$completionDocument = null; | ||
|
||
echo "Indexing $framework" . PHP_EOL; | ||
|
||
foreach ($testProviderArray as $idx => $testCaseFile) { | ||
if (filesize($testCaseFile) > 100000) { | ||
continue; | ||
} | ||
if ($idx % 100 === 0) { | ||
echo $idx . '/' . count($testProviderArray) . PHP_EOL; | ||
} | ||
|
||
$fileContents = file_get_contents($testCaseFile); | ||
|
||
try { | ||
$d = new PhpDocument($testCaseFile, $fileContents, $index, $parser, $docBlockFactory, $definitionResolver); | ||
if ($testCaseFile === $completionFile) { | ||
$completionDocument = $d; | ||
} | ||
} catch (\Throwable $e) { | ||
echo $e->getMessage() . PHP_EOL; | ||
continue; | ||
} | ||
} | ||
|
||
echo "Getting completion". PHP_EOL; | ||
|
||
// Completion in $this->|request = new ParameterBag($request); | ||
$start = microtime(true); | ||
$list = $completionProvider->provideCompletion($completionDocument, new Position(274, 15)); | ||
$end = microtime(true); | ||
echo 'Time ($this->|): ' . ($end - $start) . 's' . PHP_EOL; | ||
echo count($list->items) . ' completion items' . PHP_EOL; | ||
|
||
// Completion in $this->request = new| ParameterBag($request); | ||
// (this only finds ParameterBag though.) | ||
$start = microtime(true); | ||
$list = $completionProvider->provideCompletion($completionDocument, new Position(274, 28)); | ||
$end = microtime(true); | ||
echo 'Time (new|): ' . ($end - $start) . 's' . PHP_EOL; | ||
echo count($list->items) . ' completion items' . PHP_EOL; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
<?php | ||
|
||
namespace Whatever; | ||
|
||
use TestNamespace\InnerNamespace as AliasNamespace; | ||
|
||
class IDontShowUpInCompletion {} | ||
|
||
AliasNamespace\I; | ||
AliasNamespace\; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.