Fixes microsoft#24022

alexdima · alexdima · commit 705fe98da293 · 2017-04-12T17:50:54.000+02:00
diff --git 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<string, boolean>;
 	private readonly _map: Map<string, ResolvedKeybindingItem[]>;
 	private readonly _lookupMap: Map<string, ResolvedKeybindingItem[]>;
 
-	constructor(defaultKeybindings: ResolvedKeybindingItem[], overrides: ResolvedKeybindingItem[], shouldWarnOnConflict: boolean = true) {
+	constructor(defaultKeybindings: ResolvedKeybindingItem[], overrides: ResolvedKeybindingItem[]) {
 		this._defaultKeybindings = defaultKeybindings;
-		this._shouldWarnOnConflict = shouldWarnOnConflict;
 
 		this._defaultBoundCommands = new Map<string, boolean>();
 		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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ suite('AbstractKeybindingService', () => {`
`140`	`140`	`}`
`141`	`141`	`};`
`142`	`142`
`143`		`- let resolver = new KeybindingResolver(items, [], false);`
	`143`	`+ let resolver = new KeybindingResolver(items, []);`
`144`	`144`
`145`	`145`	`return new TestKeybindingService(resolver, contextKeyService, commandService, messageService, statusbarService);`
`146`	`146`	`};`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ suite('KeybindingResolver', () => {`
`322`	`322`	`)`
`323`	`323`	`];`
`324`	`324`
`325`		`- let resolver = new KeybindingResolver(items, [], false);`
	`325`	`+ let resolver = new KeybindingResolver(items, []);`
`326`	`326`
`327`	`327`	`let testKey = (commandId: string, expectedKeys: number[]) => {`
`328`	`328`	`// Test lookup`