diff options
| author | Lukas Wirth <lukastw97@gmail.com> | 2023-04-28 21:34:31 +0200 |
|---|---|---|
| committer | Lukas Wirth <lukastw97@gmail.com> | 2023-04-28 21:34:31 +0200 |
| commit | cf8f13b531f649e37202780c7f6353db911062ba (patch) | |
| tree | cd230db07948a29123794711ca9cb93298f63d38 /editors/code/src | |
| parent | 3b97978c49829bdb63c198ee6bcf32c450f5bc0e (diff) | |
| download | rust-cf8f13b531f649e37202780c7f6353db911062ba.tar.gz rust-cf8f13b531f649e37202780c7f6353db911062ba.zip | |
fix: Fix restart server button trying to start instead of restart the server
Diffstat (limited to 'editors/code/src')
| -rw-r--r-- | editors/code/src/config.ts | 5 | ||||
| -rw-r--r-- | editors/code/src/ctx.ts | 4 | ||||
| -rw-r--r-- | editors/code/src/main.ts | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/editors/code/src/config.ts b/editors/code/src/config.ts index da7c74c28ba..d6b8cc7a56a 100644 --- a/editors/code/src/config.ts +++ b/editors/code/src/config.ts @@ -21,7 +21,6 @@ export class Config { "serverPath", "server", "files", - "lens", // works as lens.* ].map((opt) => `${this.rootSection}.${opt}`); readonly package: { @@ -70,7 +69,7 @@ export class Config { if (!requiresReloadOpt) return; if (this.restartServerOnConfigChange) { - await vscode.commands.executeCommand("rust-analyzer.reload"); + await vscode.commands.executeCommand("rust-analyzer.restartServer"); return; } @@ -78,7 +77,7 @@ export class Config { const userResponse = await vscode.window.showInformationMessage(message, "Restart now"); if (userResponse) { - const command = "rust-analyzer.reload"; + const command = "rust-analyzer.restartServer"; await vscode.commands.executeCommand(command); } } diff --git a/editors/code/src/ctx.ts b/editors/code/src/ctx.ts index 0ffa42c2a5a..567b9216bc1 100644 --- a/editors/code/src/ctx.ts +++ b/editors/code/src/ctx.ts @@ -390,7 +390,9 @@ export class Ctx { statusBar.tooltip.appendMarkdown( "\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[Restart server](command:rust-analyzer.restartServer)" + ); statusBar.tooltip.appendMarkdown("\n\n[Stop server](command:rust-analyzer.stopServer)"); if (!status.quiescent) icon = "$(sync~spin) "; statusBar.text = `${icon}rust-analyzer`; diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index de40f99e003..6c990f804b0 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts @@ -120,13 +120,11 @@ function createCommands(): Record<string, CommandFactory> { enabled: commands.onEnter, disabled: (_) => () => vscode.commands.executeCommand("default:type", { text: "\n" }), }, - reload: { + restartServer: { enabled: (ctx) => async () => { - void vscode.window.showInformationMessage("Reloading rust-analyzer..."); await ctx.restart(); }, disabled: (ctx) => async () => { - void vscode.window.showInformationMessage("Reloading rust-analyzer..."); await ctx.start(); }, }, |
