Merge pull request #21023 from Microsoft/alex/kblayout

native-keymap@0.4.0

.travis.yml

@@ -19,6 +19,8 @@ addons:
       - g++-4.9-multilib
       - zip
       - libgtk2.0-0
+      - libx11-dev
+      - libxkbfile-dev
 
 before_install:
   - git submodule update --init --recursive

npm-shrinkwrap.json

@@ -288,9 +288,9 @@
       "resolved": "https://registry.npmjs.org/nan/-/nan-2.4.0.tgz"
     },
     "native-keymap": {
-      "version": "0.3.0",
-      "from": "native-keymap@0.3.0",
-      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-0.3.0.tgz"
+      "version": "0.4.0",
+      "from": "native-keymap@0.4.0",
+      "resolved": "https://registry.npmjs.org/native-keymap/-/native-keymap-0.4.0.tgz"
     },
     "normalize-path": {
       "version": "2.0.1",

package.json

@@ -30,7 +30,7 @@
     "https-proxy-agent": "0.3.6",
     "iconv-lite": "0.4.15",
     "minimist": "1.2.0",
-    "native-keymap": "0.3.0",
+    "native-keymap": "0.4.0",
     "node-pty": "0.6.2",
     "semver": "4.3.6",
     "vscode-debugprotocol": "1.17.0",

src/typings/native-keymap.d.ts

@@ -15,4 +15,24 @@ declare module 'native-keymap' {
 
 	export function getKeyMap(): INativeKeyMap[];
 
+	export interface IWindowsKeyboardLayoutInfo {
+		name: string;
+		id: string;
+		text: string;
+	}
+
+	export interface ILinuxKeyboardLayoutInfo {
+		model: string;
+		layout: string;
+		variant: string;
+		options: string;
+		rules: string;
+	}
+
+	export interface IMacKeyboardLayoutInfo {
+		id: string;
+		lang: string;
+	}
+
+	export function getCurrentKeyboardLayout(): IWindowsKeyboardLayoutInfo | ILinuxKeyboardLayoutInfo | IMacKeyboardLayoutInfo;
 }