Wait for diagnostics before building

Author: plemarquand

test/integration-tests/DiagnosticsManager.test.ts

@@ -164,7 +164,7 @@ suite("DiagnosticsManager Test Suite", async function () {
     });
 
     suite("Parse diagnostics", async function () {
-        this.timeout(60000);
+        this.timeout(60000 * 2);
 
         suite("Parse from task output", async () => {
             const expectedWarningDiagnostic = new vscode.Diagnostic(
@@ -215,11 +215,11 @@ suite("DiagnosticsManager Test Suite", async function () {
                 await swiftConfig.update("diagnosticsStyle", "default");
 
                 await Promise.all([
-                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                     waitForDiagnostics({
                         [mainUri.fsPath]: [expectedWarningDiagnostic, expectedMainErrorDiagnostic], // Should have parsed correct severity
                         [funcUri.fsPath]: [expectedFuncErrorDiagnostic], // Check parsed for other file
                     }),
+                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                 ]);
 
                 await waitForNoRunningTasks();
@@ -237,15 +237,15 @@ suite("DiagnosticsManager Test Suite", async function () {
                         swiftVersion.isLessThanOrEqual(new Version(6, 0, 0)))
                 ) {
                     this.skip();
-                    return;
                 }
                 await swiftConfig.update("diagnosticsStyle", "swift");
+
                 await Promise.all([
-                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                     waitForDiagnostics({
                         [mainUri.fsPath]: [expectedWarningDiagnostic, expectedMainErrorDiagnostic], // Should have parsed correct severity
                         [funcUri.fsPath]: [expectedFuncErrorDiagnostic], // Check parsed for other file
                     }),
+                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                 ]);
                 await waitForNoRunningTasks();
             });
@@ -254,11 +254,11 @@ suite("DiagnosticsManager Test Suite", async function () {
                 await swiftConfig.update("diagnosticsStyle", "llvm");
 
                 await Promise.all([
-                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                     waitForDiagnostics({
                         [mainUri.fsPath]: [expectedWarningDiagnostic, expectedMainErrorDiagnostic], // Should have parsed correct severity
                         [funcUri.fsPath]: [expectedFuncErrorDiagnostic], // Check parsed for other file
                     }),
+                    executeTaskAndWaitForResult(createBuildAllTask(folderContext)),
                 ]);
                 await waitForNoRunningTasks();
 
@@ -304,10 +304,10 @@ suite("DiagnosticsManager Test Suite", async function () {
                 expectedDiagnostic2.source = "swiftc";
 
                 await Promise.all([
-                    executeTaskAndWaitForResult(createBuildAllTask(cFolderContext)),
                     waitForDiagnostics({
                         [cUri.fsPath]: [expectedDiagnostic1, expectedDiagnostic2],
                     }),
+                    executeTaskAndWaitForResult(createBuildAllTask(cFolderContext)),
                 ]);
                 await waitForNoRunningTasks();
             });
@@ -339,10 +339,10 @@ suite("DiagnosticsManager Test Suite", async function () {
                 expectedDiagnostic2.source = "swiftc";
 
                 await Promise.all([
-                    executeTaskAndWaitForResult(createBuildAllTask(cppFolderContext)),
                     waitForDiagnostics({
                         [cppUri.fsPath]: [expectedDiagnostic1, expectedDiagnostic2],
                     }),
+                    executeTaskAndWaitForResult(createBuildAllTask(cppFolderContext)),
                 ]);
                 await waitForNoRunningTasks();