Autocomplete speedup vol. 2 #599

Declspeck · 2018-02-14T22:19:51Z

This PR does everything that the original Autocomplete Speedup (#451) does, and what your branch of it did:

Refactors Index into a tree structure, rather than an array of Fqns to definitions.
Use the new Index to speed up ::, -> completions.

In addition to that, this PR

Also uses the new Index to speed up completion on names, e.g. array_mer| and adds benchmark for that.
Rewrites name completion in terms of generators
Makes the completion tests for name completion stricter (TestCla| should not complete OtherClass)
Completes aliased namespaces, e.g.use Microsof\PhpParser\Node; Node\Stat| correctly, adds tests for this
Only completes direct children, i.e. TestNamesp| no longer completes TestNamespace\SubNamespace\Foo\Bar.

Misc. unrelated changes:

Add documentation comments to CompletionTest
Shorten lines in CompletionProvider.php to make it pass composer lint

This reverts commit 48bbbb5.

Declspeck · 2018-02-15T21:35:46Z

I got another (unrelated) question about the completion logic - for roamed symbols, do we want to complete the name as fully qualified? It seems to make sense for my_user_defined_fu| -> \my_user_defined_function, but not for array_mer| -> \array_merge.

If so, it should probably be expressed as a textEdit rather than insertText, since at least lsp-mode in Emacs does not know what to do in the case where the insert text does not match the text that has been written.

Declspeck · 2018-02-24T14:14:04Z

I added all the parts removed from this PR as separate PRs: #607 #606 #605 #604 #602

felixfbecker · 2018-02-28T21:01:13Z

Currently when in a namespace we complete to \array_merge afaik. If we had settings there probably should be a setting for it.

felixfbecker · 2018-02-28T21:15:55Z

Need some more time to review this.
Would you mind updating the description?

Declspeck · 2018-03-01T08:00:52Z

Sure, I'll update it after work today (or at the very latest tomorrow) - I already forgot what I'm wanting to merge here, so I have to take another look myself. It looks like I also have a conflict to resolve.

Declspeck · 2018-03-01T08:01:10Z

...And thanks for reviewing the other PRs!

Declspeck · 2018-03-01T13:14:21Z

I updated the description and merged master into this.

jens1o · 2018-03-01T14:24:38Z

src/CompletionProvider.php

+            foreach ($list->items as $item) {
+                // Remove ()
+                if (is_string($item->insertText) && substr($item->insertText, strlen($item->insertText) - 2) === '()') {
+                    $item->insertText = substr($item->insertText, 0, strlen($item->insertText) - 2);


no need to use strlen here(this line and the line before).

Use substr($item->insertText, -2);(or substr($item->insertText, 0, -2);) instead.

jens1o · 2018-03-01T14:28:29Z

src/Index/Index.php

@@ -216,10 +280,164 @@ public function unserialize($serialized)
    public function serialize()
    {
        return serialize([
-            'definitions' => $this->definitions,
+            'definitions' => iterator_to_array($this->getDefinitions(), true),


the second parameter is already the default one, no need for the true.

Declspeck · 2018-03-10T15:06:22Z

Thanks for the feedback @jens1o - I finally got around to addressing it.

jens1o · 2018-03-10T17:09:19Z

Thank you!

jens1o · 2018-03-10T17:09:54Z

src/CompletionProvider.php

@@ -341,7 +341,7 @@ public function provideCompletion(
            foreach ($list->items as $item) {
                // Remove ()
                if (is_string($item->insertText) && substr($item->insertText, strlen($item->insertText) - 2) === '()') {


this line can be simplified too
if (is_string($item->insertText) && substr($item->insertText, -2) === '()') {

pkirkinezis · 2018-05-11T10:26:50Z

Hello
Do we have an estimation date on when this will be merged if it will be merged ?

felixfbecker · 2018-05-11T17:17:12Z

Short answer, no, we don't have an estimate date.

felixfbecker · 2018-09-11T10:59:03Z

Hey @Declspeck, sorry I had forgotten about this PR. Just took a look and it looks good to me. Do you think this is in a mergeable state / are you still interested in getting it across the finish line?

jens1o · 2018-10-24T17:37:33Z

@felixfbecker I'd be interested in completing this PR. What do I need to do? Copy the clone?

felixfbecker · 2018-10-24T17:42:59Z

Awesome. Here is roughly what you need to do:

Add the fork as a git remote:

git remote add Declspeck [email protected]:Declspeck/php-language-server.git

Fetch it:

git fetch Declspeck

Check it out:

git checkout autocomplet-speedup

Merge in master (make sure master is up to date):

git merge master

Fix merge conflicts and commit
Push to your own fork:

git push -u jens1o autocomplet-speedup

jens1o · 2018-10-24T18:25:40Z

Awesome, thanks for the heads up!

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

🎉 This issue has been resolved 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 felixfbecker#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

fix(completion): Return type hint

0bc5b81

Declspeck mentioned this pull request Feb 15, 2018

Completion for relative names #602

Open

This was referenced Feb 24, 2018

Complete class aliases whose targets do not exist #605

Open

Autocomplete complete used functions and constants #606

Open

Autocomplete member selectivity #607

Open

Merge branch 'master' into autocomplet-speedup

334683a

jens1o reviewed Mar 1, 2018

View reviewed changes

Declspeck added 2 commits March 10, 2018 17:02

Address feedback

5921fd3

Merge branch 'master' into autocomplet-speedup

3d5f0ca

jens1o reviewed Mar 10, 2018

View reviewed changes

felixfbecker mentioned this pull request Sep 21, 2018

Intellisense slow on 5k files #274

Closed

MichaelBelgium mentioned this pull request Nov 6, 2018

Autocomplete speedup vol. 2 - finishing #680

Merged

felixfbecker closed this in #680 Nov 11, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Autocomplete speedup vol. 2 #599

Autocomplete speedup vol. 2 #599

Declspeck commented Feb 14, 2018 •

edited

Loading

Declspeck commented Feb 15, 2018

Declspeck commented Feb 24, 2018

felixfbecker commented Feb 28, 2018

felixfbecker commented Feb 28, 2018

Declspeck commented Mar 1, 2018

Declspeck commented Mar 1, 2018

Declspeck commented Mar 1, 2018

jens1o Mar 1, 2018 •

edited

Loading

jens1o Mar 1, 2018

Declspeck commented Mar 10, 2018

jens1o commented Mar 10, 2018

jens1o Mar 10, 2018 •

edited

Loading

pkirkinezis commented May 11, 2018

felixfbecker commented May 11, 2018

felixfbecker commented Sep 11, 2018

jens1o commented Oct 24, 2018

felixfbecker commented Oct 24, 2018

jens1o commented Oct 24, 2018

felixfbecker commented Nov 11, 2018

Autocomplete speedup vol. 2 #599

Autocomplete speedup vol. 2 #599

Conversation

Declspeck commented Feb 14, 2018 • edited Loading

Declspeck commented Feb 15, 2018

Declspeck commented Feb 24, 2018

felixfbecker commented Feb 28, 2018

felixfbecker commented Feb 28, 2018

Declspeck commented Mar 1, 2018

Declspeck commented Mar 1, 2018

Declspeck commented Mar 1, 2018

jens1o Mar 1, 2018 • edited Loading

Choose a reason for hiding this comment

jens1o Mar 1, 2018

Choose a reason for hiding this comment

Declspeck commented Mar 10, 2018

jens1o commented Mar 10, 2018

jens1o Mar 10, 2018 • edited Loading

Choose a reason for hiding this comment

pkirkinezis commented May 11, 2018

felixfbecker commented May 11, 2018

felixfbecker commented Sep 11, 2018

jens1o commented Oct 24, 2018

felixfbecker commented Oct 24, 2018

jens1o commented Oct 24, 2018

felixfbecker commented Nov 11, 2018

Declspeck commented Feb 14, 2018 •

edited

Loading

jens1o Mar 1, 2018 •

edited

Loading

jens1o Mar 10, 2018 •

edited

Loading