Updates to latest vscode extension template

Removes typings (using npm instead)
Fixes some promise catches

.vscode/settings.json

@@ -2,8 +2,7 @@
 {
     "files.exclude": {
         "out": false, // set this to true to hide the "out" folder with the compiled JS files
-        "node_modules": true,
+        "node_modules": true
-        "typings": true
     },
     "search.exclude": {
         "out": true, // set this to false to include "out" folder in search results

.vscodeignore

@@ -1,6 +1,7 @@
 images/*.gif
-.vscode/**
 typings/**
+.vscode/**
+.vscode-test/**
 out/test/**
 test/**
 src/**

package.json

@@ -7,7 +7,7 @@
     },
     "publisher": "eamodio",
     "engines": {
-        "vscode": "^1.3.0"
+        "vscode": "^1.5.0"
     },
     "license": "SEE LICENSE IN LICENSE",
     "displayName": "GitLens",
@@ -217,18 +217,21 @@
         "lodash.debounce": "^4.0.8",
         "lodash.escaperegexp": "^4.1.2",
         "lodash.isequal": "^4.4.0",
-        "lodash": "^4.16.1",
         "moment": "^2.15.1",
-        "spawn-rx": "^2.0.1",
+        "spawn-rx": "^2.0.3",
         "tmp": "^0.0.29"
     },
     "devDependencies": {
         "typescript": "^2.0.3",
-        "vscode": "^0.11.17"
+        "vscode": "^1.0.0",
+        "mocha": "^3.1.0",
+        "@types/node": "^6.0.41",
+        "@types/mocha": "^2.2.32",
+        "@types/tmp": "^0.0.31"
     },
     "scripts": {
-        "vscode:prepublish": "node ./node_modules/vscode/bin/compile && tsc",
+        "vscode:prepublish": "tsc -p ./",
-        "compile": "node ./node_modules/vscode/bin/compile -watch -p ./",
+        "compile": "tsc -watch -p ./",
         "postinstall": "node ./node_modules/vscode/bin/install",
         "pack": "git clean -xdf && npm install && vsce package",
         "pub": "git clean -xdf --exclude=node_modules/ && npm install && vsce publish"

src/commands/diffWithPrevious.ts

@@ -19,7 +19,6 @@ export default class DiffWithPreviousCommand extends EditorCommand {
             }
 
             return this.git.getBlameForLine(uri.fsPath, line)
-                .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', `getBlameForLine(${line})`, ex))
                 .then(blame => {
                     if (!blame) return;
 
@@ -27,16 +26,17 @@ export default class DiffWithPreviousCommand extends EditorCommand {
                     const commit = blame.commit;
                     if (commit.isUncommitted) {
                         return this.git.getBlameForLine(commit.previousUri.fsPath, blame.line.originalLine + 1, commit.previousSha, commit.repoPath)
-                            .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', `getBlameForLine(${blame.line.originalLine}, ${commit.previousSha})`, ex))
                             .then(prevBlame => {
                                 if (!prevBlame) return;
 
                                 const prevCommit = prevBlame.commit;
                                 return commands.executeCommand(Commands.DiffWithPrevious, commit.previousUri, commit.repoPath, commit.previousSha, commit.previousUri, prevCommit.sha, prevCommit.uri, blame.line.originalLine);
-                            });
+                            })
+                            .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', `getBlameForLine(${blame.line.originalLine}, ${commit.previousSha})`, ex));
                     }
                     return commands.executeCommand(Commands.DiffWithPrevious, commit.uri, commit.repoPath, commit.sha, commit.uri, commit.previousSha, commit.previousUri, line);
-                });
+                })
+                .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', `getBlameForLine(${line})`, ex));
         }
 
         if (!compareWithSha) {
@@ -44,8 +44,8 @@ export default class DiffWithPreviousCommand extends EditorCommand {
         }
 
         return Promise.all([this.git.getVersionedFile(shaUri.fsPath, repoPath, sha), this.git.getVersionedFile(compareWithUri.fsPath, repoPath, compareWithSha)])
-            .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', 'getVersionedFile', ex))
+            .then(values => commands.executeCommand(BuiltInCommands.Diff, Uri.file(values[1]), Uri.file(values[0]), `${path.basename(compareWithUri.fsPath)} (${compareWithSha}) ↔ ${path.basename(shaUri.fsPath)} (${sha})`))
-            .then(values => commands.executeCommand(BuiltInCommands.Diff, Uri.file(values[1]), Uri.file(values[0]), `${path.basename(compareWithUri.fsPath)} (${compareWithSha}) ↔ ${path.basename(shaUri.fsPath)} (${sha})`)
+            .then(() => commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: line, at: 'center' }))
-                .then(() => commands.executeCommand(BuiltInCommands.RevealLine, {lineNumber: line, at: 'center'})));
+            .catch(ex => console.error('[GitLens.DiffWithPreviousCommand]', 'getVersionedFile', ex));
     }
 }

src/commands/diffWithWorking.ts

@@ -19,7 +19,6 @@ export default class DiffWithWorkingCommand extends EditorCommand {
             }
 
             return this.git.getBlameForLine(uri.fsPath, line)
-                .catch(ex => console.error('[GitLens.DiffWithWorkingCommand]', `getBlameForLine(${line})`, ex))
                 .then(blame => {
                     if (!blame) return;
 
@@ -29,12 +28,13 @@ export default class DiffWithWorkingCommand extends EditorCommand {
                         return commands.executeCommand(Commands.DiffWithWorking, commit.uri, commit.repoPath, commit.previousSha, commit.previousUri, blame.line.line + 1);
                     }
                     return commands.executeCommand(Commands.DiffWithWorking, commit.uri, commit.repoPath, commit.sha, commit.uri, line)
-                });
+                })
+                .catch(ex => console.error('[GitLens.DiffWithWorkingCommand]', `getBlameForLine(${line})`, ex));
         };
 
         return this.git.getVersionedFile(shaUri.fsPath, repoPath, sha)
-            .catch(ex => console.error('[GitLens.DiffWithWorkingCommand]', 'getVersionedFile', ex))
+            .then(compare => commands.executeCommand(BuiltInCommands.Diff, Uri.file(compare), uri, `${path.basename(shaUri.fsPath)} (${sha}) ↔ ${path.basename(uri.fsPath)}`))
-            .then(compare => commands.executeCommand(BuiltInCommands.Diff, Uri.file(compare), uri, `${path.basename(shaUri.fsPath)} (${sha}) ↔ ${path.basename(uri.fsPath)}`)
+            .then(() => commands.executeCommand(BuiltInCommands.RevealLine, { lineNumber: line, at: 'center' }))
-                .then(() => commands.executeCommand(BuiltInCommands.RevealLine, {lineNumber: line, at: 'center'})));
+            .catch(ex => console.error('[GitLens.DiffWithWorkingCommand]', 'getVersionedFile', ex));
     }
 }

src/commands/showBlame.ts

@@ -21,7 +21,7 @@ export default class ShowBlameCommand extends EditorCommand {
         }
 
         return this.git.getBlameForLine(uri.fsPath, editor.selection.active.line)
-            .catch(ex => console.error('[GitLens.ShowBlameCommand]', `getBlameForLine(${editor.selection.active.line})`, ex))
+            .then(blame => this.annotationController.showBlameAnnotation(editor, blame && blame.commit.sha))
-            .then(blame => this.annotationController.showBlameAnnotation(editor, blame && blame.commit.sha));
+            .catch(ex => console.error('[GitLens.ShowBlameCommand]', `getBlameForLine(${editor.selection.active.line})`, ex));
     }
 }

src/commands/showBlameHistory.ts

@@ -20,7 +20,7 @@ export default class ShowBlameHistoryCommand extends EditorCommand {
         }
 
         return this.git.getBlameLocations(uri.fsPath, range)
-            .catch(ex => console.error('[GitLens.ShowBlameHistoryCommand]', 'getBlameLocations', ex))
+            .then(locations => commands.executeCommand(BuiltInCommands.ShowReferences, uri, position, locations))
-            .then(locations => commands.executeCommand(BuiltInCommands.ShowReferences, uri, position, locations));
+            .catch(ex => console.error('[GitLens.ShowBlameHistoryCommand]', 'getBlameLocations', ex));
     }
 }

src/commands/toggleBlame.ts

@@ -21,8 +21,8 @@ export default  class ToggleBlameCommand extends EditorCommand {
         }
 
         return this.git.getBlameForLine(uri.fsPath, editor.selection.active.line)
-            .catch(ex => console.error('[GitLens.ToggleBlameCommand]', `getBlameForLine(${editor.selection.active.line})`, ex))
+            .then(blame => this.blameController.toggleBlameAnnotation(editor, blame && blame.commit.sha))
-            .then(blame => this.blameController.toggleBlameAnnotation(editor, blame && blame.commit.sha));
+            .catch(ex => console.error('[GitLens.ToggleBlameCommand]', `getBlameForLine(${editor.selection.active.line})`, ex));
     }
 }
 

tsconfig.json

@@ -3,7 +3,9 @@
         "module": "commonjs",
         "target": "es6",
         "outDir": "out",
-        "noLib": true,
+        "lib": [
+            "es6"
+        ],
         "sourceMap": true,
         "rootDir": "."
     },

typings.json

@@ -1,5 +0,0 @@
-{
-  "globalDependencies": {
-    "tmp": "registry:dt/tmp#0.0.0+20160514170650"
-  }
-}

typings/globals/tmp/index.d.ts

@@ -1,45 +0,0 @@
-// Generated by typings
-// Source: https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5d6115f046550714a28caa3555f47a1aec114fe5/tmp/tmp.d.ts
-declare module "tmp" {
-
-	namespace tmp {
-		interface Options extends SimpleOptions {
-			mode?: number;
-		}
-
-		interface SimpleOptions {
-			prefix?: string;
-			postfix?: string;
-			template?: string;
-			dir?: string;
-			tries?: number;
-			keep?: boolean;
-			unsafeCleanup?: boolean;
-		}
-
-		interface SynchrounousResult {
-			name: string;
-			fd: number;
-			removeCallback: () => void;
-		}
-
-		function file(callback: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-		function file(config: Options, callback?: (err: any, path: string, fd: number, cleanupCallback: () => void) => void): void;
-
-		function fileSync(config?: Options): SynchrounousResult;
-
-		function dir(callback: (err: any, path: string, cleanupCallback: () => void) => void): void;
-		function dir(config: Options, callback?: (err: any, path: string, cleanupCallback: () => void) => void): void;
-
-		function dirSync(config?: Options): SynchrounousResult;
-
-		function tmpName(callback: (err: any, path: string) => void): void;
-		function tmpName(config: SimpleOptions, callback?: (err: any, path: string) => void): void;
-
-		function tmpNameSync(config?: SimpleOptions): string;
-
-		function setGracefulCleanup(): void;
-	}
-
-	export = tmp;
-}

typings/globals/tmp/typings.json

@@ -1,8 +0,0 @@
-{
-  "resolution": "main",
-  "tree": {
-    "src": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5d6115f046550714a28caa3555f47a1aec114fe5/tmp/tmp.d.ts",
-    "raw": "registry:dt/tmp#0.0.0+20160514170650",
-    "typings": "https://raw.githubusercontent.com/DefinitelyTyped/DefinitelyTyped/5d6115f046550714a28caa3555f47a1aec114fe5/tmp/tmp.d.ts"
-  }
-}

typings/index.d.ts

@@ -1 +0,0 @@
-/// <reference path="globals/tmp/index.d.ts" />

typings/node.d.ts

@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/node.d.ts" />

typings/vscode-typings.d.ts

@@ -1 +0,0 @@
-/// <reference path="../node_modules/vscode/typings/index.d.ts" />