Fix build detection

Author: jdesrosiers

language-server/src/services/schemas-neovim.test.ts

@@ -39,7 +39,7 @@ describe("Feature - workspace (neovim)", () => {
     });
   });
 
-  test("a change to a watched file should validate the workspace", async () => {
+  test("a change to a watched file should validate the workspace", { retry: 3 }, async () => {
     const schemaUris: string[] = [];
 
     client.onNotification(PublishDiagnosticsNotification.type, (params) => {

language-server/src/test/test-client.ts

@@ -44,6 +44,7 @@ export class TestClient<Configuration> {
   private openDocuments: Set<string>;
   private workspaceFolder: Promise<string>;
   private watchEnabled: boolean;
+  private builds: Promise<void>[];
 
   onRequest: Connection["onRequest"];
   sendRequest: Connection["sendRequest"];
@@ -97,8 +98,15 @@ export class TestClient<Configuration> {
       }
     });
 
-    this.client.onRequest(WorkDoneProgressCreateRequest.type, () => {
-      // Nothing to do
+    this.builds = [];
+    this.client.onRequest(WorkDoneProgressCreateRequest.type, ({ token }) => {
+      this.builds.push(new Promise((resolve) => {
+        this.client.onProgress(WorkDoneProgress.type, token, ({ kind }) => {
+          if (kind === "end") {
+            resolve();
+          }
+        });
+      }));
     });
 
     this.client.onRequest(ConfigurationRequest.type, (params) => {
@@ -221,8 +229,6 @@ export class TestClient<Configuration> {
   async changeConfiguration(settings: Partial<Configuration>) {
     this._settings = settings;
 
-    const buildCompleted = this.buildCompleted();
-
     if (this.configurationChangeNotificationOptions === null) {
       await this.client.sendNotification(DidChangeConfigurationNotification.type, {
         settings: null
@@ -235,7 +241,7 @@ export class TestClient<Configuration> {
       });
     }
 
-    await buildCompleted;
+    await this.buildCompleted();
   }
 
   async writeDocument(uri: string, text: string) {
@@ -244,8 +250,6 @@ export class TestClient<Configuration> {
 
     await writeFile(fileURLToPath(fullUri), text, "utf-8");
 
-    const buildCompleted = this.buildCompleted();
-
     if (this.watchEnabled) {
       await this.client.sendNotification(DidChangeWatchedFilesNotification.type, {
         changes: [{
@@ -255,7 +259,7 @@ export class TestClient<Configuration> {
       });
     }
 
-    await buildCompleted;
+    await this.buildCompleted();
 
     return fullUri;
   }
@@ -265,8 +269,6 @@ export class TestClient<Configuration> {
 
     await rm(fileURLToPath(fullUri));
 
-    const buildCompleted = this.buildCompleted();
-
     if (this.watchEnabled) {
       await this.client.sendNotification(DidChangeWatchedFilesNotification.type, {
         changes: [{
@@ -276,7 +278,7 @@ export class TestClient<Configuration> {
       });
     }
 
-    await buildCompleted;
+    await this.buildCompleted();
 
     return fullUri;
   }
@@ -308,17 +310,9 @@ export class TestClient<Configuration> {
     });
   }
 
-  // TODO: Duplicated code
-  private buildCompleted() {
-    return new Promise<void>((resolve) => {
-      this.client.onRequest(WorkDoneProgressCreateRequest.type, ({ token }) => {
-        this.client.onProgress(WorkDoneProgress.type, token, ({ kind }) => {
-          if (kind === "end") {
-            resolve();
-          }
-        });
-      });
-    });
+  private async buildCompleted() {
+    await wait(100);
+    return Promise.all(this.builds);
   }
 }