Add option to open file on click in Search & Compare view

CHANGELOG.md

@@ -6,6 +6,11 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- Added the option to open a file instead of showing a diff when clicking in _Search & Compare_
+  - Closes [#1651](https://github.com/gitkraken/vscode-gitlens/issues/1651)
+
 ### Fixed
 
 - Fixes [#3582](https://github.com/gitkraken/vscode-gitlens/issues/3582) - "Delete Branch" option is sometimes unexpectedly missing

README.md

@@ -447,6 +447,7 @@ A big thanks to the people that have contributed to this project 🙏❤️:
 - may ([@m4rch3n1ng](https://github.com/m4rch3n1ng)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=m4rch3n1ng)
 - bm-w ([@bm-w](https://github.com/bm-w)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=bm-w)
 - Tyler Johnson ([@TJohnsonSE](https://github.com/TJohnsonSE)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=TJohnsonSE)
+- Ehab Younes ([@EhabY](https://github.com/EhabY)) — [contributions](https://github.com/gitkraken/vscode-gitlens/commits?author=EhabY)
 
 Also special thanks to the people that have provided support, testing, brainstorming, etc:
 

package.json

@@ -2864,6 +2864,13 @@
 						"scope": "window",
 						"order": 22
 					},
+					"gitlens.views.searchAndCompare.files.openDiffOnClick": {
+						"type": "boolean",
+						"default": "true",
+						"markdownDescription": "Specifies whether to open the diff view or the file itself when clicking on a file in the _Search & Compare_ view",
+						"scope": "window",
+						"order": 23
+					},
 					"gitlens.views.searchAndCompare.files.icon": {
 						"type": "string",
 						"default": "type",

src/commands/openFileAtRevision.ts

@@ -101,18 +101,18 @@ export class OpenFileAtRevisionCommand extends ActiveEditorCommand {
 	}
 
 	async execute(editor: TextEditor | undefined, uri?: Uri, args?: OpenFileAtRevisionCommandArgs) {
-		uri = getCommandUri(uri, editor);
-		if (uri == null) return;
-
-		const gitUri = await GitUri.fromUri(uri);
-
 		args = { ...args };
 		if (args.line == null) {
 			args.line = editor?.selection.active.line ?? 0;
 		}
 
 		try {
 			if (args.revisionUri == null) {
+				uri = getCommandUri(uri, editor);
+				if (uri == null) return;
+
+				const gitUri = await GitUri.fromUri(uri);
+
 				const log = this.container.git.getLogForFile(gitUri.repoPath, gitUri.fsPath).then(
 					log =>
 						log ??

src/config.ts

@@ -817,7 +817,9 @@ export interface RepositoriesViewConfig {
 
 export interface SearchAndCompareViewConfig {
 	readonly avatars: boolean;
-	readonly files: ViewsFilesConfig;
+	readonly files: ViewsFilesConfig & {
+		readonly openDiffOnClick: boolean;
+	};
 	readonly pullRequests: {
 		readonly enabled: boolean;
 		readonly showForCommits: boolean;

src/views/nodes/commitFileNode.ts

@@ -1,6 +1,7 @@
-import type { Command, Selection } from 'vscode';
+import type { Command, Selection, TextDocumentShowOptions } from 'vscode';
 import { MarkdownString, TreeItem, TreeItemCollapsibleState, Uri } from 'vscode';
 import type { DiffWithPreviousCommandArgs } from '../../commands/diffWithPrevious';
+import type { OpenFileAtRevisionCommandArgs } from '../../commands/openFileAtRevision';
 import { Schemes } from '../../constants';
 import { Commands } from '../../constants.commands';
 import type { TreeViewRefFileNodeTypes } from '../../constants.views';
@@ -175,14 +176,30 @@ export abstract class CommitFileNodeBase<
 			line = this.options?.selection?.active.line ?? 0;
 		}
 
+		const showOptions: TextDocumentShowOptions = {
+			preserveFocus: true,
+			preview: true,
+		};
+
+		const filesConfig = this.view.config.files;
+		if ('openDiffOnClick' in filesConfig && filesConfig.openDiffOnClick === false) {
+			const commandArgs: OpenFileAtRevisionCommandArgs = {
+				revisionUri: GitUri.fromFile(this.file, this.commit.repoPath, this.ref.ref),
+				line: line,
+				showOptions: showOptions,
+			};
+			return {
+				title: 'Open File',
+				command: Commands.OpenFileAtRevision,
+				arguments: [commandArgs],
+			};
+		}
+
 		const commandArgs: DiffWithPreviousCommandArgs = {
 			commit: this.commit,
 			uri: GitUri.fromFile(this.file, this.commit.repoPath),
 			line: line,
-			showOptions: {
-				preserveFocus: true,
-				preview: true,
-			},
+			showOptions: showOptions,
 		};
 		return {
 			title: 'Open Changes with Previous Revision',

src/webviews/apps/settings/partials/views.searchAndCompare.html

@@ -114,6 +114,21 @@ <h2>
 						<p class="setting__hint">Compacts (flattens) unnecessary nesting when using a tree layouts</p>
 					</div>
 
+					<div class="setting">
+						<div class="setting__input">
+							<input
+								id="views.searchAndCompare.files.openDiffOnClick"
+								name="views.searchAndCompare.files.openDiffOnClick"
+								type="checkbox"
+								data-setting
+							/>
+							<label for="views.searchAndCompare.files.openDiffOnClick">Open file diff on click</label>
+						</div>
+						<p class="setting__hint">
+							Opens the diff view when clicking on a file instead of opening the file itself
+						</p>
+					</div>
+
 					<div class="setting">
 						<div class="setting__input">
 							<input