From baa82bbe3dcc680461313bf3fbe2082e81de57a1 Mon Sep 17 00:00:00 2001 From: Anton Kosyakov Date: Fri, 1 Feb 2019 08:09:15 +0000 Subject: [PATCH] fix #4214: make `OutputChannel.show` actually show Signed-off-by: Anton Kosyakov --- .../src/main/browser/output-channel-registry-main.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts b/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts index 18030fc7174db..a6daf5897e9f9 100644 --- a/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts +++ b/packages/plugin-ext/src/main/browser/output-channel-registry-main.ts @@ -59,17 +59,14 @@ export class OutputChannelRegistryMainImpl implements OutputChannelRegistryMain return Promise.resolve(); } - $reveal(channelName: string, preserveFocus: boolean): PromiseLike { + async $reveal(channelName: string, preserveFocus: boolean): Promise { const outputChannel = this.getChannel(channelName); if (outputChannel) { + const activate = !preserveFocus; + const reveal = preserveFocus; + this.commonOutputWidget = await this.outputContribution.openView({ activate, reveal }); outputChannel.setVisibility(true); - return this.outputContribution.openView({ activate: !preserveFocus }).then((outputWidget: OutputWidget) => { - this.commonOutputWidget = outputWidget; - return Promise.resolve(); - }); } - - return Promise.resolve(); } $close(channelName: string): PromiseLike {