Skip to content

Fix LSP configuration request handling #21297

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

Open
michaelgruenewald wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −9
Open

Fix LSP configuration request handling #21297

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 16 additions & 9 deletions editors/code/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,24 @@ export async function createClient(
},
async configuration(
params: lc.ConfigurationParams,
token: vscode.CancellationToken,
next: lc.ConfigurationRequest.HandlerSignature,
_token: vscode.CancellationToken,
_next: lc.ConfigurationRequest.HandlerSignature,
) {
const resp = await next(params, token);
if (resp && Array.isArray(resp)) {
return resp.map((val) => {
return prepareVSCodeConfig(val);
});
} else {
return resp;
// The rust-analyzer LSP only ever asks for the "rust-analyzer"
// section, so we only need to support that. Instead of letting
// the vscode-languageclient handle it, use the `cfg` property
// in the config.
if (
params.items.length !== 1 ||
params.items[0]?.section !== "rust-analyzer" ||
params.items[0]?.scopeUri !== undefined
) {
return new lc.ResponseError(
lc.ErrorCodes.InvalidParams,
'Only the "rust-analyzer" config section is supported.',
);
}
return [prepareVSCodeConfig(config.cfg)];
},
},
async handleDiagnostics(
Expand Down