Opens all changes after open in worktree flow finished for PRs

nzaytsev · nzaytsev · commit 4c7014ae6721 · 2024-10-30T11:56:03.000+07:00
diff --git a/src/commands/git/worktree.ts b/src/commands/git/worktree.ts
@@ -128,6 +128,8 @@ interface OpenState {
 	worktree: GitWorktree;
 	flags: OpenFlags[];
 
+	prId?: string;
+
 	openOnly?: boolean;
 	overrides?: {
 		disallowBack?: boolean;
diff --git a/src/plus/launchpad/launchpadProvider.ts b/src/plus/launchpad/launchpadProvider.ts
@@ -35,8 +35,7 @@ import { executeCommand, registerCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import { setContext } from '../../system/vscode/context';
 import { openUrl } from '../../system/vscode/utils';
-import type { UriTypes } from '../../uris/deepLinks/deepLink';
-import { DeepLinkActionType, DeepLinkType } from '../../uris/deepLinks/deepLink';
+import { DeepLinkActionType, DeepLinkType, UriTypes } from '../../uris/deepLinks/deepLink';
 import { showInspectView } from '../../webviews/commitDetails/actions';
 import type { ShowWipArgs } from '../../webviews/commitDetails/protocol';
 import type { IntegrationResult } from '../integrations/integration';
@@ -1023,17 +1022,27 @@ export function getPullRequestBranchDeepLink(
 	headRefBranchName: string,
 	remoteUrl: string,
 	action?: DeepLinkActionType,
+	prId?: string,
 ) {
 	const schemeOverride = configuration.get('deepLinks.schemeOverride');
 	const scheme = typeof schemeOverride === 'string' ? schemeOverride : env.uriScheme;
+
+	const searchParams = new URLSearchParams({
+		url: ensureRemoteUrl(remoteUrl),
+	});
+	if (action) {
+		searchParams.set('action', action);
+	}
+	if (prId) {
+		searchParams.set('prId', prId);
+	}
+
 	// TODO: Get the proper pull URL from the provider, rather than tacking .git at the end of the
 	// url from the head ref.
 	return Uri.parse(
-		`${scheme}://${container.context.extension.id}/${'link' satisfies UriTypes}/${DeepLinkType.Repository}/-/${
+		`${scheme}://${container.context.extension.id}/${UriTypes.link}/${DeepLinkType.Repository}/-/${
 			DeepLinkType.Branch
-		}/${encodeURIComponent(headRefBranchName)}?url=${encodeURIComponent(ensureRemoteUrl(remoteUrl))}${
-			action != null ? `&action=${action}` : ''
-		}`,
+		}/${encodeURIComponent(headRefBranchName)}?${searchParams.toString()}`,
 	);
 }
 
diff --git a/src/uris/deepLinks/deepLink.ts b/src/uris/deepLinks/deepLink.ts
@@ -5,7 +5,9 @@ import type { GitRemote } from '../../git/models/remote';
 import type { Repository } from '../../git/models/repository';
 import type { OpenWorkspaceLocation } from '../../system/vscode/utils';
 
-export type UriTypes = 'link';
+export enum UriTypes {
+	link = 'link',
+}
 
 export enum DeepLinkType {
 	Branch = 'b',
@@ -38,6 +40,7 @@ export enum DeepLinkActionType {
 	SwitchToPullRequest = 'switch-to-pr',
 	SwitchToPullRequestWorktree = 'switch-to-pr-worktree',
 	SwitchToAndSuggestPullRequest = 'switch-to-and-suggest-pr',
+	OpenAllPrChanges = 'open-all-pr-changes',
 }
 
 export const AccountDeepLinkTypes: DeepLinkType[] = [DeepLinkType.Draft, DeepLinkType.Workspace];
@@ -92,6 +95,7 @@ export interface DeepLink {
 	secondaryTargetId?: string;
 	secondaryRemoteUrl?: string;
 	action?: string;
+	prId?: string;
 	params?: URLSearchParams;
 }
 
@@ -170,6 +174,7 @@ export function parseDeepLinkUri(uri: Uri): DeepLink | undefined {
 				secondaryRemoteUrl: secondaryRemoteUrl,
 				action: action,
 				params: urlParams,
+				prId: urlParams.get('prId') ?? undefined,
 			};
 		}
 		case DeepLinkType.Draft: {
@@ -231,6 +236,7 @@ export const enum DeepLinkServiceState {
 	OpenInspect,
 	SwitchToRef,
 	RunCommand,
+	OpenAllPrChanges,
 }
 
 export const enum DeepLinkServiceAction {
@@ -263,6 +269,7 @@ export const enum DeepLinkServiceAction {
 	OpenFile,
 	OpenInspect,
 	OpenSwitch,
+	OpenAllPrChanges,
 }
 
 export type DeepLinkRepoOpenType = 'clone' | 'folder' | 'workspace' | 'current';
@@ -284,6 +291,7 @@ export interface DeepLinkServiceContext {
 	targetSha?: string | undefined;
 	secondaryTargetSha?: string | undefined;
 	action?: string | undefined;
+	prId?: string | undefined;
 	repoOpenLocation?: OpenWorkspaceLocation | undefined;
 	repoOpenUri?: Uri | undefined;
 	params?: URLSearchParams | undefined;
@@ -379,6 +387,7 @@ export const deepLinkStateTransitionTable: Record<string, Record<string, DeepLin
 		[DeepLinkServiceAction.OpenGraph]: DeepLinkServiceState.OpenGraph,
 		[DeepLinkServiceAction.OpenFile]: DeepLinkServiceState.OpenFile,
 		[DeepLinkServiceAction.OpenSwitch]: DeepLinkServiceState.SwitchToRef,
+		[DeepLinkServiceAction.OpenAllPrChanges]: DeepLinkServiceState.OpenAllPrChanges,
 		[DeepLinkServiceAction.OpenComparison]: DeepLinkServiceState.OpenComparison,
 		[DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle,
 		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
@@ -409,6 +418,12 @@ export const deepLinkStateTransitionTable: Record<string, Record<string, DeepLin
 		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
 	},
 	[DeepLinkServiceState.OpenInspect]: {
+		[DeepLinkServiceAction.OpenAllPrChanges]: DeepLinkServiceState.EnsureRemoteMatch,
+		[DeepLinkServiceAction.DeepLinkResolved]: DeepLinkServiceState.Idle,
+		[DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle,
+		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
+	},
+	[DeepLinkServiceState.OpenAllPrChanges]: {
 		[DeepLinkServiceAction.DeepLinkResolved]: DeepLinkServiceState.Idle,
 		[DeepLinkServiceAction.DeepLinkErrored]: DeepLinkServiceState.Idle,
 		[DeepLinkServiceAction.DeepLinkCancelled]: DeepLinkServiceState.Idle,
diff --git a/src/uris/deepLinks/deepLinkService.ts b/src/uris/deepLinks/deepLinkService.ts
@@ -4,10 +4,11 @@ import { Commands } from '../../constants.commands';
 import type { StoredDeepLinkContext, StoredNamedRef } from '../../constants.storage';
 import type { Container } from '../../container';
 import { executeGitCommand } from '../../git/actions';
-import { openFileAtRevision } from '../../git/actions/commit';
+import { openComparisonChanges, openFileAtRevision } from '../../git/actions/commit';
 import type { GitBranch } from '../../git/models/branch';
 import { getBranchNameWithoutRemote } from '../../git/models/branch';
 import type { GitCommit } from '../../git/models/commit';
+import { getComparisonRefsForPullRequest } from '../../git/models/pullRequest';
 import type { GitReference } from '../../git/models/reference';
 import { createReference, isSha } from '../../git/models/reference';
 import type { Repository, RepositoryChangeEvent } from '../../git/models/repository';
@@ -19,6 +20,7 @@ import { missingRepositoryId } from '../../gk/models/repositoryIdentities';
 import { ensureAccount, ensurePaidPlan } from '../../plus/utils';
 import type { ShowInCommitGraphCommandArgs } from '../../plus/webviews/graph/protocol';
 import { createQuickPickSeparator } from '../../quickpicks/items/common';
+import { debug } from '../../system/decorators/log';
 import { once } from '../../system/event';
 import { Logger } from '../../system/logger';
 import { normalizePath } from '../../system/path';
@@ -29,7 +31,7 @@ import type { OpenWorkspaceLocation } from '../../system/vscode/utils';
 import { findOrOpenEditor, openWorkspace } from '../../system/vscode/utils';
 import { showInspectView } from '../../webviews/commitDetails/actions';
 import type { ShowWipArgs } from '../../webviews/commitDetails/protocol';
-import type { DeepLink, DeepLinkProgress, DeepLinkRepoOpenType, DeepLinkServiceContext, UriTypes } from './deepLink';
+import type { DeepLink, DeepLinkProgress, DeepLinkRepoOpenType, DeepLinkServiceContext } from './deepLink';
 import {
 	AccountDeepLinkTypes,
 	DeepLinkActionType,
@@ -43,6 +45,7 @@ import {
 	isDeepLinkCommandType,
 	PaidDeepLinkTypes,
 	parseDeepLinkUri,
+	UriTypes,
 } from './deepLink';
 
 type OpenQuickPickItem = {
@@ -68,10 +71,7 @@ export class DeepLinkService implements Disposable {
 		this._disposables.push(container.uri.onDidReceiveUri(async (uri: Uri) => this.processDeepLinkUri(uri)));
 
 		const pendingDeepLink = this.container.storage.get('deepLinks:pending');
-		if (pendingDeepLink != null) {
-			void this.container.storage.delete('deepLinks:pending');
-			void this.processPendingDeepLink(pendingDeepLink);
-		}
+		void this.processPendingDeepLink(pendingDeepLink);
 	}
 
 	dispose() {
@@ -114,6 +114,7 @@ export class DeepLinkService implements Disposable {
 			targetId: link.targetId,
 			secondaryTargetId: link.secondaryTargetId,
 			secondaryRemoteUrl: link.secondaryRemoteUrl,
+			prId: link.prId,
 			action: link.action,
 			params: link.params,
 		};
@@ -241,9 +242,11 @@ export class DeepLinkService implements Disposable {
 		}
 	}
 
-	private async processPendingDeepLink(pendingDeepLink: StoredDeepLinkContext) {
-		if (pendingDeepLink.url == null) return;
+	@debug()
+	private async processPendingDeepLink(pendingDeepLink: StoredDeepLinkContext | undefined) {
+		void this.container.storage.delete('deepLinks:pending');
 
+		if (pendingDeepLink?.url == null) return;
 		const link = parseDeepLinkUri(Uri.parse(pendingDeepLink.url));
 		if (link == null) return;
 
@@ -509,6 +512,7 @@ export class DeepLinkService implements Disposable {
 	// TODO @axosoft-ramint: Move all the logic for matching a repo, prompting to add repo, matching remote, etc. for a target (branch, PR, etc.)
 	// to a separate service where it can be used outside of the context of deep linking. Then the deep link service should leverage it,
 	// and we should stop using deep links to process things like Launchpad switch actions, Open in Worktree command, etc.
+	@debug()
 	private async processDeepLink(
 		initialAction: DeepLinkServiceAction = DeepLinkServiceAction.DeepLinkEventFired,
 		useProgress: boolean = true,
@@ -562,6 +566,7 @@ export class DeepLinkService implements Disposable {
 				remoteUrl,
 				secondaryRemoteUrl,
 				remote,
+				prId,
 				secondaryRemote,
 				repoPath,
 				filePath,
@@ -1077,7 +1082,11 @@ export class DeepLinkService implements Disposable {
 					return;
 				}
 				case DeepLinkServiceState.GoToTarget: {
-					// Need to re-fetch the remotes in case we opened in a new window
+					// Re-fetching the remotes in case we opened in a new window for specific actions
+					if (this._context.action === DeepLinkActionType.OpenAllPrChanges) {
+						action = DeepLinkServiceAction.OpenAllPrChanges;
+						break;
+					}
 
 					if (targetType === DeepLinkType.Repository) {
 						if (
@@ -1373,7 +1382,6 @@ export class DeepLinkService implements Disposable {
 				case DeepLinkServiceState.OpenInspect: {
 					// If we arrive at this step, clear any stored data used for the "new window" option
 					await this.container.storage.delete('deepLinks:pending');
-
 					if (!repo) {
 						action = DeepLinkServiceAction.DeepLinkErrored;
 						message = 'Missing repository.';
@@ -1386,6 +1394,43 @@ export class DeepLinkService implements Disposable {
 						repository: repo,
 						source: 'launchpad',
 					} satisfies ShowWipArgs);
+					if (this._context.prId) {
+						this._context.action = DeepLinkActionType.OpenAllPrChanges;
+						action = DeepLinkServiceAction.OpenAllPrChanges;
+					} else {
+						action = DeepLinkServiceAction.DeepLinkResolved;
+					}
+					break;
+				}
+				case DeepLinkServiceState.OpenAllPrChanges: {
+					if (!repoPath || !remote || !prId) {
+						action = DeepLinkServiceAction.DeepLinkErrored;
+						if (!repoPath) {
+							message = 'No repository path was provided.';
+						} else if (!remote) {
+							message = 'No remote was matched.';
+						} else {
+							message = 'No pull request id provided.';
+						}
+						break;
+					}
+					const pullRequestsOfRemote = await this.container.integrations.getMyPullRequestsForRemotes(remote);
+					const pullRequest = pullRequestsOfRemote?.value?.find(x => x.pullRequest.id === prId)?.pullRequest;
+					if (!pullRequest?.refs) {
+						action = DeepLinkServiceAction.DeepLinkErrored;
+						message = 'No pull request or pull request refs was found.';
+						break;
+					}
+					const refs = getComparisonRefsForPullRequest(repoPath, pullRequest.refs);
+					await openComparisonChanges(
+						this.container,
+						{
+							repoPath: refs.repoPath,
+							lhs: refs.base.ref,
+							rhs: refs.head.ref,
+						},
+						{ title: `Changes in Pull Request "${pullRequest.title}"` },
+					);
 					action = DeepLinkServiceAction.DeepLinkResolved;
 					break;
 				}
@@ -1522,9 +1567,7 @@ export class DeepLinkService implements Disposable {
 
 		// Start with the prefix, add the repo prefix and the repo ID to the URL, and then add the target tag and target ID to the URL (if applicable)
 		const deepLink = new URL(
-			`${scheme}://${this.container.context.extension.id}/${'link' satisfies UriTypes}/${
-				DeepLinkType.Repository
-			}/${repoId}${target}`,
+			`${scheme}://${this.container.context.extension.id}/${UriTypes.link}/${DeepLinkType.Repository}/${repoId}${target}`,
 		);
 
 		if (remoteUrl != null) {
@@ -1575,9 +1618,7 @@ export class DeepLinkService implements Disposable {
 		}
 
 		const deepLink = new URL(
-			`${scheme}://${this.container.context.extension.id}/${'link' satisfies UriTypes}/${
-				DeepLinkType.Repository
-			}/${repoId}/${targetType}/${targetId}`,
+			`${scheme}://${this.container.context.extension.id}/${UriTypes.link}/${DeepLinkType.Repository}/${repoId}/${targetType}/${targetId}`,
 		);
 
 		deepLink.searchParams.set('url', remoteUrl);
diff --git a/src/views/viewCommands.ts b/src/views/viewCommands.ts
@@ -808,6 +808,7 @@ export class ViewCommands {
 				pr.refs.head.branch,
 				repoIdentity.remote.url,
 				DeepLinkActionType.SwitchToPullRequestWorktree,
+				pr.id,
 			);
 
 			const prRepo = await getOrOpenPullRequestRepository(this.container, pr, {
