Closes #66 - Removes peek explorers

Converts type/const into string enums
Refactors command initialization

Author: eamodio

README.md

@@ -255,12 +255,6 @@ GitLens provides an unobtrusive blame annotation at the end of the current line,
 
 - Adds a `Show Last Opened Quick Pick` command (`gitlens.showLastQuickPick`) with a shortcut of `alt+-` to quickly get back to where you were when the last GitLens quick pick menu closed
 
-- Adds a `Open File History Explorer` command (`gitlens.showFileHistory`) to show a **file history explorer** (peek style) to visualize the history of a file
-  - Likely to be deprecated in a future release, add your voice to [#66](https://github.com/eamodio/vscode-gitlens/issues/66) if you feel it should not be removed
-
-- Adds a `Open Blame History Explorer` command (`gitlens.showBlameHistory`) to show a **blame history explorer** (peek style) to visualize the blame history of a file or code block
-  - Likely to be deprecated in a future release, add your voice to [#66](https://github.com/eamodio/vscode-gitlens/issues/66) if you feel it should not be removed
-
 ### And More
 
 - Adds a `Copy Commit ID to Clipboard` command (`gitlens.copyShaToClipboard`) to copy the commit id (sha) of the active line to the clipboard or from the most recent commit to the current branch, if there is no active editor
@@ -343,9 +337,9 @@ GitLens is highly customizable and provides many configuration settings to allow
 |-----|------------
 |`gitlens.codeLens.enabled`|Specifies whether or not to provide any Git code lens, by default<br />Use the `gitlens.toggleCodeLens` command to toggle the Git code lens on and off for the current session
 |`gitlens.codeLens.recentChange.enabled`|Specifies whether or not to show a `recent change` code lens showing the author and date of the most recent commit for the file or code block
-|`gitlens.codeLens.recentChange.command`|Specifies the command to be executed when the `recent change` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
+|`gitlens.codeLens.recentChange.command`|Specifies the command to be executed when the `recent change` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
 |`gitlens.codeLens.authors.enabled`|Specifies whether or not to show an `authors` code lens showing number of authors of the file or code block and the most prominent author (if there is more than one)
-|`gitlens.codeLens.authors.command`|Specifies the command to be executed when the `authors` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
+|`gitlens.codeLens.authors.command`|Specifies the command to be executed when the `authors` code lens is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.diffWithPrevious` - compares the current committed file with the previous commit<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
 |`gitlens.codeLens.locations`|Specifies where Git code lens will be shown in the document<br />`document` - adds code lens at the top of the document<br />`containers` - adds code lens at the start of container-like symbols (modules, classes, interfaces, etc)<br />`blocks` - adds code lens at the start of block-like symbols (functions, methods, properties, etc) lines<br />`custom` - adds code lens at the start of symbols contained in `gitlens.codeLens.locationCustomSymbols`
 |`gitlens.codeLens.customLocationSymbols`|Specifies the set of document symbols where Git code lens will be shown in the document
 |`gitlens.codeLens.perLanguageLocations`|Specifies where Git code lens will be shown in the document for the specified languages
@@ -379,7 +373,7 @@ GitLens is highly customizable and provides many configuration settings to allow
 |-----|------------
 |`gitlens.statusBar.enabled`|Specifies whether or not to provide blame information on the status bar
 |`gitlens.statusBar.alignment`|Specifies the blame alignment in the status bar<br />`left` - align to the left,  `right` - align to the right
-|`gitlens.statusBar.command`|Specifies the command to be executed when the blame status bar item is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.showBlameHistory` - opens the blame history explorer<br />`gitlens.showFileHistory` - opens the file history explorer<br />`gitlens.diffWithPrevious` - compares the current line commit with the previous<br />`gitlens.diffWithWorking` - compares the current line commit with the working tree<br />`gitlens.toggleCodeLens` - toggles Git code lens<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
+|`gitlens.statusBar.command`|Specifies the command to be executed when the blame status bar item is clicked<br />`gitlens.toggleFileBlame` - toggles file blame annotations<br />`gitlens.diffWithPrevious` - compares the current line commit with the previous<br />`gitlens.diffWithWorking` - compares the current line commit with the working tree<br />`gitlens.toggleCodeLens` - toggles Git code lens<br />`gitlens.showQuickCommitDetails` - shows a commit details quick pick<br />`gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick<br />`gitlens.showQuickFileHistory` - shows a file history quick pick<br />`gitlens.showQuickRepoHistory` - shows a branch history quick pick
 |`gitlens.statusBar.format`|Specifies the format of the blame information on the status bar<br />Available tokens<br />`${id}` - commit id<br />`${author}` - commit author<br />`${message}` - commit message<br />`${ago}` - relative commit date (e.g. 1 day ago)<br />`${date}` - formatted commit date (format specified by `gitlens.statusBar.dateFormat`)<br />See https://github.com/eamodio/vscode-gitlens/wiki/Advanced-Formatting for advanced formatting
 |`gitlens.statusBar.dateFormat`|Specifies the date format of absolute dates shown in the blame information on the status bar<br />See https://momentjs.com/docs/#/displaying/format/ for valid formats
 

package.json

@@ -255,15 +255,13 @@
                     "default": "gitlens.showQuickCommitFileDetails",
                     "enum": [
                         "gitlens.toggleFileBlame",
-                        "gitlens.showBlameHistory",
-                        "gitlens.showFileHistory",
                         "gitlens.diffWithPrevious",
                         "gitlens.showQuickCommitDetails",
                         "gitlens.showQuickCommitFileDetails",
                         "gitlens.showQuickFileHistory",
                         "gitlens.showQuickRepoHistory"
                     ],
-                    "description": "Specifies the command to be executed when the `recent change` code lens is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.showBlameHistory` - opens the blame history explorer\n `gitlens.showFileHistory` - opens the file history explorer\n `gitlens.diffWithPrevious` - compares the current committed file with the previous commit\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
+                    "description": "Specifies the command to be executed when the `recent change` code lens is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.diffWithPrevious` - compares the current committed file with the previous commit\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
                 },
                 "gitlens.codeLens.authors.enabled": {
                     "type": "boolean",
@@ -275,15 +273,13 @@
                     "default": "gitlens.toggleFileBlame",
                     "enum": [
                         "gitlens.toggleFileBlame",
-                        "gitlens.showBlameHistory",
-                        "gitlens.showFileHistory",
                         "gitlens.diffWithPrevious",
                         "gitlens.showQuickCommitDetails",
                         "gitlens.showQuickCommitFileDetails",
                         "gitlens.showQuickFileHistory",
                         "gitlens.showQuickRepoHistory"
                     ],
-                    "description": "Specifies the command to be executed when the `authors` code lens is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.showBlameHistory` - opens the blame history explorer\n `gitlens.showFileHistory` - opens the file history explorer\n `gitlens.diffWithPrevious` - compares the current committed file with the previous commit\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
+                    "description": "Specifies the command to be executed when the `authors` code lens is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.diffWithPrevious` - compares the current committed file with the previous commit\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
                 },
                 "gitlens.codeLens.locations": {
                     "type": "array",
@@ -589,8 +585,6 @@
                     "default": "gitlens.showQuickCommitDetails",
                     "enum": [
                         "gitlens.toggleFileBlame",
-                        "gitlens.showBlameHistory",
-                        "gitlens.showFileHistory",
                         "gitlens.diffWithPrevious",
                         "gitlens.diffWithWorking",
                         "gitlens.toggleCodeLens",
@@ -599,7 +593,7 @@
                         "gitlens.showQuickFileHistory",
                         "gitlens.showQuickRepoHistory"
                     ],
-                    "description": "Specifies the command to be executed when the blame status bar item is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.showBlameHistory` - opens the blame history explorer\n `gitlens.showFileHistory` - opens the file history explorer\n `gitlens.diffWithPrevious` - compares the current line commit with the previous\n `gitlens.diffWithWorking` - compares the current line commit with the working tree\n `gitlens.toggleCodeLens` - toggles Git code lens\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
+                    "description": "Specifies the command to be executed when the blame status bar item is clicked\n `gitlens.toggleFileBlame` - toggles file blame annotations\n `gitlens.diffWithPrevious` - compares the current line commit with the previous\n `gitlens.diffWithWorking` - compares the current line commit with the working tree\n `gitlens.toggleCodeLens` - toggles Git code lens\n `gitlens.showQuickCommitDetails` - shows a commit details quick pick\n `gitlens.showQuickCommitFileDetails` - shows a commit file details quick pick\n `gitlens.showQuickFileHistory` - shows a file history quick pick\n `gitlens.showQuickRepoHistory` - shows a branch history quick pick"
                 },
                 "gitlens.statusBar.format": {
                     "type": "string",
@@ -1003,11 +997,6 @@
                 "title": "Toggle Git Code Lens",
                 "category": "GitLens"
             },
-            {
-                "command": "gitlens.showBlameHistory",
-                "title": "Open Blame History Explorer",
-                "category": "GitLens"
-            },
             {
                 "command": "gitlens.showCommitSearch",
                 "title": "Search Commits",
@@ -1017,11 +1006,6 @@
                     "light": "images/light/icon-search.svg"
                 }
             },
