Update LSP client to 9.0.0

dafny-lang · Sep 25, 2023 · 4bb628e · 4bb628e
1 parent b42c02e
commit 4bb628e
Show file tree

Hide file tree

Showing 4 changed files with 91 additions and 51 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -342,7 +342,7 @@
     "got": "^11.8.2",
     "promise.any": "^2.0.2",
     "proxyquire": "^2.1.3",
-    "vscode-languageclient": "^7.0.0",
+    "vscode-languageclient": "^9.0.0",
     "vscode-uri": "^3.0.2",
     "which": "^2.0.2"
   },

diff --git a/src/extension.ts b/src/extension.ts
@@ -69,8 +69,7 @@ class ExtensionRuntime {
 
   public async startClientAndWaitForVersion() {
     this.client = this.client ?? await DafnyLanguageClient.create(this.installer);
-    this.client.start();
-    await this.client.onReady();
+    await this.client.start();
     this.languageServerVersion = await this.getLanguageServerVersionAfterStartup();
   }
 

diff --git a/src/language/dafnyLanguageClient.ts b/src/language/dafnyLanguageClient.ts
@@ -127,9 +127,7 @@ export class DafnyLanguageClient extends LanguageClient {
     private readonly diagnosticsListeners: DiagnosticListener[], forceDebug?: boolean) {
     super(id, name, serverOptions, clientOptions, forceDebug);
     this.diagnosticsListeners = diagnosticsListeners;
-    this.onReady().then(() => {
-      this.onNotification('dafny/textDocument/symbolStatus', params => this._onVerificationSymbolStatus.fire(params));
-    });
+    this.onNotification('dafny/textDocument/symbolStatus', params => this._onVerificationSymbolStatus.fire(params));
   }
 
   public getCounterexamples(param: ICounterexampleParams): Promise<ICounterexampleItem[]> {