mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #14678 - Veykril:restart-server, r=Veykril

Browse Source 
fix: Fix restart server button trying to start instead of restart the server
This commit is contained in:
bors 2023-04-28 19:35:05 +00:00
commit 370b72c7dd
5 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/hir-def/src/nameres/collector.rs
View File

@ -1874,7 +1874,6 @@ fn push_child_module(
let vis = def_map
.resolve_visibility(self.def_collector.db, self.module_id, visibility, false)
.unwrap_or(Visibility::Public);
let modules = &mut def_map.modules;
let origin = match definition {
None => ModuleOrigin::Inline {
definition: declaration,
@ -1888,6 +1887,7 @@ fn push_child_module(
},
};
let modules = &mut def_map.modules;
let res = modules.alloc(ModuleData::new(origin, vis));
modules[res].parent = Some(self.module_id);
for (name, mac) in modules[self.module_id].scope.collect_legacy_macros() {

4
editors/code/package.json
View File

@ -211,7 +211,7 @@
"category": "rust-analyzer"
},
{
"command": "rust-analyzer.reload",
"command": "rust-analyzer.restartServer",
"title": "Restart server",
"category": "rust-analyzer"
},
@ -1909,7 +1909,7 @@
"when": "inRustProject"
},
{
"command": "rust-analyzer.reload",
"command": "rust-analyzer.restartServer",
"when": "inRustProject"
},
{

5
editors/code/src/config.ts
View File

@ -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);
}
}

4
editors/code/src/ctx.ts
View File

@ -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`;

4
editors/code/src/main.ts
View File

@ -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();
},
},