mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-21 01:29:59 +00:00
Implement client-side of SnippetTextEdit
This commit is contained in:
parent
2bf6b16a7f
commit
3dd68c1ba3
3 changed files with 81 additions and 2 deletions
|
@ -31,7 +31,39 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
|
|||
const res = await next(document, token);
|
||||
if (res === undefined) throw new Error('busy');
|
||||
return res;
|
||||
},
|
||||
async provideCodeActions(document: vscode.TextDocument, range: vscode.Range, context: vscode.CodeActionContext, token: vscode.CancellationToken, _next: lc.ProvideCodeActionsSignature) {
|
||||
const params: lc.CodeActionParams = {
|
||||
textDocument: client.code2ProtocolConverter.asTextDocumentIdentifier(document),
|
||||
range: client.code2ProtocolConverter.asRange(range),
|
||||
context: client.code2ProtocolConverter.asCodeActionContext(context)
|
||||
};
|
||||
return client.sendRequest(lc.CodeActionRequest.type, params, token).then((values) => {
|
||||
if (values === null) return undefined;
|
||||
const result: (vscode.CodeAction | vscode.Command)[] = [];
|
||||
for (const item of values) {
|
||||
if (lc.CodeAction.is(item)) {
|
||||
const action = client.protocol2CodeConverter.asCodeAction(item);
|
||||
if (isSnippetEdit(item)) {
|
||||
action.command = {
|
||||
command: "rust-analyzer.applySnippetWorkspaceEdit",
|
||||
title: "",
|
||||
arguments: [action.edit],
|
||||
};
|
||||
action.edit = undefined;
|
||||
}
|
||||
result.push(action);
|
||||
} else {
|
||||
const command = client.protocol2CodeConverter.asCommand(item);
|
||||
result.push(command);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
},
|
||||
(_error) => undefined
|
||||
);
|
||||
}
|
||||
|
||||
} as any
|
||||
};
|
||||
|
||||
|
@ -42,7 +74,7 @@ export function createClient(serverPath: string, cwd: string): lc.LanguageClient
|
|||
clientOptions,
|
||||
);
|
||||
|
||||
// To turn on all proposed features use: res.registerProposedFeatures();
|
||||
// To turn on all proposed features use: client.registerProposedFeatures();
|
||||
// Here we want to enable CallHierarchyFeature and SemanticTokensFeature
|
||||
// since they are available on stable.
|
||||
// Note that while these features are stable in vscode their LSP protocol
|
||||
|
@ -58,8 +90,20 @@ class SnippetTextEditFeature implements lc.StaticFeature {
|
|||
fillClientCapabilities(capabilities: lc.ClientCapabilities): void {
|
||||
const caps: any = capabilities.experimental ?? {};
|
||||
caps.snippetTextEdit = true;
|
||||
capabilities.experimental = caps
|
||||
capabilities.experimental = caps;
|
||||
}
|
||||
initialize(_capabilities: lc.ServerCapabilities<any>, _documentSelector: lc.DocumentSelector | undefined): void {
|
||||
}
|
||||
}
|
||||
|
||||
function isSnippetEdit(action: lc.CodeAction): boolean {
|
||||
const documentChanges = action.edit?.documentChanges ?? [];
|
||||
for (const edit of documentChanges) {
|
||||
if (lc.TextDocumentEdit.is(edit)) {
|
||||
if (edit.edits.some((indel) => (indel as any).insertTextFormat === lc.InsertTextFormat.Snippet)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue