Skip to content

fix(lsp): send workspace folders during initialization #2623

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
bajrangCoder merged 2 commits into from
Aug 4, 2026
Merged

fix(lsp): send workspace folders during initialization #2623

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b44cd
fix(lsp): send workspace folders during initialization
bajrangCoder Aug 4, 2026
3f27156
fix
bajrangCoder Aug 4, 2026
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
42 changes: 38 additions & 4 deletions src/cm/lsp/clientManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,11 @@ function connectClient(
client: ExtendedLSPClient,
transport: Transport,
initializationOptions?: Record<string, unknown>,
rootUri?: string | null,
): void {
if (!initializationOptions || !Object.keys(initializationOptions).length) {
const hasInitializationOptions =
!!initializationOptions && Object.keys(initializationOptions).length > 0;
if (!hasInitializationOptions && !rootUri) {
client.connect(transport);
return;
}
Expand All @@ -199,7 +202,14 @@ function connectClient(
if (method === "initialize" && isPlainObject(params)) {
params = {
...params,
initializationOptions,
...(hasInitializationOptions ? { initializationOptions } : {}),
...(rootUri
? {
workspaceFolders: [
{ uri: rootUri, name: workspaceName(rootUri) },
],
}
: {}),
} as Params;
}
return originalRequestInner<Params, Result>(method, params, mapped);
Expand All @@ -212,6 +222,16 @@ function connectClient(
}
}

function workspaceName(rootUri: string): string {
const trimmed = rootUri.replace(/\/+$/, "");
const encodedName = trimmed.slice(trimmed.lastIndexOf("/") + 1);
try {
return decodeURIComponent(encodedName) || "workspace";
} catch {
return encodedName || "workspace";
}
}

interface BuiltinExtensionsResult {
extensions: Extension[];
diagnosticsExtension: Extension | LSPClientExtension | null;
Expand Down Expand Up @@ -764,6 +784,7 @@ export class LspClientManager {
},
workspace: {
configuration: true,
workspaceFolders: true,
},
},
};
Expand Down Expand Up @@ -1010,7 +1031,14 @@ export class LspClientManager {
await waitForInitialization(transportHandle.ready, signal, server.id);
client = new LSPClient(clientConfig) as ExtendedLSPClient;
client.__acodeServerId = server.id;
connectClient(client, transportHandle.transport, initializationOptions);
connectClient(
client,
transportHandle.transport,
initializationOptions,
scope === "workspace" && server.useWorkspaceFolders
? null
: normalizedRootUri,
);
await waitForInitialization(client.initializing, signal, server.id);
if (!client.__acodeLoggedInfo) {
// Log root URI info to console
Expand All @@ -1032,7 +1060,13 @@ export class LspClientManager {
);
}
logLspInfo(`[LSP:${server.id}] initialized`);
addLspLog(server.id, "info", "Initialized");
addLspLog(
server.id,
"info",
normalizedRootUri
? `Initialized workspace ${normalizedRootUri}`
: "Initialized without a workspace root",
);
client.__acodeLoggedInfo = true;
}
} catch (error) {
Expand Down