language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-29 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Simplify TS reload logic

Browse source 
Fixes #3164
This commit is contained in:
Aleksey Kladov 2020-02-17 12:17:01 +01:00
parent fcf15cc05a
commit dcdbbddd16
6 changed files with 51 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

21
editors/code/src/main.ts
View file

@ -11,6 +11,23 @@ let ctx: Ctx | undefined;
export async function activate(context: vscode.ExtensionContext) {
ctx = new Ctx(context);
ctx.registerCommand('reload', (ctx) => {
return async () => {
vscode.window.showInformationMessage('Reloading rust-analyzer...');
// @DanTup maneuver
// https://github.com/microsoft/vscode/issues/45774#issuecomment-373423895
await deactivate()
for (const sub of ctx.subscriptions) {
try {
sub.dispose();
} catch (e) {
console.error(e);
}
}
await activate(context)
}
})
// Commands which invokes manually via command palette, shortcut, etc.
ctx.registerCommand('analyzerStatus', commands.analyzerStatus);
ctx.registerCommand('collectGarbage', commands.collectGarbage);
@ -20,7 +37,6 @@ export async function activate(context: vscode.ExtensionContext) {
ctx.registerCommand('syntaxTree', commands.syntaxTree);
ctx.registerCommand('expandMacro', commands.expandMacro);
ctx.registerCommand('run', commands.run);
ctx.registerCommand('reload', commands.reload);
ctx.registerCommand('onEnter', commands.onEnter);
ctx.registerCommand('ssr', commands.ssr)
@ -38,7 +54,7 @@ export async function activate(context: vscode.ExtensionContext) {
//
// This a horribly, horribly wrong way to deal with this problem.
try {
await ctx.restartServer();
await ctx.startServer();
} catch (e) {
vscode.window.showErrorMessage(e.message);
}
@ -47,4 +63,5 @@ export async function activate(context: vscode.ExtensionContext) {
export async function deactivate() {
await ctx?.client?.stop();
ctx = undefined;
}