Fixes blame context after save

CHANGELOG.md

@@ -8,6 +8,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Changed
 - Swaps out Moment.js for date-fns to improve blame annotation performance and to reduce the GitLen bundle size (saves ~400kb)
 
+### Fixed
+- Fixes issue where the `Toggle File Blame Annotations` command (`gitlens.toggleFileBlame`) wasn't available after a file was saved
+
 ## [5.6.2] - 2017-10-11
 ### Fixed
 - Fixes issue where `Open File` command failed for in many instances (for GitUri resources)

src/git/gitContextTracker.ts

@@ -81,12 +81,12 @@ export class GitContextTracker extends Disposable {
         // this._unsubscribeToDocumentChanges();
         // this.updateBlameability(false);
 
-        // TODO: Rework this once https://github.com/Microsoft/vscode/issues/27231 is released in v1.13
         // We have to defer because isDirty is not reliable inside this event
+        // https://github.com/Microsoft/vscode/issues/27231
         setTimeout(async () => {
             let blameable = !e.document.isDirty;
             if (blameable) {
-                blameable = await this.git.getBlameability(new GitUri(e.document.uri));
+                blameable = await this.git.getBlameability(await GitUri.fromUri(e.document.uri, this.git));
             }
             this._updateBlameability(blameable);
         }, 1);
@@ -100,7 +100,7 @@ export class GitContextTracker extends Disposable {
 
         let blameable = !e.isDirty;
         if (blameable) {
-            blameable = await this.git.getBlameability(new GitUri(e.uri));
+            blameable = await this.git.getBlameability(await GitUri.fromUri(e.uri, this.git));
         }
         this._updateBlameability(blameable);
     }

src/git/gitUri.ts

@@ -21,6 +21,7 @@ export class GitUri extends ((Uri as any) as UriEx) {
     constructor(uri?: Uri, commitOrRepoPath?: IGitCommitInfo | string) {
         if (uri === undefined) {
             super();
+
             return;
         }
 
@@ -36,7 +37,11 @@ export class GitUri extends ((Uri as any) as UriEx) {
             return;
         }
 
-        if (!commitOrRepoPath) return;
+        if (commitOrRepoPath === undefined) {
+            super(uri.scheme, uri.authority, uri.path, uri.query, uri.fragment);
+
+            return;
+        }
 
         if (typeof commitOrRepoPath === 'string') {
             super(uri.scheme, uri.authority, uri.path, uri.query, uri.fragment);

src/gitService.ts

@@ -217,8 +217,8 @@ export class GitService extends Disposable {
         if (!this.UseCaching) return;
         if (e.document.uri.scheme !== DocumentSchemes.File) return;
 
-        // TODO: Rework this once https://github.com/Microsoft/vscode/issues/27231 is released in v1.13
         // We have to defer because isDirty is not reliable inside this event
+        // https://github.com/Microsoft/vscode/issues/27231
         setTimeout(() => {
             // If the document is dirty all is fine, we'll just wait for the save before clearing our cache
             if (e.document.isDirty) return;