diff options
Diffstat (limited to 'editors/code/src/main.ts')
-rw-r--r-- | editors/code/src/main.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index 0ad7ef1bb..a22e0bc66 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -11,7 +11,7 @@ import { Config } from './config'; | |||
11 | let ctx: Ctx | undefined; | 11 | let ctx: Ctx | undefined; |
12 | 12 | ||
13 | export async function activate(context: vscode.ExtensionContext) { | 13 | export async function activate(context: vscode.ExtensionContext) { |
14 | const config = new Config(context) | 14 | const config = new Config(context); |
15 | 15 | ||
16 | const serverPath = await ensureServerBinary(config.serverSource); | 16 | const serverPath = await ensureServerBinary(config.serverSource); |
17 | if (serverPath == null) { | 17 | if (serverPath == null) { |
@@ -33,7 +33,7 @@ export async function activate(context: vscode.ExtensionContext) { | |||
33 | vscode.window.showInformationMessage('Reloading rust-analyzer...'); | 33 | vscode.window.showInformationMessage('Reloading rust-analyzer...'); |
34 | // @DanTup maneuver | 34 | // @DanTup maneuver |
35 | // https://github.com/microsoft/vscode/issues/45774#issuecomment-373423895 | 35 | // https://github.com/microsoft/vscode/issues/45774#issuecomment-373423895 |
36 | await deactivate() | 36 | await deactivate(); |
37 | for (const sub of ctx.subscriptions) { | 37 | for (const sub of ctx.subscriptions) { |
38 | try { | 38 | try { |
39 | sub.dispose(); | 39 | sub.dispose(); |
@@ -41,9 +41,9 @@ export async function activate(context: vscode.ExtensionContext) { | |||
41 | console.error(e); | 41 | console.error(e); |
42 | } | 42 | } |
43 | } | 43 | } |
44 | await activate(context) | 44 | await activate(context); |
45 | } | 45 | }; |
46 | }) | 46 | }); |
47 | 47 | ||
48 | ctx.registerCommand('analyzerStatus', commands.analyzerStatus); | 48 | ctx.registerCommand('analyzerStatus', commands.analyzerStatus); |
49 | ctx.registerCommand('collectGarbage', commands.collectGarbage); | 49 | ctx.registerCommand('collectGarbage', commands.collectGarbage); |
@@ -54,7 +54,7 @@ export async function activate(context: vscode.ExtensionContext) { | |||
54 | ctx.registerCommand('expandMacro', commands.expandMacro); | 54 | ctx.registerCommand('expandMacro', commands.expandMacro); |
55 | ctx.registerCommand('run', commands.run); | 55 | ctx.registerCommand('run', commands.run); |
56 | ctx.registerCommand('onEnter', commands.onEnter); | 56 | ctx.registerCommand('onEnter', commands.onEnter); |
57 | ctx.registerCommand('ssr', commands.ssr) | 57 | ctx.registerCommand('ssr', commands.ssr); |
58 | 58 | ||
59 | // Internal commands which are invoked by the server. | 59 | // Internal commands which are invoked by the server. |
60 | ctx.registerCommand('runSingle', commands.runSingle); | 60 | ctx.registerCommand('runSingle', commands.runSingle); |