Integrate PR mhutchie#742: Diff2HTML Support and Fix Tests

Author: AngelAlexQC

CHANGELOG.md

@@ -8,6 +8,7 @@
 * #394 New "Sticky Scroll" option for the Commit Graph.
 * #473 Display CI/CD Status (e.g. GitHub Actions) in the graph.
 * #763 New "Show HEAD" button in the controls bar to scroll to the HEAD commit.
+* #742 New "View Diff In File" action on the File Context Menu in the Commit Details View, utilizing Diff2HTML.
 
 ### Español
 * #602 Nueva acción "Copiar Hash del Commit al Portapapeles".
@@ -17,6 +18,7 @@
 * #394 Nueva opción de "Desplazamiento Pegajoso" para el Gráfico de Commits.
 * #473 Muestra el estado de CI/CD (por ejemplo, GitHub Actions) en el gráfico.
 * #763 Nuevo botón "Mostrar HEAD" en la barra de controles para desplazarse al commit HEAD.
+* #742 Nueva acción "Ver Diff en Archivo" en el Menú Contextual de Archivos en la Vista de Detalles del Commit, utilizando Diff2HTML.
 
 ## 1.30.0 - 2021-04-05
 * #395 Added a "Force Fetch" option onto the "Fetch into Local Branch" Dialog, allowing any local branch (that's not checked out) to be reset to the remote branch. This dialog is accessed via the Remote Branch Context Menu.

package-lock.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",
@@ -101,6 +101,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": {
@@ -256,6 +266,10 @@
 									"type": "boolean",
 									"title": "View Diff"
 								},
+								"viewDiffInFile": {
+									"type": "boolean",
+									"title": "View Diff in file"
+								},
 								"viewFileAtThisRevision": {
 									"type": "boolean",
 									"title": "View File at this Revision"
@@ -1558,9 +1572,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/react": "^17.0.0",
@@ -1574,4 +1591,4 @@
 		"typescript": "^4.9.5",
 		"uglify-js": "3.10.0"
 	}
-}
+}

package.json

@@ -9,7 +9,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';
 
@@ -61,6 +61,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) => {
@@ -358,6 +360,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 */
 
 	/**

resources/diff2html-ui.min.js

@@ -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 },