language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

SSR: Pass current file position through to SSR code.

Browse source 
In a subsequent commit, it will be used for resolving paths.
This commit is contained in:
David Lattimore 2020-07-22 15:00:28 +10:00
parent 02fc3d50ee
commit 3975952601
11 changed files with 88 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

14
editors/code/src/commands.ts
View file

@ -185,15 +185,21 @@ export function parentModule(ctx: Ctx): Cmd {
export function ssr(ctx: Ctx): Cmd {
return async () => {
const editor = vscode.window.activeTextEditor;
const client = ctx.client;
if (!client) return;
if (!editor || !client) return;
const position = editor.selection.active;
let textDocument = { uri: editor.document.uri.toString() };
const options: vscode.InputBoxOptions = {
value: "() ==>> ()",
prompt: "Enter request, for example 'Foo($a) ==> Foo::new($a)' ",
validateInput: async (x: string) => {
try {
await client.sendRequest(ra.ssr, { query: x, parseOnly: true });
await client.sendRequest(ra.ssr, {
query: x, parseOnly: true, textDocument, position,
});
} catch (e) {
return e.toString();
}
@ -208,7 +214,9 @@ export function ssr(ctx: Ctx): Cmd {
title: "Structured search replace in progress...",
cancellable: false,
}, async (_progress, _token) => {
const edit = await client.sendRequest(ra.ssr, { query: request, parseOnly: false });
const edit = await client.sendRequest(ra.ssr, {
query: request, parseOnly: false, textDocument, position
});
await vscode.workspace.applyEdit(client.protocol2CodeConverter.asWorkspaceEdit(edit));
});