Fix delete branch after merge for merge queues (#8437)

Fixes #8435

Author: alexr00

package.nls.json

@@ -41,7 +41,7 @@
 	"githubPullRequests.fileAutoReveal.description": "Automatically reveal open files in the pull request changes tree.",
 	"githubPullRequests.defaultDeletionMethod.selectLocalBranch.description": "When true, the option to delete the local branch will be selected by default when deleting a branch from a pull request.",
 	"githubPullRequests.defaultDeletionMethod.selectRemote.description": "When true, the option to delete the remote will be selected by default when deleting a branch from a pull request.",
-	"githubPullRequests.deleteBranchAfterMerge.description": "Automatically delete the branch after merging a pull request. This setting only applies when the pull request is merged through this extension.",
+	"githubPullRequests.deleteBranchAfterMerge.description": "Automatically delete the branch after merging a pull request. This setting only applies when the pull request is merged through this extension. When using merge queues, this will only delete the local branch.",
 	"githubPullRequests.terminalLinksHandler.description": "Default handler for terminal links.",
 	"githubPullRequests.terminalLinksHandler.github": "Create the pull request on GitHub.",
 	"githubPullRequests.terminalLinksHandler.vscode": "Create the pull request in VS Code.",

src/github/pullRequestOverview.ts

@@ -874,6 +874,14 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 
 	private async enqueue(message: IRequestMessage<void>): Promise<void> {
 		const result = await this._item.enqueuePullRequest();
+
+		// Check if auto-delete branch setting is enabled
+		const deleteBranchAfterMerge = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE).get<boolean>(DELETE_BRANCH_AFTER_MERGE, false);
+		if (deleteBranchAfterMerge && result) {
+			// For merge queues, only delete the local branch since the PR isn't merged yet
+			await PullRequestReviewCommon.autoDeleteLocalBranchAfterEnqueue(this._folderRepositoryManager, this._item);
+		}
+
 		this._replyMessage(message, { mergeQueueEntry: result });
 	}
 

src/github/pullRequestReviewCommon.ts

@@ -427,6 +427,39 @@ export namespace PullRequestReviewCommon {
 		return deletedBranchTypes;
 	}
 
+	/**
+	 * Automatically delete the local branch after adding to a merge queue.
+	 * Only deletes the local branch since the PR isn't merged yet.
+	 */
+	export async function autoDeleteLocalBranchAfterEnqueue(folderRepositoryManager: FolderRepositoryManager, item: PullRequestModel): Promise<void> {
+		const branchInfo = await folderRepositoryManager.getBranchNameForPullRequest(item);
+		const defaultBranch = await folderRepositoryManager.getPullRequestRepositoryDefaultBranch(item);
+
+		// Get user preference for local branch deletion
+		const deleteLocalBranch = vscode.workspace
+			.getConfiguration(PR_SETTINGS_NAMESPACE)
+			.get<boolean>(`${DEFAULT_DELETION_METHOD}.${SELECT_LOCAL_BRANCH}`, true);
+
+		if (!branchInfo || !deleteLocalBranch) {
+			return;
+		}
+
+		const selectedActions: SelectedAction[] = [{ type: 'local' }];
+
+		// Execute deletion
+		const deletedBranchTypes = await performBranchDeletion(folderRepositoryManager, item, defaultBranch, branchInfo, selectedActions);
+
+		// Show notification
+		if (deletedBranchTypes.includes('local')) {
+			const branchName = branchInfo.branch || item.head?.ref;
+			if (branchName) {
+				vscode.window.showInformationMessage(
+					vscode.l10n.t('Deleted local branch {0}.', branchName)
+				);
+			}
+		}
+	}
+
 	/**
 	 * Automatically delete branches after merge based on user preferences.
 	 * This function does not show any prompts - it uses the default deletion method preferences.