Autocomplete speedup vol. 2 - finishing by MichaelBelgium · Pull Request #680 · felixfbecker/php-language-server

MichaelBelgium · 2018-11-06T21:34:37Z

Finishing #599 by merging master and fixing the conflicts. Although I wasn't sure which side to pick while merging, I assumed the side of autocomplet-speedup.

closes #274
closes #599

This reverts commit 48bbbb5.

…e efficiently

…benchmark

felixfbecker · 2018-11-10T15:47:14Z

@MichaelBelgium unfortunately tests are failing (they passed on the old PR):

Error: Call to undefined method LanguageServerProtocol\CompletionItem::fromDefinition()

This function was moved to a different class: https://github.com/felixfbecker/php-language-server/blob/master/src/Factory/CompletionItemFactory.php

codecov · 2018-11-10T18:03:15Z

Codecov Report

Merging #680 into master will increase coverage by 0.33%.
The diff coverage is 90.71%.

@@             Coverage Diff              @@
##             master     #680      +/-   ##
============================================
+ Coverage     81.83%   82.16%   +0.33%     
- Complexity      883      921      +38     
============================================
  Files            44       44              
  Lines          1993     2148     +155     
============================================
+ Hits           1631     1765     +134     
- Misses          362      383      +21

Impacted Files	Coverage Δ	Complexity Δ
src/DefinitionResolver.php	`87.39% <100%> (+0.06%)`	`331 <0> (+1)`	⬆️
src/Server/TextDocument.php	`75.55% <100%> (+0.18%)`	`57 <0> (+1)`	⬆️
src/Index/AbstractAggregateIndex.php	`86.04% <71.42%> (-7.44%)`	`26 <6> (ø)`
src/Index/Index.php	`77.41% <82.5%> (+7.6%)`	`54 <32> (+32)`	⬆️
src/FqnUtilities.php	`83.87% <90.47%> (+13.87%)`	`0 <0> (ø)`	⬇️
src/CompletionProvider.php	`94.24% <96.69%> (-0.27%)`	`112 <73> (+4)`

MichaelBelgium · 2018-11-10T18:17:26Z

@MichaelBelgium unfortunately tests are failing (they passed on the old PR):
Error: Call to undefined method LanguageServerProtocol\CompletionItem::fromDefinition()
This function was moved to a different class: https://github.com/felixfbecker/php-language-server/blob/master/src/Factory/CompletionItemFactory.php

Fixed 👌

felixfbecker · 2018-11-11T00:14:19Z

I found a crash when running the language server on this project:

