clean layer breakages in driver

fixes #57789

src/vs/base/common/keybindingParser.ts

+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+'use strict';
+
+import { Keybinding, SimpleKeybinding, ChordKeybinding, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { OperatingSystem } from 'vs/base/common/platform';
+import { ScanCodeBinding, ScanCodeUtils } from 'vs/base/common/scanCode';
+
+export class KeybindingParser {
+
+	private static _readModifiers(input: string) {
+		input = input.toLowerCase().trim();
+
+		let ctrl = false;
+		let shift = false;
+		let alt = false;
+		let meta = false;
+
+		let matchedModifier: boolean;
+
+		do {
+			matchedModifier = false;
+			if (/^ctrl(\+|\-)/.test(input)) {
+				ctrl = true;
+				input = input.substr('ctrl-'.length);
+				matchedModifier = true;
+			}
+			if (/^shift(\+|\-)/.test(input)) {
+				shift = true;
+				input = input.substr('shift-'.length);
+				matchedModifier = true;
+			}
+			if (/^alt(\+|\-)/.test(input)) {
+				alt = true;
+				input = input.substr('alt-'.length);
+				matchedModifier = true;
+			}
+			if (/^meta(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('meta-'.length);
+				matchedModifier = true;
+			}
+			if (/^win(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('win-'.length);
+				matchedModifier = true;
+			}
+			if (/^cmd(\+|\-)/.test(input)) {
+				meta = true;
+				input = input.substr('cmd-'.length);
+				matchedModifier = true;
+			}
+		} while (matchedModifier);
+
+		let key: string;
+
+		const firstSpaceIdx = input.indexOf(' ');
+		if (firstSpaceIdx > 0) {
+			key = input.substring(0, firstSpaceIdx);
+			input = input.substring(firstSpaceIdx);
+		} else {
+			key = input;
+			input = '';
+		}
+
+		return {
+			remains: input,
+			ctrl,
+			shift,
+			alt,
+			meta,
+			key
+		};
+	}
+
+	private static parseSimpleKeybinding(input: string): [SimpleKeybinding, string] {
+		const mods = this._readModifiers(input);
+		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
+		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
+	}
+
+	public static parseKeybinding(input: string, OS: OperatingSystem): Keybinding {
+		if (!input) {
+			return null;
+		}
+
+		let [firstPart, remains] = this.parseSimpleKeybinding(input);
+		let chordPart: SimpleKeybinding = null;
+		if (remains.length > 0) {
+			[chordPart] = this.parseSimpleKeybinding(remains);
+		}
+
+		if (chordPart) {
+			return new ChordKeybinding(firstPart, chordPart);
+		}
+		return firstPart;
+	}
+
+	private static parseSimpleUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, string] {
+		const mods = this._readModifiers(input);
+		const scanCodeMatch = mods.key.match(/^\[([^\]]+)\]$/);
+		if (scanCodeMatch) {
+			const strScanCode = scanCodeMatch[1];
+			const scanCode = ScanCodeUtils.lowerCaseToEnum(strScanCode);
+			return [new ScanCodeBinding(mods.ctrl, mods.shift, mods.alt, mods.meta, scanCode), mods.remains];
+		}
+		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
+		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
+	}
+
+	static parseUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, SimpleKeybinding | ScanCodeBinding] {
+		if (!input) {
+			return [null, null];
+		}
+
+		let [firstPart, remains] = this.parseSimpleUserBinding(input);
+		let chordPart: SimpleKeybinding | ScanCodeBinding = null;
+		if (remains.length > 0) {
+			[chordPart] = this.parseSimpleUserBinding(remains);
+		}
+		return [firstPart, chordPart];
+	}
+}
\ No newline at end of file

src/vs/platform/driver/electron-main/driver.ts

@@ -17,13 +17,9 @@ import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayo
 import { OS } from 'vs/base/common/platform';
 import { Emitter, toPromise } from 'vs/base/common/event';
 import { IEnvironmentService } from 'vs/platform/environment/common/environment';
