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

Support multiple parents in parentModule in vscode-client

Browse source
This commit is contained in:
Lukas Wirth 2021-03-15 15:49:20 +01:00
parent 2e3c156b0e
commit f05fef7063
1 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -170,22 +170,28 @@ export function parentModule(ctx: Ctx): Cmd {
const client = ctx.client; const client = ctx.client;
if (!editor || !client) return; if (!editor || !client) return;
const response = await client.sendRequest(ra.parentModule, { const locations = await client.sendRequest(ra.parentModule, {
textDocument: ctx.client.code2ProtocolConverter.asTextDocumentIdentifier(editor.document), textDocument: ctx.client.code2ProtocolConverter.asTextDocumentIdentifier(editor.document),
position: client.code2ProtocolConverter.asPosition( position: client.code2ProtocolConverter.asPosition(
editor.selection.active, editor.selection.active,
), ),
}); });
const loc = response[0];
if (!loc) return;
const uri = client.protocol2CodeConverter.asUri(loc.targetUri); if (locations.length === 1) {
const range = client.protocol2CodeConverter.asRange(loc.targetRange); const loc = locations[0];
const doc = await vscode.workspace.openTextDocument(uri); const uri = client.protocol2CodeConverter.asUri(loc.targetUri);
const e = await vscode.window.showTextDocument(doc); const range = client.protocol2CodeConverter.asRange(loc.targetRange);
e.selection = new vscode.Selection(range.start, range.start);
e.revealRange(range, vscode.TextEditorRevealType.InCenter); const doc = await vscode.workspace.openTextDocument(uri);
const e = await vscode.window.showTextDocument(doc);
e.selection = new vscode.Selection(range.start, range.start);
e.revealRange(range, vscode.TextEditorRevealType.InCenter);
} else {
const uri = editor.document.uri.toString();
const position = client.code2ProtocolConverter.asPosition(editor.selection.active);
await showReferencesImpl(client, uri, position, locations.map(loc => lc.Location.create(loc.targetUri, loc.targetRange)));
}
}; };
} }