diff options
author | Veetaha <[email protected]> | 2020-07-05 19:10:31 +0100 |
---|---|---|
committer | Veetaha <[email protected]> | 2020-07-05 19:10:31 +0100 |
commit | 46163acf62a94ec603be444294e119933c953a84 (patch) | |
tree | 6ab6a643f8ae0d4486b4078c757f8a31a93d0111 /editors/code | |
parent | 13872543e074adc153b440660beda441fd562f53 (diff) |
Revert "Dispose logger on extension deactivation"
This reverts commit 13872543e074adc153b440660beda441fd562f53.
That commit was wrong because we use-after-free the logger
Diffstat (limited to 'editors/code')
-rw-r--r-- | editors/code/src/main.ts | 2 | ||||
-rw-r--r-- | editors/code/src/util.ts | 4 |
2 files changed, 0 insertions, 6 deletions
diff --git a/editors/code/src/main.ts b/editors/code/src/main.ts index f22981930..5877be8b2 100644 --- a/editors/code/src/main.ts +++ b/editors/code/src/main.ts | |||
@@ -49,8 +49,6 @@ async function tryActivate(context: vscode.ExtensionContext) { | |||
49 | ); | 49 | ); |
50 | context.subscriptions.push(defaultOnEnter); | 50 | context.subscriptions.push(defaultOnEnter); |
51 | 51 | ||
52 | context.subscriptions.push(log); | ||
53 | |||
54 | const config = new Config(context); | 52 | const config = new Config(context); |
55 | const state = new PersistentState(context.globalState); | 53 | const state = new PersistentState(context.globalState); |
56 | const serverPath = await bootstrap(config, state).catch(err => { | 54 | const serverPath = await bootstrap(config, state).catch(err => { |
diff --git a/editors/code/src/util.ts b/editors/code/src/util.ts index 6b07d448b..78fe6f5da 100644 --- a/editors/code/src/util.ts +++ b/editors/code/src/util.ts | |||
@@ -18,10 +18,6 @@ export const log = new class { | |||
18 | private enabled = true; | 18 | private enabled = true; |
19 | private readonly output = vscode.window.createOutputChannel("Rust Analyzer Client"); | 19 | private readonly output = vscode.window.createOutputChannel("Rust Analyzer Client"); |
20 | 20 | ||
21 | dispose() { | ||
22 | log.output.dispose(); | ||
23 | } | ||
24 | |||
25 | setEnabled(yes: boolean): void { | 21 | setEnabled(yes: boolean): void { |
26 | log.enabled = yes; | 22 | log.enabled = yes; |
27 | } | 23 | } |