-            {
-                "command": "gitlens.showFileHistory",
-                "title": "Open File History Explorer",
-                "category": "GitLens"
-            },
             {
                 "command": "gitlens.showLastQuickPick",
                 "title": "Show Last Opened Quick Pick",
@@ -1284,14 +1268,6 @@
                     "command": "gitlens.toggleCodeLens",
                     "when": "gitlens:isTracked && gitlens:canToggleCodeLens"
                 },
-                {
-                    "command": "gitlens.showBlameHistory",
-                    "when": "gitlens:isBlameable"
-                },
-                {
-                    "command": "gitlens.showFileHistory",
-                    "when": "gitlens:isTracked"
-                },
                 {
                     "command": "gitlens.showLastQuickPick",
                     "when": "gitlens:enabled"

src/annotations/annotationController.ts

@@ -14,12 +14,11 @@ import { RecentChangesAnnotationProvider } from './recentChangesAnnotationProvid
 import { WhitespaceController } from './whitespaceController';
 import * as path from 'path';
 
-export type FileAnnotationType = 'gutter' | 'hover' | 'recentChanges';
-export const FileAnnotationType = {
-    Gutter: 'gutter' as FileAnnotationType,
-    Hover: 'hover' as FileAnnotationType,
-    RecentChanges: 'recentChanges' as FileAnnotationType
-};
+export enum FileAnnotationType {
+    Gutter = 'gutter',
+    Hover = 'hover',
+    RecentChanges = 'recentChanges'
+}
 
 export const Decorations = {
     blameAnnotation: window.createTextEditorDecorationType({

src/annotations/annotations.ts

@@ -121,7 +121,7 @@ export class Annotations {
     }
 
     static async changesHover(commit: GitCommit, line: number, uri: GitUri, git: GitService): Promise<DecorationOptions> {
-        const chunkLine = await git.getDiffForLine(uri, line + uri.offset, commit.isUncommitted ? undefined : commit.previousSha);
+        const chunkLine = await git.getDiffForLine(uri, line, commit.isUncommitted ? undefined : commit.previousSha);
         const message = this.getHoverDiffMessage(commit, chunkLine);
 
         return {

src/annotations/blameAnnotationProvider.ts

@@ -30,16 +30,13 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
             if (!blame || !blame.lines.length) return;
         }
 
-        const offset = this.uri.offset;
-
         let sha: string | undefined = undefined;
         if (typeof shaOrLine === 'string') {
             sha = shaOrLine;
         }
         else if (typeof shaOrLine === 'number') {
-            const line = shaOrLine - offset;
-            if (line >= 0) {
-                const commitLine = blame.lines[line];
+            if (shaOrLine >= 0) {
+                const commitLine = blame.lines[shaOrLine];
                 sha = commitLine && commitLine.sha;
             }
         }
@@ -54,7 +51,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
 
         const highlightDecorationRanges = blame.lines
             .filter(l => l.sha === sha)
-            .map(l => this.editor.document.validateRange(new Range(l.line + offset, 0, l.line + offset, 1000000)));
+            .map(l => this.editor.document.validateRange(new Range(l.line, 0, l.line, 1000000)));
 
         this.editor.setDecorations(this.highlightDecoration, highlightDecorationRanges);
     }
@@ -101,7 +98,7 @@ export abstract class BlameAnnotationProviderBase extends AnnotationProviderBase
         const blame = await this.getBlame(true);
         if (blame === undefined) return undefined;
 
-        const line = blame.lines[position.line - this.uri.offset];
+        const line = blame.lines[position.line];
 
         const commit = blame.commits.get(line.sha);
         if (commit === undefined) return undefined;

src/annotations/gutterBlameAnnotationProvider.ts

@@ -33,7 +33,6 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
         };
 
         const now = Date.now();
-        const offset = this.uri.offset;
         const renderOptions = Annotations.gutterRenderOptions(this._config.theme, cfg.heatmap, options);
         const separateLines = this._config.theme.annotations.file.gutter.separateLines;
 
@@ -46,7 +45,7 @@ export class GutterBlameAnnotationProvider extends BlameAnnotationProviderBase {
         let previousSha: string | undefined;
 
         for (const l of blame.lines) {
-            const line = l.line + offset;
+            const line = l.line;
 
             if (previousSha === l.sha) {
                 // Use a shallow copy of the previous decoration options

src/annotations/hoverBlameAnnotationProvider.ts

@@ -20,7 +20,6 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
             const start = process.hrtime();
 
             const now = Date.now();
-            const offset = this.uri.offset;
             const renderOptions = Annotations.hoverRenderOptions(this._config.theme, cfg.heatmap);
 
             const decorations: DecorationOptions[] = [];
@@ -30,7 +29,7 @@ export class HoverBlameAnnotationProvider extends BlameAnnotationProviderBase {
             let hover: DecorationOptions | undefined;
 
             for (const l of blame.lines) {
-                const line = l.line + offset;
+                const line = l.line;
 
                 hover = decorationsMap[l.sha];