Continuing cleanup work

* Merging error and end events for stream
* No longer sending an empty string as item label for info
* Removing "git" prefix from many variables

Author: Sertion

package-lock.json

@@ -33,15 +33,15 @@
     "test": "node ./node_modules/vscode/bin/test"
   },
   "dependencies": {
-    "moment": "^2.20.1",
+    "moment": "^2.21.0",
     "valid-url": "^1.0.9"
   },
   "devDependencies": {
     "@types/mocha": "^2.2.48",
     "@types/node": "^9.4.6",
     "mocha": "^5.0.1",
-    "nock": "^9.1.6",
-    "typescript": "^2.7.1",
+    "nock": "^9.2.3",
+    "typescript": "^2.7.2",
     "vscode": "^1.1.10"
   },
   "homepage": "https://github.com/Sertion/vscode-gitblame/blob/master/README.md",

package.json

@@ -8,4 +8,4 @@ export const TITLE_SHOW_LOG = 'Show Log';
 export const FS_EVENT_TYPE_REMOVE = 'rename';
 export const FS_EVENT_TYPE_CHANGE = 'change';
 
-export const TIME_CACHE_LIFETIME = 4 * 60 * 1000;
+export const TIME_CACHE_LIFETIME = 240_000;

src/constants.ts

@@ -1,6 +1,6 @@
 import { isWebUri } from 'valid-url';
 
-import { Disposable, commands, window, workspace, Uri } from 'vscode';
+import { Disposable, commands, window, workspace, Uri, MessageItem } from 'vscode';
 
 import { ErrorHandler } from '../util/errorhandler';
 import { TextDecorator } from '../util/textdecorator';
@@ -97,7 +97,6 @@ export class GitBlame {
 
     async showMessage(): Promise<void> {
         const commitInfo = await this.getCommitInfo();
-        const commitToolUrl = this.getToolUrl(commitInfo);
         const messageFormat = Property.get(Properties.InfoMessageFormat);
         const normalizedTokens = TextDecorator.normalizeCommitInfoTokens(
             commitInfo
@@ -106,17 +105,34 @@ export class GitBlame {
             messageFormat,
             normalizedTokens
         );
-        const extraAction = commitToolUrl ? TITLE_VIEW_ONLINE : '';
+        const extraActions = this.generateMessageActions(commitInfo);
 
         this.updateView(commitInfo);
 
-        const item = await window.showInformationMessage(message, extraAction);
+        const actionedItem = await window.showInformationMessage(message, ...extraActions);
 
-        if (item === TITLE_VIEW_ONLINE) {
-            commands.executeCommand('vscode.open', commitToolUrl);
+        if (actionedItem) {
+            actionedItem.takeAction();
         }
     }
 
+    private generateMessageActions(commitInfo: GitCommitInfo): ActionableMessageItem[] {
+        const commitToolUrl = this.getToolUrl(commitInfo);
+        const extraActions:ActionableMessageItem[] = [];
+
+        if (commitToolUrl) {
+            let viewOnlineAction = new ActionableMessageItem(TITLE_VIEW_ONLINE);
+
+            viewOnlineAction.setAction(() => {
+                commands.executeCommand('vscode.open', commitToolUrl);
+            });
+
+            extraActions.push(viewOnlineAction);
+        }
+
+        return extraActions;
+    }
+
     async blameLink(): Promise<void> {
         const commitInfo = await this.getCommitInfo();
         const commitToolUrl = this.getToolUrl(commitInfo);
@@ -256,3 +272,25 @@ export class GitBlame {
         return hash.substr(0, Property.get(Properties.InternalHashLength));
     }
 }
+
+/**
+ * Helper class for window.showInformationMessage
+ */
+class ActionableMessageItem implements MessageItem {
+    public title: string;
+    private action: () => void;
+
+    constructor(title) {
+        this.title = title;
+    }
+
+    setAction(action) {
+        this.action = action;
+    }
+
+    takeAction() {
+        if (this.action) {
+            this.action();
+        }
+    }
+}