about summary refs log tree commit diff
path: root/editors/code/src
diff options
context:
space:
mode:
authorLukas Wirth <lukastw97@gmail.com>2023-03-26 08:39:28 +0200
committerLukas Wirth <lukastw97@gmail.com>2023-03-26 09:33:41 +0200
commitee02213e65b1fd9c5e331ffe4a1ebd1e2ebab9c8 (patch)
tree31ea6d4215d51ffe5b70ddb3166b8aabb87b2976 /editors/code/src
parent27c076a36744f7f8be3b950891cbc0350dc29f6e (diff)
downloadrust-ee02213e65b1fd9c5e331ffe4a1ebd1e2ebab9c8.tar.gz
rust-ee02213e65b1fd9c5e331ffe4a1ebd1e2ebab9c8.zip
Handle proc macro fetching via OpQueue
Diffstat (limited to 'editors/code/src')
-rw-r--r--editors/code/src/commands.ts4
-rw-r--r--editors/code/src/ctx.ts2
-rw-r--r--editors/code/src/lsp_ext.ts2
-rw-r--r--editors/code/src/main.ts2
4 files changed, 5 insertions, 5 deletions
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 },