feat(complete): improve the speed of autocomplete (#44)

Author: iamcco

README.md

@@ -79,7 +79,7 @@ lsp client config example with coc.nvim
       },
       "suggest": {
         "fromVimruntime": true,   // completionItems from vimruntime's vim files
-        "fromRuntimepath": false  // completionItems from runtimepath's vim files, if this is true that fromVimruntime is true
+        "fromRuntimepath": true  // completionItems from runtimepath's vim files, if this is true that fromVimruntime is true
       }
     },
     "filetypes": [ "vim" ],
@@ -109,7 +109,7 @@ lsp client config example with coc.nvim
       },
       "suggest": {
         "fromVimruntime": true,   // completionItems from vimruntime's vim files
-        "fromRuntimepath": false  // completionItems from runtimepath's vim files, if this is true that fromVimruntime is true
+        "fromRuntimepath": true  // completionItems from runtimepath's vim files, if this is true that fromVimruntime is true
       }
     },
     "filetypes": [ "vim" ]
@@ -121,7 +121,6 @@ lsp client config example with coc.nvim
 
 - if you want to speed up index, change `gap` to smaller and `count` to greater, this will cause high CPU usage for some time
 - if you don't want to index vim's runtimepath files, set `runtimepath` to `false` and you will not get any suggest from those files.
-- while `fromRuntimepath` is true, if you have install too many plugins it will slow down the complete
 
 ## Usage
 
@@ -159,6 +158,10 @@ lsp client config example with coc.nvim
 
 ![dia](https://user-images.githubusercontent.com/5492542/81494408-503eaf80-92db-11ea-96ac-641d46027623.gif)
 
+## Changelog
+
+- v2.0.0: autocomplete speedup, and `fromRuntimepath` default is change to `true`
+
 ## References
 
 - [vim-vimlparser](https://github.com/vim-jp/vim-vimlparser)

package.json

@@ -1,13 +1,14 @@
 {
   "name": "vim-language-server",
-  "version": "1.9.0",
+  "version": "2.0.0",
   "description": "vim language server",
   "keywords": [
     "viml",
     "vim",
     "lsp",
     "language",
-    "server"
+    "server",
+    "autocomplete"
   ],
   "main": "./out/index.js",
   "repository": "https://github.com/iamcco/vim-language-server",
@@ -29,20 +30,20 @@
     "@types/node": "^11.13.6",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
-    "fast-glob": "^3.2.2",
+    "fast-glob": "^3.2.4",
     "findup": "^0.1.5",
     "mocha": "^7.1.2",
     "rxjs": "^6.5.5",
     "rxjs-operators": "^1.1.3",
     "shvl": "^2.0.0",
-    "ts-loader": "^7.0.3",
-    "ts-node": "^8.10.1",
+    "ts-loader": "^7.0.5",
+    "ts-node": "^8.10.2",
     "tslint": "^6.1.2",
     "typescript": "^3.8.3",
     "vscode-languageserver": "^6.1.1",
     "vscode-languageserver-textdocument": "^1.0.1",
-    "vscode-uri": "^2.1.1",
+    "vscode-uri": "^2.1.2",
     "webpack": "^4.43.0",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^3.3.12"
   }
 }

src/handles/completion/index.ts

@@ -3,6 +3,7 @@ import {
   CompletionParams,
   Position,
   Range,
+  CompletionList,
 } from "vscode-languageserver";
 
 import fuzzy from "../../common/fuzzy";
@@ -25,7 +26,7 @@ import { getProvider } from "./provider";
 
 const provider = getProvider();
 
-export const completionProvider = (params: CompletionParams): CompletionItem[] => {
+export const completionProvider = (params: CompletionParams): CompletionList | CompletionItem[] => {
 
   const { textDocument, position } = params;
   const textDoc = documents.get(textDocument.uri);
@@ -34,18 +35,24 @@ export const completionProvider = (params: CompletionParams): CompletionItem[] =
       Position.create(position.line, 0),
       position,
     ));
-    const completionItems = provider(line, textDoc.uri, position, []);
-    if (!config.snippetSupport) {
-      return removeSnippets(completionItems);
-    }
     const words = getWordFromPosition(textDoc, { line: position.line, character: position.character - 1 });
     let word = words && words.word || "";
     if (word === "" && words && words.wordRight.trim() === ":") {
       word = ":";
     }
     // options items start with &
     const invalidLength = word.replace(/^&/, "").length;
-    return completionItems.filter((item) => fuzzy(item.label, word) >= invalidLength);
+    const completionItems = provider(line, textDoc.uri, position, word, invalidLength, []);
+    if (!config.snippetSupport) {
+      return {
+        isIncomplete: true,
+        items: removeSnippets(completionItems)
+      }
+    }
+    return {
+      isIncomplete: true,
+      items: completionItems
+    }
   }
   return [];
 };

src/handles/completion/provider.ts

@@ -2,6 +2,7 @@ import {
   CompletionItem,
   Position,
 } from "vscode-languageserver";
+import fuzzy from "../../common/fuzzy";
 
 type Provider = (line: string, uri?: string, position?: Position) => CompletionItem[];
 
@@ -17,19 +18,33 @@ export function getProvider() {
       line: string,
       uri: string,
       position: Position,
+      word: string,
+      invalidLength: number,
       items: CompletionItem[],
-    ) => pre(
-      line,
-      uri,
-      position,
-      items.concat(next(line, uri, position)),
-    );
+    ): CompletionItem[] => {
+      // 200 items is enough
+      if (items.length > 200) {
+        return items.slice(0, 200)
+      }
+      const newItems = next(line, uri, position)
+        .filter((item) => fuzzy(item.label, word) >= invalidLength)
+      return pre(
+        line,
+        uri,
+        position,
+        word,
+        invalidLength,
+        items.concat(newItems),
+      )
+    };
 
   }, (
     _line: string,
     _uri: string,
     _position: Position,
+    _word: string,
+    _invalidLength: number,
     items: CompletionItem[],
-  ) => items,
+  ): CompletionItem[] => items,
   );
 }

src/index.ts

@@ -52,7 +52,7 @@ connection.onInitialize((param: InitializeParams) => {
     },
     snippetSupport: shvl.get(param, "capabilities.textDocument.completion.completionItem.snippetSupport"),
     suggest: {
-      fromRuntimepath: false,
+      fromRuntimepath: true,
       fromVimruntime: true,
       ...(suggest || {}),
     },

src/server/config.ts

@@ -32,7 +32,7 @@ export default {
 
   get suggest(): ISuggest {
     return conf && conf.suggest || {
-      fromRuntimepath: false,
+      fromRuntimepath: true,
       fromVimruntime: true,
     };
   },