Splits command handling for inspecting details

Renames "Open Inspect" to "Inspect Commit Details"
Renames "Open Line Inspect" to "Inspect Line Commit Details"
Renames "Open Details" to "Inspect Details"
Adds "Search for Commits within Selection" to editor context menu if there is a selection

Author: eamodio

CHANGELOG.md

@@ -6,9 +6,16 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 ## [Unreleased]
 
+### Added
+
+- Adds _Search for Commits within Selection_ command to the editor context menu when there is a selection
+
 ### Changed
 
 - Renames `Reset Stored AI Key` command to `Reset Stored AI Keys...` and adds confirmation prompt with options to reset only the current or all AI keys
+- Renames _Open Inspect_ to _Inspect Commit Details_
+- Renames _Open Line Inspect_ to _Inspect Line Commit Details_
+- Renames _Open Details_ to _Inspect Commit Details_
 
 ### Fixed
 

package.json

@@ -6247,19 +6247,19 @@
 			},
 			{
 				"command": "gitlens.showCommitInView",
-				"title": "Open Inspect",
+				"title": "Inspect Commit Details",
 				"category": "GitLens",
 				"icon": "$(eye)"
 			},
 			{
 				"command": "gitlens.showLineCommitInView",
-				"title": "Open Line Inspect",
+				"title": "Inspect Line Commit Details",
 				"category": "GitLens",
 				"icon": "$(eye)"
 			},
 			{
 				"command": "gitlens.showInDetailsView",
-				"title": "Open Details",
+				"title": "Inspect Details",
 				"category": "GitLens",
 				"icon": "$(eye)"
 			},
@@ -8748,7 +8748,7 @@
 			},
 			{
 				"command": "gitlens.graph.showInDetailsView",
-				"title": "Open Details",
+				"title": "Inspect Details",
 				"category": "GitLens",
 				"icon": "$(eye)"
 			},
@@ -16033,27 +16033,32 @@
 					"group": "2_gitlens@4"
 				},
 				{
-					"command": "gitlens.showLineCommitInView",
+					"command": "gitlens.showQuickCommitFileDetails",
 					"group": "3_gitlens@1"
 				},
 				{
-					"command": "gitlens.showQuickCommitFileDetails",
+					"command": "gitlens.showLineCommitInView",
+					"group": "3_gitlens@2"
+				},
+				{
+					"command": "gitlens.showCommitsInView",
+					"when": "editorTextFocus && editorHasSelection",
 					"group": "3_gitlens@2"
 				},
 				{
 					"command": "gitlens.showQuickRevisionDetails",
 					"when": "gitlens:enabled && resourceScheme =~ /^(gitlens|git|pr)$/ && !isInDiffEditor",
-					"group": "3_gitlens@2"
+					"group": "3_gitlens_1@1"
 				},
 				{
 					"command": "gitlens.showQuickRevisionDetailsInDiffLeft",
 					"when": "gitlens:enabled && resourceScheme =~ /^(gitlens|git|pr)$/ && isInDiffEditor && !isInDiffRightEditor",
-					"group": "3_gitlens@2"
+					"group": "3_gitlens_1@1"
 				},
 				{
 					"command": "gitlens.showQuickRevisionDetailsInDiffRight",
 					"when": "gitlens:enabled && resourceScheme =~ /^(gitlens|git|pr)$/ && isInDiffRightEditor",
-					"group": "3_gitlens@2"
+					"group": "3_gitlens_1@1"
 				}
 			],
 			"gitlens/editor/context/openOn": [
@@ -16128,11 +16133,11 @@
 					"group": "1_gitlens@2"
 				},
 				{
-					"command": "gitlens.showLineCommitInView",
+					"command": "gitlens.showQuickCommitFileDetails",
 					"group": "3_gitlens@1"
 				},
 				{
-					"command": "gitlens.showQuickCommitFileDetails",
+					"command": "gitlens.showLineCommitInView",
 					"group": "3_gitlens@2"
 				}
 			],

src/commands.ts

@@ -25,6 +25,7 @@ import './commands/generateCommitMessage';
 import './commands/ghpr/openOrCreateWorktree';
 import './commands/gitCommands';
 import './commands/inviteToLiveShare';
+import './commands/inspect';
 import './commands/logging';
 import './commands/openAssociatedPullRequestOnRemote';
 import './commands/openBranchesOnRemote';

src/commands/inspect.ts