-
-// TODO@joao: bad layering!
-// tslint:disable-next-line:import-patterns
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-// tslint:disable-next-line:import-patterns
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 import { toWinJsPromise } from 'vs/base/common/async';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 class WindowRouter implements IClientRouter {
 
@@ -92,7 +88,7 @@ export class Driver implements IDriver, IWindowDriverRegistry {
 
 	dispatchKeybinding(windowId: number, keybinding: string): TPromise<void> {
 		return this.whenUnfrozen(windowId).then(() => {
-			const [first, second] = KeybindingIO._readUserBinding(keybinding);
+			const [first, second] = KeybindingParser.parseUserBinding(keybinding);
 
 			return this._dispatchKeybinding(windowId, first).then(() => {
 				if (second) {

src/vs/workbench/parts/extensions/electron-browser/extensionEditor.ts

@@ -32,7 +32,6 @@ import { EditorOptions } from 'vs/workbench/common/editor';
 import { ActionBar } from 'vs/base/browser/ui/actionbar/actionbar';
 import { CombinedInstallAction, UpdateAction, EnableAction, DisableAction, ReloadAction, MaliciousStatusLabelAction, DisabledStatusLabelAction, IgnoreExtensionRecommendationAction, UndoIgnoreExtensionRecommendationAction } from 'vs/workbench/parts/extensions/electron-browser/extensionsActions';
 import { WebviewElement } from 'vs/workbench/parts/webview/electron-browser/webviewElement';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding';
 import { DomScrollableElement } from 'vs/base/browser/ui/scrollbar/scrollableElement';
 import { IOpenerService } from 'vs/platform/opener/common/opener';
@@ -50,6 +49,7 @@ import { INotificationService } from 'vs/platform/notification/common/notificati
 import { CancellationToken } from 'vs/base/common/cancellation';
 import { ExtensionsTree, IExtensionData } from 'vs/workbench/parts/extensions/browser/extensionsViewer';
 import { ShowCurrentReleaseNotesAction } from 'vs/workbench/parts/update/electron-browser/update';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 /**  A context key that is set when an extension editor webview has focus. */
 export const KEYBINDING_CONTEXT_EXTENSIONEDITOR_WEBVIEW_FOCUS = new RawContextKey<boolean>('extensionEditorWebviewFocus', undefined);
@@ -1057,7 +1057,7 @@ export class ExtensionEditor extends BaseEditor {
 			case 'darwin': key = rawKeyBinding.mac; break;
 		}
 
-		const keyBinding = KeybindingIO.readKeybinding(key || rawKeyBinding.key, OS);
+		const keyBinding = KeybindingParser.parseKeybinding(key || rawKeyBinding.key, OS);
 		if (!keyBinding) {
 			return null;
 		}

src/vs/workbench/parts/preferences/browser/keybindingsEditorContribution.ts

@@ -22,14 +22,14 @@ import { SmartSnippetInserter } from 'vs/workbench/parts/preferences/common/smar
 import { DefineKeybindingOverlayWidget } from 'vs/workbench/parts/preferences/browser/keybindingWidgets';
 import { FloatingClickWidget } from 'vs/workbench/parts/preferences/browser/preferencesWidgets';
 import { parseTree, Node } from 'vs/base/common/json';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 import { EditorContextKeys } from 'vs/editor/common/editorContextKeys';
 import { WindowsNativeResolvedKeybinding } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
 import { themeColorFromId, ThemeColor } from 'vs/platform/theme/common/themeService';
 import { overviewRulerInfo, overviewRulerError } from 'vs/editor/common/view/editorColorRegistry';
 import { IModelDeltaDecoration, ITextModel, TrackedRangeStickiness, OverviewRulerLane } from 'vs/editor/common/model';
 import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 const NLS_LAUNCH_MESSAGE = nls.localize('defineKeybinding.start', "Define Keybinding");
 const NLS_KB_LAYOUT_ERROR_MESSAGE = nls.localize('defineKeybinding.kbLayoutErrorMessage', "You won't be able to produce this key combination under your current keyboard layout.");
@@ -262,8 +262,8 @@ export class KeybindingEditorDecorationsRenderer extends Disposable {
 			return true;
 		}
 
-		const [parsedA1, parsedA2] = KeybindingIO._readUserBinding(a);
-		const [parsedB1, parsedB2] = KeybindingIO._readUserBinding(b);
+		const [parsedA1, parsedA2] = KeybindingParser.parseUserBinding(a);
+		const [parsedB1, parsedB2] = KeybindingParser.parseUserBinding(b);
 
 		return (
 			this._userBindingEquals(parsedA1, parsedB1)

src/vs/workbench/parts/update/electron-browser/releaseNotesEditor.ts

@@ -25,8 +25,8 @@ import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { addGAParameters } from 'vs/platform/telemetry/node/telemetryNodeUtils';
 import { IWebviewEditorService } from 'vs/workbench/parts/webview/electron-browser/webviewEditorService';
 import { IEditorService, ACTIVE_GROUP } from 'vs/workbench/services/editor/common/editorService';
-import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybindingIO';
 import { WebviewEditorInput } from 'vs/workbench/parts/webview/electron-browser/webviewEditorInput';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 function renderBody(
 	body: string,
@@ -135,7 +135,7 @@ export class ReleaseNotesManager {
 			};
 
 			const kbstyle = (match: string, kb: string) => {
-				const keybinding = KeybindingIO.readKeybinding(kb, OS);
+				const keybinding = KeybindingParser.parseKeybinding(kb, OS);
 
 				if (!keybinding) {
 					return unassigned;

src/vs/workbench/services/keybinding/common/keybindingIO.ts

@@ -4,12 +4,13 @@
  *--------------------------------------------------------------------------------------------*/
 'use strict';
 
-import { Keybinding, SimpleKeybinding, ChordKeybinding, KeyCodeUtils } from 'vs/base/common/keyCodes';
+import { SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { OperatingSystem } from 'vs/base/common/platform';
 import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { ContextKeyExpr } from 'vs/platform/contextkey/common/contextkey';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
-import { ScanCodeBinding, ScanCodeUtils } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 export interface IUserKeybindingItem {
 	firstPart: SimpleKeybinding | ScanCodeBinding;
@@ -39,7 +40,7 @@ export class KeybindingIO {
 	}
 
 	public static readUserKeybindingItem(input: IUserFriendlyKeybinding, OS: OperatingSystem): IUserKeybindingItem {
-		const [firstPart, chordPart] = (typeof input.key === 'string' ? this._readUserBinding(input.key) : [null, null]);
+		const [firstPart, chordPart] = (typeof input.key === 'string' ? KeybindingParser.parseUserBinding(input.key) : [null, null]);
 		const when = (typeof input.when === 'string' ? ContextKeyExpr.deserialize(input.when) : null);
 		const command = (typeof input.command === 'string' ? input.command : null);
 		const commandArgs = (typeof input.args !== 'undefined' ? input.args : undefined);
@@ -51,119 +52,6 @@ export class KeybindingIO {
 			when: when
 		};
 	}
-
-	private static _readModifiers(input: string) {
-		input = input.toLowerCase().trim();
-
-		let ctrl = false;
-		let shift = false;
-		let alt = false;
-		let meta = false;
-
-		let matchedModifier: boolean;
-
-		do {
-			matchedModifier = false;
-			if (/^ctrl(\+|\-)/.test(input)) {
-				ctrl = true;
-				input = input.substr('ctrl-'.length);
-				matchedModifier = true;
-			}
-			if (/^shift(\+|\-)/.test(input)) {
-				shift = true;
-				input = input.substr('shift-'.length);
-				matchedModifier = true;
-			}
-			if (/^alt(\+|\-)/.test(input)) {
-				alt = true;
-				input = input.substr('alt-'.length);
-				matchedModifier = true;
-			}
-			if (/^meta(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('meta-'.length);
-				matchedModifier = true;
-			}
-			if (/^win(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('win-'.length);
-				matchedModifier = true;
-			}
-			if (/^cmd(\+|\-)/.test(input)) {
-				meta = true;
-				input = input.substr('cmd-'.length);
-				matchedModifier = true;
-			}
-		} while (matchedModifier);
-
-		let key: string;
-
-		const firstSpaceIdx = input.indexOf(' ');
-		if (firstSpaceIdx > 0) {
-			key = input.substring(0, firstSpaceIdx);
-			input = input.substring(firstSpaceIdx);
-		} else {
-			key = input;
-			input = '';
-		}
-
-		return {
-			remains: input,
-			ctrl,
-			shift,
-			alt,
-			meta,
-			key
-		};
-	}
-
-	private static _readSimpleKeybinding(input: string): [SimpleKeybinding, string] {
-		const mods = this._readModifiers(input);
-		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
-		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
-	}
-
-	public static readKeybinding(input: string, OS: OperatingSystem): Keybinding {
-		if (!input) {
-			return null;
-		}
-
-		let [firstPart, remains] = this._readSimpleKeybinding(input);
-		let chordPart: SimpleKeybinding = null;
-		if (remains.length > 0) {
-			[chordPart] = this._readSimpleKeybinding(remains);
-		}
-
-		if (chordPart) {
-			return new ChordKeybinding(firstPart, chordPart);
-		}
-		return firstPart;
-	}
-
-	private static _readSimpleUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, string] {
-		const mods = this._readModifiers(input);
-		const scanCodeMatch = mods.key.match(/^\[([^\]]+)\]$/);
-		if (scanCodeMatch) {
-			const strScanCode = scanCodeMatch[1];
-			const scanCode = ScanCodeUtils.lowerCaseToEnum(strScanCode);
-			return [new ScanCodeBinding(mods.ctrl, mods.shift, mods.alt, mods.meta, scanCode), mods.remains];
-		}
-		const keyCode = KeyCodeUtils.fromUserSettings(mods.key);
-		return [new SimpleKeybinding(mods.ctrl, mods.shift, mods.alt, mods.meta, keyCode), mods.remains];
-	}
-
-	static _readUserBinding(input: string): [SimpleKeybinding | ScanCodeBinding, SimpleKeybinding | ScanCodeBinding] {
-		if (!input) {
-			return [null, null];
-		}
-
-		let [firstPart, remains] = this._readSimpleUserBinding(input);
-		let chordPart: SimpleKeybinding | ScanCodeBinding = null;
-		if (remains.length > 0) {
-			[chordPart] = this._readSimpleUserBinding(remains);
-		}
-		return [firstPart, chordPart];
-	}
 }
 
 function rightPaddedString(str: string, minChars: number): string {

src/vs/workbench/services/keybinding/common/keyboardMapper.ts

@@ -7,7 +7,7 @@
 
 import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 
 export interface IKeyboardMapper {
 	dumpDebugInfo(): string;

src/vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts

@@ -10,7 +10,7 @@ import { ResolvedKeybinding, SimpleKeybinding, Keybinding, KeyCode, ChordKeybind
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeBinding, ScanCode, IMMUTABLE_CODE_TO_KEY_CODE } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode, IMMUTABLE_CODE_TO_KEY_CODE } from 'vs/base/common/scanCode';
 
 /**
  * A keyboard mapper to be used when reading the keymap from the OS fails.

src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts

@@ -7,7 +7,7 @@
 
 import { OperatingSystem } from 'vs/base/common/platform';
 import { KeyCode, ResolvedKeybinding, KeyCodeUtils, SimpleKeybinding, Keybinding, KeybindingType, ResolvedKeybindingPart } from 'vs/base/common/keyCodes';
-import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, IMMUTABLE_KEY_CODE_TO_CODE, ScanCodeBinding } from 'vs/base/common/scanCode';
 import { CharCode } from 'vs/base/common/charCode';
 import { UILabelProvider, AriaLabelProvider, UserSettingsLabelProvider, ElectronAcceleratorLabelProvider } from 'vs/base/common/keybindingLabels';
 import { IKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';

src/vs/workbench/services/keybinding/common/windowsKeyboardMapper.ts

@@ -6,7 +6,7 @@
 'use strict';
 
 import { KeyCode, KeyCodeUtils, ResolvedKeybinding, Keybinding, SimpleKeybinding, KeybindingType, ResolvedKeybindingPart } from 'vs/base/common/keyCodes';
-import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCode, ScanCodeUtils, IMMUTABLE_CODE_TO_KEY_CODE, ScanCodeBinding } from 'vs/base/common/scanCode';
 import { CharCode } from 'vs/base/common/charCode';
 import { UILabelProvider, AriaLabelProvider, ElectronAcceleratorLabelProvider, UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
 import { OperatingSystem } from 'vs/base/common/platform';

src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts

@@ -37,6 +37,7 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
 import { onUnexpectedError } from 'vs/base/common/errors';
 import { release } from 'os';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 export class KeyboardMapperFactory {
 	public static readonly INSTANCE = new KeyboardMapperFactory();
@@ -438,7 +439,7 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 	}
 
 	public resolveUserBinding(userBinding: string): ResolvedKeybinding[] {
-		const [firstPart, chordPart] = KeybindingIO._readUserBinding(userBinding);
+		const [firstPart, chordPart] = KeybindingParser.parseUserBinding(userBinding);
 		return this._keyboardMapper.resolveUserBinding(firstPart, chordPart);
 	}
 
@@ -494,10 +495,10 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
 			id: command,
 			when: ContextKeyExpr.deserialize(when),
 			weight: weight,
-			primary: KeybindingIO.readKeybinding(key, OS),
-			mac: mac && { primary: KeybindingIO.readKeybinding(mac, OS) },
-			linux: linux && { primary: KeybindingIO.readKeybinding(linux, OS) },
-			win: win && { primary: KeybindingIO.readKeybinding(win, OS) }
+			primary: KeybindingParser.parseKeybinding(key, OS),
+			mac: mac && { primary: KeybindingParser.parseKeybinding(mac, OS) },
+			linux: linux && { primary: KeybindingParser.parseKeybinding(linux, OS) },
+			win: win && { primary: KeybindingParser.parseKeybinding(win, OS) }
 		};
 
 		if (!desc.primary && !desc.mac && !desc.linux && !desc.win) {

src/vs/workbench/services/keybinding/test/keybindingIO.test.ts

@@ -10,7 +10,8 @@ import { KeybindingIO } from 'vs/workbench/services/keybinding/common/keybinding
 import { OS, OperatingSystem } from 'vs/base/common/platform';
 import { IUserFriendlyKeybinding } from 'vs/platform/keybinding/common/keybinding';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
+import { KeybindingParser } from 'vs/base/common/keybindingParser';
 
 suite('keybindingIO', () => {
 
@@ -28,7 +29,7 @@ suite('keybindingIO', () => {
 		}
 
 		function testOneDeserialization(keybinding: string, _expected: number, msg: string, OS: OperatingSystem): void {
-			let actualDeserialized = KeybindingIO.readKeybinding(keybinding, OS);
+			let actualDeserialized = KeybindingParser.parseKeybinding(keybinding, OS);
 			let expected = createKeybinding(_expected, OS);
 			assert.deepEqual(actualDeserialized, expected, keybinding + ' - ' + msg);
 		}
@@ -119,7 +120,7 @@ suite('keybindingIO', () => {
 
 	test('deserialize scan codes', () => {
 		assert.deepEqual(
-			KeybindingIO._readUserBinding('ctrl+shift+[comma] ctrl+/'),
+			KeybindingParser.parseUserBinding('ctrl+shift+[comma] ctrl+/'),
 			[new ScanCodeBinding(true, true, false, false, ScanCode.Comma), new SimpleKeybinding(true, false, false, false, KeyCode.US_SLASH)]
 		);
 	});

src/vs/workbench/services/keybinding/test/keyboardMapperTestUtils.ts

@@ -11,7 +11,7 @@ import { Keybinding, ResolvedKeybinding, SimpleKeybinding } from 'vs/base/common
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readFile, writeFile } from 'vs/base/node/pfs';
 import { IKeyboardEvent } from 'vs/platform/keybinding/common/keybinding';
-import { ScanCodeBinding } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding } from 'vs/base/common/scanCode';
 import { getPathFromAmdModule } from 'vs/base/common/amd';
 
 export interface IResolvedKeybinding {

src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts

@@ -9,7 +9,7 @@ import { KeyMod, KeyCode, createKeybinding, KeyChord, SimpleKeybinding } from 'v
 import { OperatingSystem } from 'vs/base/common/platform';
 import { IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
 import { MacLinuxFallbackKeyboardMapper } from 'vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 
 suite('keyboardMapper - MAC fallback', () => {
 

src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts

@@ -11,7 +11,7 @@ import { MacLinuxKeyboardMapper, IMacLinuxKeyboardMapping } from 'vs/workbench/s
 import { OperatingSystem } from 'vs/base/common/platform';
 import { UserSettingsLabelProvider } from 'vs/base/common/keybindingLabels';
 import { USLayoutResolvedKeybinding } from 'vs/platform/keybinding/common/usLayoutResolvedKeybinding';
-import { ScanCodeUtils, ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeUtils, ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 import { TPromise } from 'vs/base/common/winjs.base';
 import { readRawMapping, assertMapping, IResolvedKeybinding, assertResolveKeybinding, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
 

src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts

@@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base';
 import { WindowsKeyboardMapper, IWindowsKeyboardMapping } from 'vs/workbench/services/keybinding/common/windowsKeyboardMapper';
 import { createKeybinding, KeyMod, KeyCode, KeyChord, SimpleKeybinding } from 'vs/base/common/keyCodes';
 import { IResolvedKeybinding, assertResolveKeybinding, readRawMapping, assertMapping, assertResolveKeyboardEvent, assertResolveUserBinding } from 'vs/workbench/services/keybinding/test/keyboardMapperTestUtils';
-import { ScanCodeBinding, ScanCode } from 'vs/workbench/services/keybinding/common/scanCode';
+import { ScanCodeBinding, ScanCode } from 'vs/base/common/scanCode';
 
 const WRITE_FILE_IF_DIFFERENT = false;