Skip to content

Enable synchronize request in sourcekit-lsp options #1463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 28, 2025
Merged

Enable synchronize request in sourcekit-lsp options #1463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5188773
Enable synchronize request in sourcekit options
plemarquand Mar 26, 2025
fc7fbe1
workspace/_synchronize has been promoted to non-experimental
plemarquand Mar 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 1 addition & 16 deletions test/integration-tests/language/LanguageClientIntegration.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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;
},
});

Expand Down
32 changes: 12 additions & 20 deletions test/integration-tests/utilities/lsputilities.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading