Disable for <6.0

Author: award999

test/integration-tests/DiagnosticsManager.test.ts

@@ -32,8 +32,7 @@ import {
 } from "./utilities/testutilities";
 import { DiagnosticStyle } from "../../src/configuration";
 import { expect } from "chai";
-import { touchDocument, waitForClientState } from "./utilities/lsputilities";
-import { LanguageClientManager } from "../../src/sourcekit-lsp/LanguageClientManager";
+import { touchDocument, waitForClientState, waitForIndex } from "./utilities/lsputilities";
 
 const isEqual = (d1: vscode.Diagnostic, d2: vscode.Diagnostic) => {
     return (
@@ -1188,7 +1187,8 @@ suite("DiagnosticsManager Test Suite", function () {
         });
 
         suiteSetup(async function () {
-            if (workspaceContext.globalToolchainSwiftVersion.isLessThan(new Version(5, 9, 0))) {
+            if (workspaceContext.globalToolchainSwiftVersion.isLessThan(new Version(6, 0, 0))) {
+                // need to waitForIndex
                 this.skip();
                 return;
             }
@@ -1201,16 +1201,19 @@ suite("DiagnosticsManager Test Suite", function () {
             await vscode.commands.executeCommand(Workbench.ACTION_CLOSEALLEDITORS);
         });
 
-        suite("swift", () => {
-            let clientManager: LanguageClientManager;
+        async function triggerFileDiagnostics(uri: vscode.Uri, folder: FolderContext) {
+            const clientManager = workspaceContext.languageClientManager.get(folder);
+            await waitForClientState(clientManager, langclient.State.Running);
+            await vscode.window.showTextDocument(uri);
+            await new Promise(r => setTimeout(r, 2000));
+            await touchDocument(clientManager, uri);
+            await waitForIndex(clientManager, folder.swiftVersion);
+        }
 
+        suite("swift", () => {
             setup(async function () {
                 this.timeout(3 * 60 * 1000); // Allow 3 minutes to build
-                const folder = await buildProject(workspaceContext, "diagnostics", true);
-                // Ensure lsp client is ready
-                clientManager = workspaceContext.languageClientManager.get(folder);
-                await clientManager.restart();
-                await waitForClientState(clientManager, langclient.State.Running);
+                await buildProject(workspaceContext, "diagnostics", true);
             });
 
             test("Provides diagnostics", async () => {
@@ -1234,28 +1237,19 @@ suite("DiagnosticsManager Test Suite", function () {
                 );
                 expectedDiagnostic2.source = lspSource; // Set by LSP
 
-                // Open file
                 const promise = waitForDiagnostics({
                     [mainUri.fsPath]: [expectedDiagnostic1, expectedDiagnostic2],
                 });
-                await vscode.window.showTextDocument(mainUri);
-                await touchDocument(clientManager, mainUri);
-
                 // Retrigger diagnostics
+                await triggerFileDiagnostics(mainUri, folderContext);
                 await promise;
             });
         });
 
         suite("clang", async () => {
-            let clientManager: LanguageClientManager;
-
             setup(async function () {
                 this.timeout(3 * 60 * 1000); // Allow 3 minutes to build
-                const folder = await buildProject(workspaceContext, "diagnosticsC", true);
-                // Ensure lsp client is ready
-                clientManager = workspaceContext.languageClientManager.get(folder);
-                await clientManager.restart();
-                await waitForClientState(clientManager, langclient.State.Running);
+                await buildProject(workspaceContext, "diagnosticsC", true);
             });
 
             test("Provides diagnostics", async () => {
@@ -1275,14 +1269,11 @@ suite("DiagnosticsManager Test Suite", function () {
                 );
                 expectedDiagnostic2.source = "clang"; // Set by LSP
 
-                // Open file
                 const promise = waitForDiagnostics({
                     [cUri.fsPath]: [expectedDiagnostic1, expectedDiagnostic2],
                 });
-                await vscode.window.showTextDocument(cUri);
-                await touchDocument(clientManager, cUri);
-
                 // Retrigger diagnostics
+                await triggerFileDiagnostics(cUri, cFolderContext);
                 await promise;
             });
         });

test/integration-tests/language/LanguageClientIntegration.test.ts

@@ -13,26 +13,30 @@
 //===----------------------------------------------------------------------===//
 
 import * as vscode from "vscode";
-import * as langclient from "vscode-languageclient/node";
 import { expect } from "chai";
-import { LanguageClientManager } from "../../../src/sourcekit-lsp/LanguageClientManager";
 import { testAssetUri } from "../../fixtures";
 import { activateExtensionForSuite, buildProject } from "../utilities/testutilities";
+import { touchDocument, waitForIndex } from "../utilities/lsputilities";
+import { Version } from "../../../src/utilities/version";
+import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import { FolderContext } from "../../../src/FolderContext";
-import { touchDocument, waitForClientState, waitForIndex } from "../utilities/lsputilities";
 
 suite("Language Client Integration Suite @slow", function () {
     this.timeout(3 * 60 * 1000);
 
-    let clientManager: LanguageClientManager;
+    let workspaceContext: WorkspaceContext;
     let folderContext: FolderContext;
 
     activateExtensionForSuite({
         async setup(ctx) {
-            folderContext = await buildProject(ctx, "defaultPackage");
-
-            // Ensure lsp client is ready
-            clientManager = ctx.languageClientManager.get(folderContext);
+            this.timeout(3 * 60 * 1000); // Allow 3 minutes to build
+            workspaceContext = ctx;
+            folderContext = await buildProject(workspaceContext, "defaultPackage");
+            if (folderContext.swiftVersion.isLessThan(new Version(6, 0, 0))) {
+                // need to waitForIndex
+                this.skip();
+                return;
+            }
         },
     });
 
@@ -45,12 +49,13 @@ suite("Language Client Integration Suite @slow", function () {
         // Position of the symbol 'a' in main.swift
         const position = new vscode.Position(2, 6);
 
-        setup(async () => {
-            this.timeout(60 * 1000);
+        suiteSetup(async function () {
             // Focus on the file of interest
+            const clientManager = workspaceContext.languageClientManager.get(folderContext);
+            await workspaceContext.focusFolder(null);
+            await workspaceContext.focusFolder(folderContext);
             await vscode.window.showTextDocument(uri);
-            await clientManager.restart();
-            await waitForClientState(clientManager, langclient.State.Running);
+            await new Promise(r => setTimeout(r, 2000));
             await touchDocument(clientManager, uri);
             await waitForIndex(clientManager, folderContext.swiftVersion);
         });