Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-14 06:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17709 - Young-Flash:hover_tooltip, r=Veykril

Browse source 
fix: tweak hover/tooltip links

close https://github.com/rust-lang/rust-analyzer/issues/17628
This commit is contained in:
bors 2024-07-26 16:12:50 +00:00
commit aae54dde8c
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
editors/code/src/client.ts
View file

@ -392,14 +392,18 @@ function isCodeActionWithoutEditsAndCommands(value: any): boolean {
// to proxy around that. We store the last hover's reference command link
// here, as only one hover can be active at a time, and we don't need to
// keep a history of these.
export let HOVER_REFERENCE_COMMAND: ra.CommandLink | undefined = undefined;
export let HOVER_REFERENCE_COMMAND: ra.CommandLink[] = [];
function renderCommand(cmd: ra.CommandLink): string {
HOVER_REFERENCE_COMMAND = cmd;
return `[${cmd.title}](command:rust-analyzer.hoverRefCommandProxy '${cmd.tooltip}')`;
HOVER_REFERENCE_COMMAND.push(cmd);
return `[${cmd.title}](command:rust-analyzer.hoverRefCommandProxy?${
HOVER_REFERENCE_COMMAND.length - 1
} '${cmd.tooltip}')`;
}
function renderHoverActions(actions: ra.CommandLinkGroup[]): vscode.MarkdownString {
// clean up the previous hover ref command
HOVER_REFERENCE_COMMAND = [];
const text = actions
.map(
(group) =>

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

@ -1203,9 +1203,10 @@ export function newDebugConfig(ctx: CtxInit): Cmd {
}
export function hoverRefCommandProxy(_: Ctx): Cmd {
return async () => {
if (HOVER_REFERENCE_COMMAND) {
const { command, arguments: args = [] } = HOVER_REFERENCE_COMMAND;
return async (index: number) => {
const link = HOVER_REFERENCE_COMMAND[index];
if (link) {
const { command, arguments: args = [] } = link;
await vscode.commands.executeCommand(command, ...args);
}
};