add trace server config option

marlonfan · Jan 19, 2019 · 78b15a0 · 78b15a0
1 parent 4677842
commit 78b15a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "coc-phpls",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "PHP language server extension for coc.nvim",
   "main": "lib/index.js",
   "publisher": "marlonfan",
@@ -33,6 +33,11 @@
           "type": "boolean",
           "default": true,
           "description": "is enable php lsp"
+        },
+        "phpls.trace.server": {
+          "type": "string",
+          "default": "",
+          "description": "enable phpls server trace log?"
         }
       }
     }

diff --git a/src/index.ts b/src/index.ts
@@ -48,13 +48,13 @@ export async function activate(context: ExtensionContext): Promise<void> {
     initializationOptions: {}
   }
 
-  let client = new LanguageClient('php', 'PHP Language Server', serverOptions, clientOptions)
+  let client = new LanguageClient('phpls', 'PHP Language Server', serverOptions, clientOptions)
 
   subscriptions.push(
     services.registLanguageClient(client)
   )
 
-  setTimeout(() => {
+  client.onReady().then(async () => {
     WorkspaceDiscovery.client = client
 
     fsWatcher.onDidDelete(onDidDelete);
@@ -63,7 +63,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
 
     let startedTime: Date
 
-    readAllFile(workspace.rootPath)
+    return await readAllFile(workspace.rootPath)
       .then(files => files.map(file => Uri.file(file)))
       .then(uriArray => {
         let token: CancellationToken;
@@ -75,7 +75,7 @@ export async function activate(context: ExtensionContext): Promise<void> {
         let usedTime: number = Math.abs(new Date().getTime() - startedTime.getTime())
         workspace.showMessage("Indexed php files, times: " + usedTime + "ms");
       })
-  }, 1000)
+  })
 }
 
 function onDidDelete(uri: Uri) {