Enable synchronize request in sourcekit-lsp options (#1463)

Author: plemarquand

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

@@ -20,11 +20,7 @@ import { WorkspaceContext } from "../../../src/WorkspaceContext";
 import { testAssetUri } from "../../fixtures";
 import { executeTaskAndWaitForResult, waitForNoRunningTasks } from "../../utilities/tasks";
 import { getBuildAllTask, SwiftTask } from "../../../src/tasks/SwiftTaskProvider";
-import {
-    activateExtensionForSuite,
-    folderInRootWorkspace,
-    updateSettings,
-} from "../utilities/testutilities";
+import { activateExtensionForSuite, folderInRootWorkspace } from "../utilities/testutilities";
 import { waitForClientState, waitForIndex } from "../utilities/lsputilities";
 
 async function buildProject(ctx: WorkspaceContext, name: string) {
@@ -46,22 +42,11 @@ suite("Language Client Integration Suite @slow", function () {
         async setup(ctx) {
             workspaceContext = ctx;
 
-            const resetSettings = await updateSettings({
-                "swift.sourcekit-lsp.serverArguments": [
-                    "--experimental-feature",
-                    "synchronize-request",
-                ],
-            });
-
-            // Restart the LSP after changing its settings
-            await ctx.languageClientManager.restart();
-
             await buildProject(ctx, "defaultPackage");
 
             // Ensure lsp client is ready
             clientManager = ctx.languageClientManager;
             await waitForClientState(clientManager, langclient.State.Running);
-            return resetSettings;
         },
     });
 

test/integration-tests/utilities/lsputilities.ts

@@ -44,32 +44,24 @@ export namespace PollIndexRequest {
 
 // eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace WorkspaceSynchronizeRequest {
-    export const method = "workspace/_synchronize" as const;
+    export const method = "workspace/synchronize" as const;
     export const messageDirection: langclient.MessageDirection =
         langclient.MessageDirection.clientToServer;
     export const type = new langclient.RequestType<object, object, never>(method);
 }
-
 export async function waitForIndex(languageClientManager: LanguageClientManager): Promise<void> {
-    if (
-        languageClientManager.workspaceContext.swiftVersion.isGreaterThanOrEqual(
-            new Version(6, 2, 0)
+    const swiftVersion = languageClientManager.workspaceContext.swiftVersion;
+    const requestType = swiftVersion.isGreaterThanOrEqual(new Version(6, 2, 0))
+        ? WorkspaceSynchronizeRequest.type
+        : PollIndexRequest.type;
+
+    await languageClientManager.useLanguageClient(async (client, token) =>
+        client.sendRequest(
+            requestType,
+            requestType === WorkspaceSynchronizeRequest.type ? { index: true } : {},
+            token
         )
-    ) {
-        await languageClientManager.useLanguageClient(async (client, token) =>
-            client.sendRequest(
-                WorkspaceSynchronizeRequest.type,
-                {
-                    index: true,
-                },
-                token
-            )
-        );
-    } else {
-        await languageClientManager.useLanguageClient(async (client, token) =>
-            client.sendRequest(PollIndexRequest.type, {}, token)
-        );
-    }
+    );
 }
 
 export async function waitForClientState(