From f90a0abe02b932182bd72d689ce5dd0836583493 Mon Sep 17 00:00:00 2001
From: Peng Lyu <penn.lv@gmail.com>
Date: Fri, 21 Jun 2019 12:03:26 -0700
Subject: [PATCH] Use interfaces for keyboard layout registration

---
 .../browser/keyboardLayouts/_.contribution.ts       |  6 +++---
 .../keybinding/browser/keyboardLayouts/cz.win.ts    | 11 +++++------
 .../browser/keyboardLayouts/de-swiss.win.ts         | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/de.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/de.linux.ts  | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/de.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/dk.win.ts    | 12 ++++++------
 .../browser/keyboardLayouts/en-belgian.win.ts       | 12 ++++++------
 .../browser/keyboardLayouts/en-ext.darwin.ts        | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/en-in.win.ts | 12 ++++++------
 .../browser/keyboardLayouts/en-intl.darwin.ts       | 12 ++++++------
 .../browser/keyboardLayouts/en-intl.win.ts          | 12 ++++++------
 .../browser/keyboardLayouts/en-uk.darwin.ts         | 12 +++++-------
 .../keybinding/browser/keyboardLayouts/en-uk.win.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/en.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/en.linux.ts  | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/en.win.ts    | 12 ++++++------
 .../browser/keyboardLayouts/es-latin.win.ts         | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/es.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/es.linux.ts  | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/es.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/fr.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/fr.linux.ts  | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/fr.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/hu.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/it.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/it.win.ts    | 12 ++++++------
 .../browser/keyboardLayouts/jp-roman.darwin.ts      | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/jp.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/ko.darwin.ts | 12 +++++-------
 .../keybinding/browser/keyboardLayouts/no.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/pl.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/pl.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/pt-br.win.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/pt.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/pt.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/ru.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/ru.linux.ts  | 13 ++++++-------
 .../keybinding/browser/keyboardLayouts/ru.win.ts    | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/sv.darwin.ts | 12 ++++++------
 .../keybinding/browser/keyboardLayouts/sv.win.ts    | 13 ++++++-------
 .../keybinding/browser/keyboardLayouts/thai.win.ts  | 11 +++++------
 .../keybinding/browser/keyboardLayouts/tr.win.ts    | 11 +++++------
 .../browser/keyboardLayouts/zh-hans.darwin.ts       | 12 +++++-------
 .../services/keybinding/browser/keymapService.ts    |  5 +++--
 .../services/keybinding/common/keymapInfo.ts        |  7 +++++++
 46 files changed, 265 insertions(+), 268 deletions(-)

diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
index 846b6023774..89ef892047a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution.ts
@@ -3,12 +3,12 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
+import { IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
 export class KeyboardLayoutContribution {
 	public static readonly INSTANCE: KeyboardLayoutContribution = new KeyboardLayoutContribution();
 
-	private _layoutInfos: KeymapInfo[] = [];
+	private _layoutInfos: IKeymapInfo[] = [];
 
 	get layoutInfos() {
 		return this._layoutInfos;
@@ -17,7 +17,7 @@ export class KeyboardLayoutContribution {
 	private constructor() {
 	}
 
-	registerKeyboardLayout(layout: KeymapInfo) {
+	registerKeyboardLayout(layout: IKeymapInfo) {
 		this._layoutInfos.push(layout);
 	}
 }
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
index 8d560875c61..c187c923cec 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/cz.win.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000405', id: '', text: 'Czech' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000405', id: '', text: 'Czech' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +165,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
index b7d6467220a..b19d2935e66 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de-swiss.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000807', id: '', text: 'Swiss German' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000807', id: '', text: 'Swiss German' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
index 6e870e8c472..33d2f5d5e32 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.German', lang: 'de', localizedName: 'German' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.German', lang: 'de', localizedName: 'German' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', '‹', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
index 2f7f85af3ca..b4675240ef0 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.linux.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ model: 'pc104', layout: 'de', variant: '', options: '', rules: 'base' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { model: 'pc104', layout: 'de', variant: '', options: '', rules: 'base' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'æ', 'Æ', 0],
@@ -184,4 +184,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		MailForward: [],
 		MailSend: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
index 0bf3c61618e..46bf5981a68 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/de.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000407', id: '', text: 'German' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000407', id: '', text: 'German' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
index 34f7f3103a7..b774622699c 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/dk.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000406', id: '', text: 'Danish' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000406', id: '', text: 'Danish' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -167,4 +167,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserFavorites: []
 	}
 
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
index 6e5cae52518..89e3a27892a 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-belgian.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000813', id: '', text: 'Belgian (Period)' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000813', id: '', text: 'Belgian (Period)' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['q', 'Q', '', '', 0, 'VK_Q'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
index 688281af2be..a12a2338bff 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-ext.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.USExtended', lang: 'en', localizedName: 'ABC - Extended' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.USExtended', lang: 'en', localizedName: 'ABC - Extended' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', '¯', '̄', 4],
 		KeyB: ['b', 'B', '˘', '̆', 4],
 		KeyC: ['c', 'C', '¸', '̧', 4],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
index d3ad3786dcb..a1786f42061 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-in.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00004009', id: '', text: 'India' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00004009', id: '', text: 'India' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'ā', 'Ā', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
index a4f4a9e10b1..ceb7b67a878 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.USInternational-PC', lang: 'en', localizedName: 'U.S. International - PC' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.USInternational-PC', lang: 'en', localizedName: 'U.S. International - PC' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
index ce5ade144e2..75a2a40b805 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-intl.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00020409', id: '0001', text: 'United States-International' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00020409', id: '0001', text: 'United States-International' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'á', 'Á', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
index 4bebc424b1f..89236337707 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.darwin.ts
@@ -4,13 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-
-	{ id: 'com.apple.keylayout.British', lang: 'en', localizedName: 'British' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.British', lang: 'en', localizedName: 'British' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -130,4 +128,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
index d3aa6995fb9..0b07025fa88 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en-uk.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000809', id: '', text: 'United Kingdom' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000809', id: '', text: 'United Kingdom' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'á', 'Á', 0, 'VK_A'],
@@ -167,4 +167,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserFavorites: []
 	}
 
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
index ee78fd8254d..f0fca4a9d74 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.darwin.ts
@@ -4,11 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.US', lang: 'en', localizedName: 'U.S.', isUSStandard: true },
-	[
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.US', lang: 'en', localizedName: 'U.S.', isUSStandard: true },
+	secondaryLayouts: [
 		{ id: 'com.apple.keylayout.ABC', lang: 'en', localizedName: 'ABC' },
 		{ id: 'com.sogou.inputmethod.sogou.pinyin', lang: 'zh-Hans', localizedName: 'Pinyin - Simplified' },
 		{ id: 'com.apple.inputmethod.Kotoeri.Roman', lang: 'en', localizedName: 'Romaji' },
@@ -17,7 +17,7 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		{ id: 'com.apple.keylayout.Canadian', lang: 'en', localizedName: 'Canadian English' },
 		{ id: 'com.apple.keylayout.Brazilian', lang: 'pt', localizedName: 'Brazilian' },
 	],
-	{
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -137,4 +137,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
index 1ea1d427390..571e9164e15 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.linux.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ model: 'pc105', layout: 'us', variant: '', options: '', rules: 'evdev', isUSStandard: true },
-	[
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { model: 'pc105', layout: 'us', variant: '', options: '', rules: 'evdev', isUSStandard: true },
+	secondaryLayouts: [
 		{ model: 'pc105', layout: 'cn', variant: '', options: '', rules: 'evdev' },
 	],
-	{
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'a', 'A', 0],
@@ -187,4 +187,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		MailSend: []
 	}
 
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
index be1ca6ff8b8..3d6845dc053 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/en.win.ts
@@ -4,17 +4,17 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000409', id: '', text: 'US', isUSStandard: true },
-	[
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000409', id: '', text: 'US', isUSStandard: true },
+	secondaryLayouts: [
 		{ name: '00000804', id: '', text: 'Chinese (Simplified) - US Keyboard' },
 		{ name: '00000411', id: '', text: 'Japanese' },
 		{ name: '00000412', id: '', text: 'Korean' },
 		{ name: '00000404', id: '', text: 'Chinese (Traditional) - US Keyboard' }
 	],
-	{
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -171,4 +171,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
index 6234c454280..16531eda212 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es-latin.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000080A', id: '', text: 'Latin American' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000080A', id: '', text: 'Latin American' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -167,4 +167,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserFavorites: []
 	}
 
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
index a7b3986364b..679dfb36d08 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.Spanish-ISO', lang: 'es', localizedName: 'Spanish - ISO' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.Spanish-ISO', lang: 'es', localizedName: 'Spanish - ISO' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', 'ß', '', 0],
 		KeyC: ['c', 'C', '©', ' ', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
index 1b4f4d94858..8fcff46f8d6 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.linux.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ model: 'pc105', layout: 'es', variant: '', options: '', rules: 'evdev' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { model: 'pc105', layout: 'es', variant: '', options: '', rules: 'evdev' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'æ', 'Æ', 0],
@@ -184,4 +184,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		MailForward: [],
 		MailSend: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
index 8fea58dc872..3ac96a5dc59 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/es.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000040A', id: '', text: 'Spanish' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000040A', id: '', text: 'Spanish' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
index 6bc78c8a2b2..fa9198b64a0 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.French', lang: 'fr', localizedName: 'French' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.French', lang: 'fr', localizedName: 'French' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['q', 'Q', '‡', 'Ω', 0],
 		KeyB: ['b', 'B', 'ß', '∫', 0],
 		KeyC: ['c', 'C', '©', '¢', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
index 7c857332595..dc9488f28c3 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.linux.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ model: 'pc104', layout: 'fr', variant: '', options: '', rules: 'base' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { model: 'pc104', layout: 'fr', variant: '', options: '', rules: 'base' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['q', 'Q', '@', 'Ω', 0],
@@ -184,4 +184,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		MailForward: [],
 		MailSend: []
 	}
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
index b056c38ff2d..c9f032d7bee 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/fr.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000040C', id: '', text: 'French' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000040C', id: '', text: 'French' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['q', 'Q', '', '', 0, 'VK_Q'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
index ebcce4786fd..d6b5a4dac06 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/hu.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000040E', id: '', text: 'Hungarian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000040E', id: '', text: 'Hungarian' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'ä', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
index 3d1c557e65e..1dc97d9903f 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.Italian-Pro', lang: 'it', localizedName: 'Italian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.Italian-Pro', lang: 'it', localizedName: 'Italian' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'Í', 0],
 		KeyC: ['c', 'C', '©', 'Á', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
index 1b0636f02ab..573b7b0c6c3 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/it.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000410', id: '', text: 'Italian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000410', id: '', text: 'Italian' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
index 578a479dc7e..27328f3d87b 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp-roman.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.google.inputmethod.Japanese.Roman', lang: 'en', localizedName: 'Alphanumeric (Google)' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.google.inputmethod.Japanese.Roman', lang: 'en', localizedName: 'Alphanumeric (Google)' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', '¯', '̄', 4],
 		KeyB: ['b', 'B', '˘', '̆', 4],
 		KeyC: ['c', 'C', '¸', '̧', 4],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
index 1835862116e..819f96ba5ca 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/jp.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.inputmethod.Kotoeri.Japanese', lang: 'ja', localizedName: 'Hiragana' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.inputmethod.Kotoeri.Japanese', lang: 'ja', localizedName: 'Hiragana' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
index e767bd03dcd..4219a7bd62f 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ko.darwin.ts
@@ -4,13 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 
-	{ id: 'com.apple.inputmethod.Korean.2SetKorean', lang: 'ko', localizedName: '2-Set Korean' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.inputmethod.Korean.2SetKorean', lang: 'ko', localizedName: '2-Set Korean' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['ㅁ', 'ㅁ', 'a', 'A', 0],
 		KeyB: ['ㅠ', 'ㅠ', 'b', 'B', 0],
 		KeyC: ['ㅊ', 'ㅊ', 'c', 'C', 0],
@@ -130,5 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
index 7183b0fbe9f..2c415e8ebff 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/no.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000414', id: '', text: 'Norwegian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000414', id: '', text: 'Norwegian' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
index 8ae036710a2..57577ba513c 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.PolishPro', lang: 'pl', localizedName: 'Polish - Pro' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.PolishPro', lang: 'pl', localizedName: 'Polish - Pro' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'ą', 'Ą', 0],
 		KeyB: ['b', 'B', 'ļ', 'ű', 0],
 		KeyC: ['c', 'C', 'ć', 'Ć', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
index 9d0576fc4f2..a110111a83f 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pl.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000415', id: '', text: 'Polish (Programmers)' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000415', id: '', text: 'Polish (Programmers)' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'ą', 'Ą', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
index b5886ffc968..9bb82448a7c 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt-br.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000416', id: '', text: 'Portuguese (Brazilian ABNT)' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000416', id: '', text: 'Portuguese (Brazilian ABNT)' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -167,4 +167,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
index 9a0baec47d2..87435fdc0ea 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.Brazilian-Pro', lang: 'pt' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.Brazilian-Pro', lang: 'pt' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
index 2d1c72c89b9..456a537654b 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/pt.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000816', id: '', text: 'Portuguese' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000816', id: '', text: 'Portuguese' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -167,4 +167,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserFavorites: []
 	}
 
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
index 9140df78e5c..5eea5ac38f5 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.Russian', lang: 'ru', localizedName: 'Russian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.Russian', lang: 'ru', localizedName: 'Russian' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['ф', 'Ф', 'ƒ', 'ƒ', 0],
 		KeyB: ['и', 'И', 'и', 'И', 0],
 		KeyC: ['с', 'С', '≠', '≠', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
index c086909149a..b13adb0d9ac 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.linux.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ model: 'pc104', layout: 'ru', variant: ',', options: '', rules: 'base' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { model: 'pc104', layout: 'ru', variant: ',', options: '', rules: 'base' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['ф', 'Ф', 'ф', 'Ф', 0],
@@ -184,5 +184,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		MailForward: [],
 		MailSend: []
 	}
-
-));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
index dfe753aacb0..0da492a10ac 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/ru.win.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '00000419', id: '', text: 'Russian' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '00000419', id: '', text: 'Russian' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['ф', 'Ф', '', '', 0, 'VK_A'],
@@ -166,4 +166,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
index 2c5f6f3e582..6d80477a689 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.darwin.ts
@@ -4,12 +4,12 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.keylayout.Swedish-Pro', lang: 'sv', localizedName: 'Swedish - Pro' },
-	[],
-	{
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.keylayout.Swedish-Pro', lang: 'sv', localizedName: 'Swedish - Pro' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', '', '◊', 0],
 		KeyB: ['b', 'B', '›', '»', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,4 +129,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
index 729d9a13bb0..c7128b5c929 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/sv.win.ts
@@ -4,14 +4,14 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000041D', id: '', text: 'Swedish' },
-	[
+
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000041D', id: '', text: 'Swedish' },
+	secondaryLayouts: [
 		{ name: '0000040B', id: '', text: 'Finnish' }
 	],
-	{
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', '', '', 0, 'VK_A'],
@@ -168,5 +168,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
index 013b7ac64f7..be85bfedd9e 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/thai.win.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000041E', id: '', text: 'Thai Kedmanee' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000041E', id: '', text: 'Thai Kedmanee' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['ฟ', 'ฤ', '', '', 0, 'VK_A'],
@@ -166,4 +165,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
+});
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
index 058ef5592ae..955b03f5fc0 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/tr.win.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
-	{ name: '0000041F', id: '', text: 'Turkish Q' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { name: '0000041F', id: '', text: 'Turkish Q' },
+	secondaryLayouts: [],
+	mapping: {
 		Sleep: [],
 		WakeUp: [],
 		KeyA: ['a', 'A', 'æ', 'Æ', 0, 'VK_A'],
@@ -166,4 +165,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout((new KeymapInfo(
 		BrowserRefresh: [],
 		BrowserFavorites: []
 	}
-)));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
index df8e9252fa6..49d1f60ae0d 100644
--- a/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
+++ b/src/vs/workbench/services/keybinding/browser/keyboardLayouts/zh-hans.darwin.ts
@@ -4,12 +4,11 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KeyboardLayoutContribution } from 'vs/workbench/services/keybinding/browser/keyboardLayouts/_.contribution';
-import { KeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 
-KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
-	{ id: 'com.apple.inputmethod.SCIM.ITABC', lang: 'zh-Hans', localizedName: '搜狗拼音' },
-	[],
-	{
+KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout({
+	layout: { id: 'com.apple.inputmethod.SCIM.ITABC', lang: 'zh-Hans', localizedName: '搜狗拼音' },
+	secondaryLayouts: [],
+	mapping: {
 		KeyA: ['a', 'A', 'å', 'Å', 0],
 		KeyB: ['b', 'B', '∫', 'ı', 0],
 		KeyC: ['c', 'C', 'ç', 'Ç', 0],
@@ -129,5 +128,4 @@ KeyboardLayoutContribution.INSTANCE.registerKeyboardLayout(new KeymapInfo(
 		AltRight: [],
 		MetaRight: []
 	}
-
-));
\ No newline at end of file
+});
\ No newline at end of file
diff --git a/src/vs/workbench/services/keybinding/browser/keymapService.ts b/src/vs/workbench/services/keybinding/browser/keymapService.ts
index 83c78cc1664..13434bdb7bb 100644
--- a/src/vs/workbench/services/keybinding/browser/keymapService.ts
+++ b/src/vs/workbench/services/keybinding/browser/keymapService.ts
@@ -6,7 +6,7 @@
 import * as nls from 'vs/nls';
 import { Emitter, Event } from 'vs/base/common/event';
 import { Disposable, toDisposable, IDisposable, MutableDisposable } from 'vs/base/common/lifecycle';
-import { IKeymapService, IKeyboardLayoutInfo, IKeyboardMapping, IWindowsKeyboardMapping, KeymapInfo, IRawMixedKeyboardMapping, getKeyboardLayoutId } from 'vs/workbench/services/keybinding/common/keymapInfo';
+import { IKeymapService, IKeyboardLayoutInfo, IKeyboardMapping, IWindowsKeyboardMapping, KeymapInfo, IRawMixedKeyboardMapping, getKeyboardLayoutId, IKeymapInfo } from 'vs/workbench/services/keybinding/common/keymapInfo';
 import { registerSingleton } from 'vs/platform/instantiation/common/extensions';
 import { DispatchConfig } from 'vs/workbench/services/keybinding/common/dispatchConfig';
 import { IKeyboardMapper, CachedKeyboardMapper } from 'vs/workbench/services/keybinding/common/keyboardMapper';
@@ -79,7 +79,8 @@ export class BrowserKeyboardMapperFactory {
 		const platform = isWindows ? 'win' : isMacintosh ? 'darwin' : 'linux';
 
 		import('vs/workbench/services/keybinding/browser/keyboardLayouts/layout.contribution.' + platform).then((m) => {
-			this._keymapInfos.push(...m.KeyboardLayoutContribution.INSTANCE.layoutInfos);
+			let keymapInfos: IKeymapInfo[] = m.KeyboardLayoutContribution.INSTANCE.layoutInfos;
+			this._keymapInfos.push(...keymapInfos.map(info => (new KeymapInfo(info.layout, info.secondaryLayouts, info.mapping, info.isUserKeyboardLayout))));
 			this._mru = this._keymapInfos;
 			this._initialized = true;
 			this.onKeyboardLayoutChanged();
diff --git a/src/vs/workbench/services/keybinding/common/keymapInfo.ts b/src/vs/workbench/services/keybinding/common/keymapInfo.ts
index c4159da4c6f..cc1108c5ca4 100644
--- a/src/vs/workbench/services/keybinding/common/keymapInfo.ts
+++ b/src/vs/workbench/services/keybinding/common/keymapInfo.ts
@@ -248,6 +248,13 @@ interface ISerializedMapping {
 	[key: string]: (string | number)[];
 }
 
+export interface IKeymapInfo {
+	layout: IKeyboardLayoutInfo;
+	secondaryLayouts: IKeyboardLayoutInfo[];
+	mapping: ISerializedMapping;
+	isUserKeyboardLayout?: boolean;
+}
+
 export class KeymapInfo {
 	mapping: IRawMixedKeyboardMapping;
 	isUserKeyboardLayout: boolean;
-- 
GitLab