From ee02213e65b1fd9c5e331ffe4a1ebd1e2ebab9c8 Mon Sep 17 00:00:00 2001
From: Lukas Wirth <lukastw97@gmail.com>
Date: Sun, 26 Mar 2023 08:39:28 +0200
Subject: Handle proc macro fetching via OpQueue

---
 editors/code/package.json    | 4 ++--
 editors/code/src/commands.ts | 4 ++--
 editors/code/src/ctx.ts      | 2 +-
 editors/code/src/lsp_ext.ts  | 2 +-
 editors/code/src/main.ts     | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'editors/code')

diff --git a/editors/code/package.json b/editors/code/package.json
index 42cbc0e0d1f..4e57bf0e29b 100644
--- a/editors/code/package.json
+++ b/editors/code/package.json
@@ -200,8 +200,8 @@
                 "category": "rust-analyzer"
             },
             {
-                "command": "rust-analyzer.reloadProcMacros",
-                "title": "Reload proc macros and build scripts",
+                "command": "rust-analyzer.rebuildProcMacros",
+                "title": "Rebuild proc macros and build scripts",
                 "category": "rust-analyzer"
             },
             {
diff --git a/editors/code/src/commands.ts b/editors/code/src/commands.ts
index 8ce3466ed44..486127d005a 100644
--- a/editors/code/src/commands.ts
+++ b/editors/code/src/commands.ts
@@ -749,8 +749,8 @@ export function reloadWorkspace(ctx: CtxInit): Cmd {
     return async () => ctx.client.sendRequest(ra.reloadWorkspace);
 }
 
-export function reloadProcMacros(ctx: CtxInit): Cmd {
-    return async () => ctx.client.sendRequest(ra.reloadProcMacros);
+export function rebuildProcMacros(ctx: CtxInit): Cmd {
+    return async () => ctx.client.sendRequest(ra.rebuildProcMacros);
 }
 
 export function addProject(ctx: CtxInit): Cmd {
diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts
index 8da8b0d63a1..89264ebe469 100644
--- a/editors/code/src/ctx.ts
+++ b/editors/code/src/ctx.ts
@@ -383,7 +383,7 @@ export class Ctx {
             "\n\n[Reload Workspace](command:rust-analyzer.reloadWorkspace)"
         );
         statusBar.tooltip.appendMarkdown(
-            "\n\n[Rebuild Proc Macros](command:rust-analyzer.reloadProcMacros)"
+            "\n\n[Rebuild Proc Macros](command:rust-analyzer.rebuildProcMacros)"
         );
         statusBar.tooltip.appendMarkdown("\n\n[Restart server](command:rust-analyzer.startServer)");
         statusBar.tooltip.appendMarkdown("\n\n[Stop server](command:rust-analyzer.stopServer)");
diff --git a/editors/code/src/lsp_ext.ts b/editors/code/src/lsp_ext.ts
index a03777d1c0a..857f0ed3f60 100644
--- a/editors/code/src/lsp_ext.ts
+++ b/editors/code/src/lsp_ext.ts
@@ -43,7 +43,7 @@ export const relatedTests = new lc.RequestType<lc.TextDocumentPositionParams, Te
     "rust-analyzer/relatedTests"
 );
 export const reloadWorkspace = new lc.RequestType0<null, void>("rust-analyzer/reloadWorkspace");
-export const reloadProcMacros = new lc.RequestType0<null, void>("rust-analyzer/reloadProcMacros");
+export const rebuildProcMacros = new lc.RequestType0<null, void>("rust-analyzer/reloadProcMacros");
 
 export const runFlycheck = new lc.NotificationType<{
     textDocument: lc.TextDocumentIdentifier | null;
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts
index 7079f235cab..de40f99e003 100644
--- a/editors/code/src/main.ts
+++ b/editors/code/src/main.ts
@@ -153,7 +153,7 @@ function createCommands(): Record<string, CommandFactory> {
         memoryUsage: { enabled: commands.memoryUsage },
         shuffleCrateGraph: { enabled: commands.shuffleCrateGraph },
         reloadWorkspace: { enabled: commands.reloadWorkspace },
-        reloadProcMacros: { enabled: commands.reloadProcMacros },
+        rebuildProcMacros: { enabled: commands.rebuildProcMacros },
         addProject: { enabled: commands.addProject },
         matchingBrace: { enabled: commands.matchingBrace },
         joinLines: { enabled: commands.joinLines },
-- 
cgit 1.4.1-3-g733a5