Clean up typings

Author: jpoon

.gitignore

@@ -6,5 +6,5 @@ node_modules
 .DS_Store
 *.vsix
 *.log
+typings
 testing
-test2

extension.ts

@@ -186,9 +186,9 @@ export async function activate(context: vscode.ExtensionContext) {
     showCmdLine("", modeHandlerToEditorIdentity[new EditorIdentity(vscode.window.activeTextEditor).toString()]);
   });
 
-  for (let { key } of packagejson.contributes.keybindings) {
-    let bracketedKey = AngleBracketNotation.Normalize(key);
-    registerCommand(context, `extension.vim_${ key.toLowerCase() }`, () => handleKeyEvent(`${ bracketedKey }`));
+  for (let keybinding of packagejson.contributes.keybindings) {
+    let bracketedKey = AngleBracketNotation.Normalize(keybinding.key);
+    registerCommand(context, keybinding.command, () => handleKeyEvent(`${ bracketedKey }`));
   }
 
   // Initialize mode handler for current active Text Editor at startup.

gulpfile.js

@@ -30,8 +30,8 @@ gulp.task('typings', function () {
 
 gulp.task('typings-vscode-definitions', ['typings'], function() {
   // add vscode definitions
-  var vscodeTypings = '/// <reference path="../node_modules/vscode/typings/index.d.ts" />\n';
-  var vscodeNodeTypings = '/// <reference path="../node_modules/vscode/typings/node.d.ts" />\n';
+  var vscodeTypings = '/// <reference path="vscode/index.d.ts" />\n';
+  var vscodeNodeTypings = '/// <reference path="vscode/node.d.ts" />\n';
   return gulp.src('./typings/index.d.ts')
     .pipe(inject.replace(vscodeTypings, ''))
     .pipe(inject.replace(vscodeNodeTypings, ''))
@@ -69,7 +69,7 @@ gulp.task('default', ['tslint', 'compile']);
 
 gulp.task('compile', shell.task(['npm run vscode:prepublish']));
 gulp.task('watch', shell.task(['npm run compile']));
-gulp.task('init', ['typings']);
+gulp.task('init', ['typings', 'typings-vscode-definitions']);
 
 gulp.task('patch', ['default'], function() { return versionBump('patch'); })
 gulp.task('minor', ['default'], function() { return versionBump('minor'); })

package.json

@@ -261,13 +261,11 @@
     "gulp-soften": "^0.0.1",
     "gulp-tag-version": "^1.3.0",
     "gulp-trimlines": "^1.0.0",
-    "gulp-tslint": "^6.1.1",
-    "gulp-typescript": "^2.13.4",
+    "gulp-tslint": "^6.1.2",
     "gulp-typings": "^2.0.0",
     "merge-stream": "^1.0.0",
     "tslint": "^3.10.2",
     "typescript": "2.0.0",
-    "typings": "^1.0.4",
-    "vscode": "^0.11.16"
+    "typings": "^1.4.0"
   }
 }

typings.json

@@ -5,6 +5,7 @@
     "lodash": "registry:npm/lodash#4.0.0+20160416211519"
   },
   "globalDependencies": {
-    "copy-paste": "registry:dt/copy-paste#1.1.3+20160117130525"
+    "copy-paste": "registry:dt/copy-paste#1.1.3+20160117130525",
+    "diff-match-patch": "registry:dt/diff-match-patch#1.0.0+20160821140300"
   }
 }