From 779e84fa0245641edeb222b761382437489ba86e Mon Sep 17 00:00:00 2001 From: Aleksander Boruch-Gruszecki Date: Fri, 2 Nov 2018 08:40:11 +0100 Subject: [PATCH] Create local output channel if tracing is disabled Remember to actually check if zip URL is set before zipping. Checking if url is undefined was meaningless, since it now defaults to empty string (in package.json). --- vscode-dotty/src/tracer.ts | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/vscode-dotty/src/tracer.ts b/vscode-dotty/src/tracer.ts index 9d5430a5bc16..c9a110a3465d 100644 --- a/vscode-dotty/src/tracer.ts +++ b/vscode-dotty/src/tracer.ts @@ -84,17 +84,15 @@ export class Tracer { run(): vscode.OutputChannel | undefined { const consentCommandDisposable = vscode.commands.registerCommand(consentCommandName, () => this.askForTracingConsent()) - if (this.isTracingEnabled) { - if (this.tracingConsent.get() === 'no-answer') this.askForTracingConsent() - this.initializeAsyncWorkspaceDump() - - const lspOutputChannel = this.createLspOutputChannel() - const statusBarItem = this.createStatusBarItem() - for (const disposable of [consentCommandDisposable, lspOutputChannel, statusBarItem]) { - if (disposable) this.ctx.extensionContext.subscriptions.push(disposable) - } - return lspOutputChannel + if (this.isTracingEnabled && this.tracingConsent.get() === 'no-answer') this.askForTracingConsent() + this.initializeAsyncWorkspaceDump() + + const lspOutputChannel = this.createLspOutputChannel() + const statusBarItem = this.createStatusBarItem() + for (const disposable of [consentCommandDisposable, lspOutputChannel, statusBarItem]) { + if (disposable) this.ctx.extensionContext.subscriptions.push(disposable) } + return lspOutputChannel } private askForTracingConsent(): void { @@ -111,7 +109,7 @@ export class Tracer { private initializeAsyncWorkspaceDump() { const url = this.remoteWorkspaceDumpUrl - if (url === undefined) return + if (!url) return const doInitialize = () => { try {