@@ -0,0 +1,87 @@
+import type { TextEditor, Uri } from 'vscode';
+import { Commands } from '../constants';
+import type { Container } from '../container';
+import { showDetailsView } from '../git/actions/commit';
+import { GitUri } from '../git/gitUri';
+import type { GitRevisionReference } from '../git/models/reference';
+import { createReference, getReferenceFromRevision } from '../git/models/reference';
+import {
+	showFileNotUnderSourceControlWarningMessage,
+	showGenericErrorMessage,
+	showLineUncommittedWarningMessage,
+} from '../messages';
+import { command } from '../system/command';
+import { Logger } from '../system/logger';
+import type { CommandContext } from './base';
+import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
+
+export interface InspectCommandArgs {
+	ref?: GitRevisionReference;
+}
+
+@command()
+export class InspectCommand extends ActiveEditorCommand {
+	static getMarkdownCommandArgs(sha: string, repoPath: string): string;
+	static getMarkdownCommandArgs(args: InspectCommandArgs): string;
+	static getMarkdownCommandArgs(argsOrSha: InspectCommandArgs | string, repoPath?: string): string {
+		const args =
+			typeof argsOrSha === 'string'
+				? { ref: createReference(argsOrSha, repoPath!, { refType: 'revision' }), repoPath: repoPath }
+				: argsOrSha;
+		return super.getMarkdownCommandArgsCore<InspectCommandArgs>(Commands.ShowCommitInView, args);
+	}
+
+	constructor(private readonly container: Container) {
+		super([Commands.ShowCommitInView, Commands.ShowInDetailsView, Commands.ShowLineCommitInView]);
+	}
+
+	protected override preExecute(context: CommandContext, args?: InspectCommandArgs) {
+		if (context.type === 'viewItem') {
+			args = { ...args };
+			if (isCommandContextViewNodeHasCommit(context)) {
+				args.ref = getReferenceFromRevision(context.node.commit);
+			}
+		}
+
+		return this.execute(context.editor, context.uri, args);
+	}
+
+	async execute(editor?: TextEditor, uri?: Uri, args?: InspectCommandArgs) {
+		args = { ...args };
+
+		if (args.ref == null) {
+			uri = getCommandUri(uri, editor);
+			if (uri == null) return undefined;
+
+			const gitUri = await GitUri.fromUri(uri);
+
+			const blameLine = editor?.selection.active.line;
+			if (blameLine == null) return;
+
+			try {
+				const blame = await this.container.git.getBlameForLine(gitUri, blameLine);
+				if (blame == null) {
+					void showFileNotUnderSourceControlWarningMessage('Unable to inspect commit details');
+
+					return;
+				}
+
+				// Because the previous sha of an uncommitted file isn't trust worthy we just have to kick out
+				if (blame.commit.isUncommitted) {
+					void showLineUncommittedWarningMessage('Unable to inspect commit details');
+
+					return;
+				}
+
+				args.ref = blame.commit;
+			} catch (ex) {
+				Logger.error(ex, 'InspectCommand', `getBlameForLine(${blameLine})`);
+				void showGenericErrorMessage('Unable to inspect commit details');
+
+				return;
+			}
+		}
+
+		return showDetailsView(args.ref);
+	}
+}

src/commands/quickCommand.buttons.ts