CRITICAL  Error: Cannot use object of type LanguageServer\Definition as array in /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php:382
Stack trace:
#0 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php(386): LanguageServer\Index\Index->getIndexValue(Array, Object(LanguageServer\Definition))
#1 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php(151): LanguageServer\Index\Index->getIndexValue(Array, Array)
#2 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/AbstractAggregateIndex.php(137): LanguageServer\Index\Index->getDefinition('->assertSession...', false)
#3 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/AbstractAggregateIndex.php(137): LanguageServer\Index\AbstractAggregateIndex->getDefinition('->assertSession...', false)
#4 /Users/felix/src/github.com/felixfbecker/php-language-server/src/DefinitionResolver.php(772): LanguageServer\Index\AbstractAggregateIndex->getDefinition('->assertSession...')
#5 /Users/felix/src/github.com/felixfbecker/php-language-server/src/DefinitionResolver.php(739): LanguageServer\DefinitionResolver->resolveExpressionNodeToType(Object(Microsoft\PhpParser\Node\Expression\MemberAccessExpression))
#6 /Users/felix/src/github.com/felixfbecker/php-language-server/src/DefinitionResolver.php(404): LanguageServer\DefinitionResolver->resolveExpressionNodeToType(Object(Microsoft\PhpParser\Node\Expression\CallExpression))
#7 /Users/felix/src/github.com/felixfbecker/php-language-server/src/DefinitionResolver.php(331): LanguageServer\DefinitionResolver->resolveMemberAccessExpressionNodeToFqn(Object(Microsoft\PhpParser\Node\Expression\MemberAccessExpression))
#8 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(175): LanguageServer\DefinitionResolver->resolveReferenceNodeToFqn(Object(Microsoft\PhpParser\Node\Expression\MemberAccessExpression))
#9 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(124): LanguageServer\TreeAnalyzer->collectDefinitionsAndReferences(Object(Microsoft\PhpParser\Node\Expression\MemberAccessExpression))
#10 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(140): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\Expression\MemberAccessExpression))
#11 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(140): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\Expression\CallExpression))
#12 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(136): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\Statement\ExpressionStatement))
#13 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(140): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\Statement\CompoundStatementNode))
#14 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(136): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\MethodDeclaration))
#15 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(140): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\TraitMembers))
#16 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(136): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\Statement\TraitDeclaration))
#17 /Users/felix/src/github.com/felixfbecker/php-language-server/src/TreeAnalyzer.php(58): LanguageServer\TreeAnalyzer->traverse(Object(Microsoft\PhpParser\Node\SourceFileNode))
#18 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocument.php(147): LanguageServer\TreeAnalyzer->__construct(Object(Microsoft\PhpParser\Parser), '<?php\n\nnamespac...', Object(phpDocumentor\Reflection\DocBlockFactory), Object(LanguageServer\DefinitionResolver), 'file:///Users/f...')
#19 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocument.php(105): LanguageServer\PhpDocument->updateContent('<?php\n\nnamespac...')
#20 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocumentLoader.php(141): LanguageServer\PhpDocument->__construct('file:///Users/f...', '<?php\n\nnamespac...', Object(LanguageServer\Index\Index), Object(Microsoft\PhpParser\Parser), Object(phpDocumentor\Reflection\DocBlockFactory), Object(LanguageServer\DefinitionResolver))
#21 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocumentLoader.php(120): LanguageServer\PhpDocumentLoader->create('file:///Users/f...', '<?php\n\nnamespac...')
#22 [internal function]: LanguageServer\PhpDocumentLoader->LanguageServer\{closure}()
#23 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/coroutine.php(70): Generator->send('<?php\n\nnamespac...')
#24 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/Promise.php(242): Sabre\Event\{closure}('<?php\n\nnamespac...')
#25 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/Loop/Loop.php(261): Sabre\Event\Promise->Sabre\Event\{closure}()
#26 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/Loop/Loop.php(215): Sabre\Event\Loop\Loop->runNextTicks()
#27 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/Loop/Loop.php(194): Sabre\Event\Loop\Loop->tick(true)
#28 /Users/felix/src/github.com/felixfbecker/php-language-server/vendor/sabre/event/lib/Loop/functions.php(122): Sabre\Event\Loop\Loop->run()
#29 /Users/felix/src/github.com/felixfbecker/php-language-server/bin/php-language-server.php(55): Sabre\Event\Loop\run()
#30 {main}

It crashes when indexing validation/frameworks/drupal/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php.

felixfbecker · 2018-11-11T00:17:30Z

Here's another crash that happens when running ./benchmarks/parsing.php:

Fatal error: Uncaught TypeError: Argument 3 passed to LanguageServer\Index\Index::indexDefinition() must be of the type array, object given, called in /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php on line 412 and defined in /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php:398
Stack trace:
#0 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php(412): LanguageServer\Index\Index->indexDefinition(1, Array, Object(LanguageServer\Definition), Object(LanguageServer\Definition))
#1 /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php(175): LanguageServer\Index\Index->indexDefinition(0, Array, Array, Object(LanguageServer\Definition))
#2 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocument.php(158): LanguageServer\Index\Index->setDefinition('->A()', Object(LanguageServer\Definition))
#3 /Users/felix/src/github.com/felixfbecker/php-language-server/src/PhpDocument.php(105): LanguageServer in /Users/felix/src/github.com/felixfbecker/php-language-server/src/Index/Index.php on line 398

felixfbecker · 2018-11-11T00:30:45Z

cc @Declspeck @nicolasmure

felixfbecker · 2018-11-11T03:03:05Z

🎉 This PR is included in version 5.4.3 🎉

The release is available on GitHub release

Your semantic-release bot 📦🚀

nicolasmure and others added 30 commits November 13, 2017 20:18

