Adapt to the new version for intelephense

Author: marlonfan

package.json

@@ -1,6 +1,6 @@
 {
     "name": "coc-phpls",
-    "version": "2.0.6",
+    "version": "2.0.7",
     "description": "PHP language server extension for coc.nvim",
     "main": "lib/index.js",
     "publisher": "marlonfan",
@@ -191,17 +191,17 @@
         "@chemzqm/tslint-config": "^1.0.18",
         "@types/fs-extra": "^8.0.0",
         "@types/glob": "^7.1.1",
-        "@types/node": "^12.0.12",
-        "coc.nvim": "^0.0.72",
-        "rimraf": "^2.6.3",
+        "@types/node": "^12.7.1",
+        "coc.nvim": "^0.0.73",
+        "rimraf": "^3.0.0",
         "tslint": "^5.18.0",
-        "typescript": "^3.5.2"
+        "typescript": "^3.5.3"
     },
     "dependencies": {
         "glob": "^7.1.4",
-        "intelephense": "^1.1.1",
+        "intelephense": "^1.1.6",
         "tslib": "^1.10.0",
-        "vscode": "^1.1.35",
+        "vscode": "^1.1.36",
         "vscode-languageclient": "^5.2.1",
         "vscode-languageserver-protocol": "^3.14.1"
     }

src/index.ts

@@ -18,7 +18,8 @@ import {
     Position,
     CompletionList,
     NotificationType,
-    RequestType
+    RequestType,
+    Disposable
 } from "vscode-languageserver-protocol";
 
 import { CancellationToken } from "vscode-jsonrpc";
@@ -31,12 +32,18 @@ const INDEX_WORKSPACE_REQUEST = new RequestType('indexWorkspace');
 const CANCEL_INDEXING_REQUEST = new RequestType('cancelIndexing');
 
 let languageClient: LanguageClient;
+let extensionContext: ExtensionContext;
+let clientDisposable:Disposable;
+let file: string;
 
 export async function activate(context: ExtensionContext): Promise<void> {
+    extensionContext = context;
+
     let c = workspace.getConfiguration();
     const config = c.get("phpls") as any;
     const enable = config.enable;
-    const file = require.resolve("intelephense");
+
+    file = require.resolve("intelephense");
 
     if (enable === false) return;
     if (!file) {
@@ -47,6 +54,26 @@ export async function activate(context: ExtensionContext): Promise<void> {
         return;
     }
 
+    languageClient = createClient(context, false);
+
+    let indexWorkspaceDisposable = commands.registerCommand('intelephense.index.workspace', indexWorkspace);
+    let cancelIndexingDisposable = commands.registerCommand('intelephense.cancel.indexing', cancelIndexing);
+
+    context.subscriptions.push(
+        indexWorkspaceDisposable,
+        cancelIndexingDisposable,
+    );
+
+    clientDisposable = languageClient.start();
+}
+
+function fixItem(item: CompletionItem): void {
+    if (/^\\\w+/.test(item.insertText) && !/^(\\\w+){2,}/.test(item.insertText)) {
+        item.insertText = item.insertText.replace('\\', '');
+    }
+}
+
+function createClient(context: ExtensionContext, clearCache: boolean) {
     // The debug options for the server
     let debugOptions = {
         execArgv: ["--nolazy", "--inspect=6039", "--trace-warnings", "--preserve-symlinks"],
@@ -70,7 +97,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
         ],
         initializationOptions: {
             storagePath: context.storagePath,
-            clearCache: false
+            clearCache: clearCache
         },
         middleware: {
             provideCompletionItem: (
@@ -111,9 +138,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
         clientOptions
     );
 
-    let ready = languageClient.onReady();
-
-    ready.then(() => {
+    languageClient.onReady().then(() => {
         languageClient.info('Intelephense ' + VERSION);
 
         let startedTime: Date;
@@ -131,18 +156,20 @@ export async function activate(context: ExtensionContext): Promise<void> {
         });
     });
 
-    let indexWorkspaceDisposable = commands.registerCommand('intelephense.index.workspace', () => languageClient.sendRequest(INDEX_WORKSPACE_REQUEST.method));
-    let cancelIndexingDisposable = commands.registerCommand('intelephense.cancel.indexing', () => languageClient.sendRequest(CANCEL_INDEXING_REQUEST.method));
+    return languageClient;
+}
 
-    context.subscriptions.push(
-        services.registLanguageClient(languageClient),
-        indexWorkspaceDisposable,
-        cancelIndexingDisposable,
-    );
+function indexWorkspace() {
+	if(!languageClient) {
+		return;
+	}
+	languageClient.stop().then(_ => {
+		clientDisposable.dispose();
+		languageClient = createClient(extensionContext, true);
+		clientDisposable = languageClient.start();
+	});
 }
 
-function fixItem(item: CompletionItem): void {
-    if (/^\\\w+/.test(item.insertText) && !/^(\\\w+){2,}/.test(item.insertText)) {
-        item.insertText = item.insertText.replace('\\', '');
-    }
+function cancelIndexing() {
+	languageClient.sendRequest(CANCEL_INDEXING_REQUEST.method);
 }