fix: tweak hover/tooltip links

lnicola · Jul 26, 2024 · b5481fc · b5481fc
1 parent 716c7cc
commit b5481fc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/tools/rust-analyzer/editors/code/src/client.ts b/src/tools/rust-analyzer/editors/code/src/client.ts
@@ -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) =>

diff --git a/src/tools/rust-analyzer/editors/code/src/commands.ts b/src/tools/rust-analyzer/editors/code/src/commands.ts
@@ -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);
  }
  };