A better diff viewer - Diff2HTML support

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "git-graph",
 	"displayName": "Git Graph",
-	"version": "1.30.0",
+	"version": "1.30.1",
 	"publisher": "mhutchie",
 	"author": {
 		"name": "Michael Hutchison",
@@ -96,6 +96,16 @@
 				"title": "Open File",
 				"icon": "$(go-to-file)",
 				"enablement": "isInDiffEditor && resourceScheme == git-graph && git-graph:codiconsSupported"
+			},
+			{
+				"category": "Git Graph",
+				"command": "git-graph.viewGitDiff",
+				"title": "View Git Diff"
+			},
+			{
+				"category": "Git Graph",
+				"command": "git-graph.viewGitDiffForRepo",
+				"title": "View Git Diff For Repository"
 			}
 		],
 		"configuration": {
@@ -251,6 +261,10 @@
 									"type": "boolean",
 									"title": "View Diff"
 								},
+								"viewDiffInFile": {
+									"type": "boolean",
+									"title": "View Diff in file"
+								},
 								"viewFileAtThisRevision": {
 									"type": "boolean",
 									"title": "View File at this Revision"
@@ -1526,9 +1540,12 @@
 		"test-and-report-coverage": "jest --verbose --coverage"
 	},
 	"dependencies": {
+		"diff2html": "^3.4.16",
+		"hogan.js": "^3.0.2",
 		"iconv-lite": "0.5.0"
 	},
 	"devDependencies": {
+		"@types/hogan.js": "^3.0.1",
 		"@types/jest": "26.0.19",
 		"@types/node": "8.10.62",
 		"@types/vscode": "1.38.0",
@@ -1540,4 +1557,4 @@
 		"typescript": "4.0.2",
 		"uglify-js": "3.10.0"
 	}
-}
+}

src/commands.ts

@@ -8,7 +8,7 @@ import { CodeReviewData, CodeReviews, ExtensionState } from './extensionState';
 import { GitGraphView } from './gitGraphView';
 import { Logger } from './logger';
 import { RepoManager } from './repoManager';
-import { GitExecutable, UNABLE_TO_FIND_GIT_MSG, VsCodeVersionRequirement, abbrevCommit, abbrevText, copyToClipboard, doesVersionMeetRequirement, getExtensionVersion, getPathFromUri, getRelativeTimeDiff, getRepoName, getSortedRepositoryPaths, isPathInWorkspace, openFile, resolveToSymbolicPath, showErrorMessage, showInformationMessage } from './utils';
+import { GitExecutable, UNABLE_TO_FIND_GIT_MSG, VsCodeVersionRequirement, abbrevCommit, abbrevText, copyToClipboard, doesVersionMeetRequirement, getExtensionVersion, getPathFromUri, getRelativeTimeDiff, getRepoName, getSortedRepositoryPaths, isPathInWorkspace, openFile, resolveToSymbolicPath, showErrorMessage, showInformationMessage, viewGitDiffByPath, viewGitDiffForRepo} from './utils';
 import { Disposable } from './utils/disposable';
 import { Event } from './utils/event';
 
@@ -56,6 +56,8 @@ export class CommandManager extends Disposable {
 		this.registerCommand('git-graph.resumeWorkspaceCodeReview', () => this.resumeWorkspaceCodeReview());
 		this.registerCommand('git-graph.version', () => this.version());
 		this.registerCommand('git-graph.openFile', (arg) => this.openFile(arg));
+		this.registerCommand('git-graph.viewGitDiff', () => this.viewGitDiff());
+		this.registerCommand('git-graph.viewGitDiffForRepo', () => this.viewGitDiffForRepo());
 
 		this.registerDisposable(
 			onDidChangeGitExecutable((gitExecutable) => {
@@ -346,6 +348,23 @@ export class CommandManager extends Disposable {
 	}
 
 
+	private viewGitDiff() {
+		const uriPath = vscode.window.activeTextEditor?.document.uri.path;
+		if (uriPath && vscode.workspace.workspaceFolders) {
+			const repo = vscode.workspace.workspaceFolders[0].uri.path;
+			const extensionPath = this.context.extensionPath;
+			viewGitDiffByPath(extensionPath, repo, uriPath);
+		}
+	}
+
+	private viewGitDiffForRepo() {
+		if ( vscode.workspace.workspaceFolders) {
+			const repo = vscode.workspace.workspaceFolders[0].uri.path;
+			const extensionPath = this.context.extensionPath;
+			viewGitDiffForRepo(extensionPath, repo);
+		}
+	}
+
 	/* Helper Methods */
 
 	/**

src/config.ts

@@ -83,7 +83,7 @@ class Config {
 		const config: ContextMenuActionsVisibility = {
 			branch: { checkout: true, rename: true, delete: true, merge: true, rebase: true, push: true, viewIssue: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
 			commit: { addTag: true, createBranch: true, checkout: true, cherrypick: true, revert: true, drop: true, merge: true, rebase: true, reset: true, copyHash: true, copySubject: true },
-			commitDetailsViewFile: { viewDiff: true, viewFileAtThisRevision: true, viewDiffWithWorkingFile: true, openFile: true, markAsReviewed: true, markAsNotReviewed: true, resetFileToThisRevision: true, copyAbsoluteFilePath: true, copyRelativeFilePath: true },
+			commitDetailsViewFile: { viewDiff: true, viewDiffInFile: true, viewFileAtThisRevision: true, viewDiffWithWorkingFile: true, openFile: true, markAsReviewed: true, markAsNotReviewed: true, resetFileToThisRevision: true, copyAbsoluteFilePath: true, copyRelativeFilePath: true },
 			remoteBranch: { checkout: true, delete: true, fetch: true, merge: true, pull: true, viewIssue: true, createPullRequest: true, createArchive: true, selectInBranchesDropdown: true, unselectInBranchesDropdown: true, copyName: true },
 			stash: { apply: true, createBranch: true, pop: true, drop: true, copyName: true, copyHash: true },
 			tag: { viewDetails: true, delete: true, push: true, createArchive: true, copyName: true },