From 705fe98da293d95d19c68f2ef24679fc4c392c1b Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Wed, 12 Apr 2017 17:50:54 +0200 Subject: [PATCH] Fixes #24022 --- src/vs/platform/keybinding/common/keybindingResolver.ts | 8 +------- .../test/common/abstractKeybindingService.test.ts | 2 +- .../keybinding/test/common/keybindingResolver.test.ts | 2 +- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts index bed90ff476d..28cef4ad27c 100644 --- a/src/vs/platform/keybinding/common/keybindingResolver.ts +++ b/src/vs/platform/keybinding/common/keybindingResolver.ts @@ -19,14 +19,12 @@ export interface IResolveResult { export class KeybindingResolver { private readonly _defaultKeybindings: ResolvedKeybindingItem[]; private readonly _keybindings: ResolvedKeybindingItem[]; - private readonly _shouldWarnOnConflict: boolean; private readonly _defaultBoundCommands: Map; private readonly _map: Map; private readonly _lookupMap: Map; - constructor(defaultKeybindings: ResolvedKeybindingItem[], overrides: ResolvedKeybindingItem[], shouldWarnOnConflict: boolean = true) { + constructor(defaultKeybindings: ResolvedKeybindingItem[], overrides: ResolvedKeybindingItem[]) { this._defaultKeybindings = defaultKeybindings; - this._shouldWarnOnConflict = shouldWarnOnConflict; this._defaultBoundCommands = new Map(); for (let i = 0, len = defaultKeybindings.length; i < len; i++) { @@ -125,10 +123,6 @@ export class KeybindingResolver { if (KeybindingResolver.whenIsEntirelyIncluded(true, conflict.when, item.when)) { // `item` completely overwrites `conflict` - if (this._shouldWarnOnConflict && item.isDefault) { - console.warn('Conflict detected, command `' + conflict.command + '` cannot be triggered due to ' + item.command); - } - // Remove conflict from the lookupMap this._removeFromLookupMap(conflict); } diff --git a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts index 10fe4a3d084..64be8f6ad36 100644 --- a/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts +++ b/src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts @@ -140,7 +140,7 @@ suite('AbstractKeybindingService', () => { } }; - let resolver = new KeybindingResolver(items, [], false); + let resolver = new KeybindingResolver(items, []); return new TestKeybindingService(resolver, contextKeyService, commandService, messageService, statusbarService); }; diff --git a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts index 52a09d4a9f0..13088ab90c2 100644 --- a/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts +++ b/src/vs/platform/keybinding/test/common/keybindingResolver.test.ts @@ -322,7 +322,7 @@ suite('KeybindingResolver', () => { ) ]; - let resolver = new KeybindingResolver(items, [], false); + let resolver = new KeybindingResolver(items, []); let testKey = (commandId: string, expectedKeys: number[]) => { // Test lookup -- GitLab