From 48c451129abce37e221c2e7d657a715b2f9d395d Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Mon, 30 Oct 2017 07:59:24 +0100 Subject: [PATCH] do not log promise canceled messages --- .../parts/quickopen/browser/commandsHandler.ts | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts index 8b5d93e1438d5..27ed3dfa3ffe3 100644 --- a/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts +++ b/src/vs/workbench/parts/quickopen/browser/commandsHandler.ts @@ -33,6 +33,7 @@ import { BoundedMap, ISerializedBoundedLinkedMap } from 'vs/base/common/map'; import { IConfigurationService } from 'vs/platform/configuration/common/configuration'; import { ResolvedKeybinding } from 'vs/base/common/keyCodes'; import { IEditorGroupService } from 'vs/workbench/services/group/common/groupService'; +import { isPromiseCanceledError } from 'vs/base/common/errors'; export const ALL_COMMANDS_PREFIX = '>'; @@ -263,9 +264,13 @@ abstract class BaseCommandEntry extends QuickOpenEntryGroup { return nls.localize('entryAriaLabel', "{0}, commands", this.getLabel()); } - protected onError(error?: Error): void; - protected onError(messagesWithAction?: IMessageWithAction): void; - protected onError(arg1?: any): void { + private onError(error?: Error): void; + private onError(messagesWithAction?: IMessageWithAction): void; + private onError(arg1?: any): void { + if (isPromiseCanceledError(arg1)) { + return; + } + const messagesWithAction: IMessageWithAction = arg1; if (messagesWithAction && typeof messagesWithAction.message === 'string' && Array.isArray(messagesWithAction.actions)) { this.messageService.show(Severity.Error, messagesWithAction);