speedup autocomplete with ReadableIndex::getDefinitionsForNamespace

2d91ee8

update tests

b7c7128

speedup static access autocomplete

6d725a2

cleanup

18f2f4c

globalDefinitions cache to speedup autocomplete

17602aa

also remove empty namespace index

6d30035

store definitions under the namespaceDefinitions cache key directly

ca0caf1

use Generators to get definitions without wasting memory

8768b69

also yield URIs to save memory

8801edb

add example of indexed definitions

6a41a7f

avoid useless array

6a36828

use of null coalescing operator

e34d8e1

use correct terminology

14f840b

consider the merge of #511

e9fd572

use tree representation index

d1f85f1

fix definitions storage collision (member / non member)

188a5df

use a single array to store definitions

cacde1e

cleanup

e162d94

Fix formatting

7437d30

Correct some docblocks

b118c77

cache is backward compatible

b3f30f3

Merge branch 'master' into feature/autocomplete-speedup

7511e25

use string concatenation instead of sprintf

fcdf791

Merge branch 'master' into feature/autocomplete-speedup

3bda390

Cleanup

b03950c

fix definition removal

97ec127

differenciate member and non member definitions

48bbbb5

Merge branch 'master' into feature/autocomplete-speedup

67dd980

Revert "differenciate member and non member definitions"

91ca99a

This reverts commit 48bbbb5.

perf: get direct children

fa67f84

felixfbecker and others added 13 commits November 23, 2017 02:38

chore: add completion benchmark

81c40f2

Merge remote-tracking branch 'origin/master' into autocomplet-speedup

8617948

fix(tests): fix require in parsing.php benchmark after file move

439cebe

refactor(completion): make completion of global symbols use Index mor…

e589f9e

…e efficiently

tests(completion): add completion of new| ParameterBag to completion …

6858bd3

…benchmark

feat(completion): complete for used namespaces

d6b4e79

Merge branch 'master' into autocomplet-speedup

98ac9ff

refactor(completion): rewrite global name completion with generators

d1933b8

fix(completion): Return type hint

0bc5b81

Merge branch 'master' into autocomplet-speedup

334683a

Address feedback

5921fd3

Merge branch 'master' into autocomplet-speedup

3d5f0ca

Merge branch 'master' into autocomplet-speedup

118115f

felixfbecker self-requested a review November 6, 2018 21:37

felixfbecker self-assigned this Nov 6, 2018

Rename CompletionItem to CompletionItemFactory

b625b0e

felixfbecker added 2 commits November 11, 2018 00:56

squash! fix benchmark protocol namespace reference

c5ec18f

chore: disable XDebug in benchmarks

0a48df9

felixfbecker added 2 commits November 11, 2018 02:52

chore: log progress in parsing benchmark

2a2fa1c

fix: don't save classes without name to index

52179d0

felixfbecker approved these changes Nov 11, 2018

View reviewed changes

felixfbecker merged commit 24388bc into felixfbecker:master Nov 11, 2018

MichaelBelgium deleted the autocomplet-speedup branch November 11, 2018 13:16

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Comments

Autocomplete speedup vol. 2 - finishing#680

Autocomplete speedup vol. 2 - finishing#680
felixfbecker merged 48 commits intofelixfbecker:masterfrom
MichaelBelgium:autocomplet-speedup

MichaelBelgium commented Nov 6, 2018

Uh oh!

felixfbecker commented Nov 10, 2018

Uh oh!

codecov bot commented Nov 10, 2018 •

edited by ghost

Loading

Uh oh!

MichaelBelgium commented Nov 10, 2018

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

felixfbecker commented Nov 11, 2018 •

edited

Loading

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Comments

Conversation

MichaelBelgium commented Nov 6, 2018

Uh oh!

felixfbecker commented Nov 10, 2018

Uh oh!

codecov bot commented Nov 10, 2018 • edited by ghost Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

MichaelBelgium commented Nov 10, 2018

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

felixfbecker commented Nov 11, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

felixfbecker commented Nov 11, 2018

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented Nov 10, 2018 •

edited by ghost

Loading

felixfbecker commented Nov 11, 2018 •

edited

Loading