@@ -183,7 +183,7 @@ export const SetRemoteAsDefaultQuickInputButton: QuickInputButton = {
 
 export const ShowDetailsViewQuickInputButton: QuickInputButton = {
 	iconPath: new ThemeIcon('eye'),
-	tooltip: 'Open Details',
+	tooltip: 'Inspect Details',
 };
 
 export const OpenChangesViewQuickInputButton: QuickInputButton = {

src/commands/showCommitsInView.ts

@@ -2,20 +2,15 @@ import type { TextEditor, Uri } from 'vscode';
 import { Commands } from '../constants';
 import type { Container } from '../container';
 import { executeGitCommand } from '../git/actions';
-import { showDetailsView } from '../git/actions/commit';
 import { GitUri } from '../git/gitUri';
-import type { GitRevisionReference } from '../git/models/reference';
-import { createReference, getReferenceFromRevision } from '../git/models/reference';
 import { createSearchQueryForCommits } from '../git/search';
 import { showFileNotUnderSourceControlWarningMessage, showGenericErrorMessage } from '../messages';
 import { command } from '../system/command';
 import { filterMap } from '../system/iterable';
 import { Logger } from '../system/logger';
-import type { CommandContext } from './base';
-import { ActiveEditorCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
+import { ActiveEditorCommand, getCommandUri } from './base';
 
 export interface ShowCommitsInViewCommandArgs {
-	ref?: GitRevisionReference;
 	refs?: string[];
 	repoPath?: string;
 }
@@ -26,30 +21,17 @@ export class ShowCommitsInViewCommand extends ActiveEditorCommand {
 	static getMarkdownCommandArgs(args: ShowCommitsInViewCommandArgs): string;
 	static getMarkdownCommandArgs(argsOrSha: ShowCommitsInViewCommandArgs | string, repoPath?: string): string {
 		const args = typeof argsOrSha === 'string' ? { refs: [argsOrSha], repoPath: repoPath } : argsOrSha;
-		return super.getMarkdownCommandArgsCore<ShowCommitsInViewCommandArgs>(Commands.ShowCommitInView, args);
+		return super.getMarkdownCommandArgsCore<ShowCommitsInViewCommandArgs>(Commands.ShowCommitsInView, args);
 	}
 
 	constructor(private readonly container: Container) {
-		super([Commands.ShowCommitInView, Commands.ShowInDetailsView, Commands.ShowCommitsInView]);
-	}
-
-	protected override preExecute(context: CommandContext, args?: ShowCommitsInViewCommandArgs) {
-		if (context.type === 'viewItem') {
-			args = { ...args };
-			if (isCommandContextViewNodeHasCommit(context)) {
-				args.ref = getReferenceFromRevision(context.node.commit);
-			}
-		}
-
-		return this.execute(context.editor, context.uri, args);
+		super(Commands.ShowCommitsInView);
 	}
 
 	async execute(editor?: TextEditor, uri?: Uri, args?: ShowCommitsInViewCommandArgs) {
 		args = { ...args };
 
-		if (args.ref != null) return showDetailsView(args.ref);
-
-		if (args.refs === undefined) {
+		if (args.refs == null) {
 			uri = getCommandUri(uri, editor);
 			if (uri == null) return undefined;
 
@@ -83,9 +65,9 @@ export class ShowCommitsInViewCommand extends ActiveEditorCommand {
 			}
 		}
 
-		if (args.refs.length === 1) {
-			return showDetailsView(createReference(args.refs[0], args.repoPath!, { refType: 'revision' }));
-		}
+		// if (args.refs.length === 1) {
+		// 	return showDetailsView(createReference(args.refs[0], args.repoPath!, { refType: 'revision' }));
+		// }
 
 		return executeGitCommand({
 			command: 'search',

src/commands/showQuickCommitFile.ts

@@ -13,20 +13,17 @@ import {
 	showGenericErrorMessage,
 	showLineUncommittedWarningMessage,
 } from '../messages';
-import { command, executeCommand } from '../system/command';
+import { command } from '../system/command';
 import { Logger } from '../system/logger';
 import type { CommandContext } from './base';
 import { ActiveEditorCachedCommand, getCommandUri, isCommandContextViewNodeHasCommit } from './base';
-import type { ShowCommitsInViewCommandArgs } from './showCommitsInView';
 
 export interface ShowQuickCommitFileCommandArgs {
 	commit?: GitCommit | GitStashCommit;
 	line?: number;
 	fileLog?: GitLog;
 	revisionUri?: string;
 	sha?: string;
-
-	inView?: boolean;
 }
 
 @command()
@@ -41,7 +38,6 @@ export class ShowQuickCommitFileCommand extends ActiveEditorCachedCommand {
 			Commands.ShowQuickCommitRevision,
 			Commands.ShowQuickCommitRevisionInDiffLeft,
 			Commands.ShowQuickCommitRevisionInDiffRight,
-			Commands.ShowLineCommitInView,
 		]);
 	}
 
@@ -50,10 +46,6 @@ export class ShowQuickCommitFileCommand extends ActiveEditorCachedCommand {
 			args = { ...args, line: context.line };
 		}
 
-		if (context.command === Commands.ShowLineCommitInView) {
-			args = { ...args, inView: true };
-		}
-
 		if (context.editor != null && context.command.startsWith(Commands.ShowQuickCommitRevision)) {
 			const gitUri = await GitUri.fromUri(context.editor.document.uri);
 
@@ -151,21 +143,14 @@ export class ShowQuickCommitFileCommand extends ActiveEditorCachedCommand {
 				}
 			}
 
-			if (args.inView) {
-				await executeCommand<ShowCommitsInViewCommandArgs>(Commands.ShowCommitsInView, {
-					refs: [args.commit.sha],
-					repoPath: args.commit.repoPath,
-				});
-			} else {
-				await executeGitCommand({
-					command: 'show',
-					state: {
-						repo: args.commit.repoPath,
-						reference: args.commit,
-						fileName: path,
-					},
-				});
-			}
+			await executeGitCommand({
+				command: 'show',
+				state: {
+					repo: args.commit.repoPath,
+					reference: args.commit,
+					fileName: path,
+				},
+			});
 		} catch (ex) {
 			Logger.error(ex, 'ShowQuickCommitFileDetailsCommand');
 			void showGenericErrorMessage('Unable to show commit file details');