Keep checkout picker changes in existing files

Co-authored-by: alexr00 <38270282+alexr00@users.noreply.github.com>

Author: Copilot

src/commands.ts

@@ -24,13 +24,13 @@ import { CopilotRemoteAgentManager, SessionIdForPr } from './github/copilotRemot
 import { guessExtensionFromMime, pickFilesForUpload, placeholdersForNames, runFileUploads, runPendingUploads } from './github/fileUpload';
 import { FolderRepositoryManager } from './github/folderRepositoryManager';
 import { GitHubRepository } from './github/githubRepository';
+import type { PullRequestNumberData } from './github/graphql';
 import { Issue } from './github/interface';
 import { IssueModel } from './github/issueModel';
 import { IssueOverviewPanel } from './github/issueOverview';
 import { GHPRComment, GHPRCommentThread, TemporaryComment } from './github/prComment';
 import { PullRequestModel } from './github/pullRequestModel';
 import { PullRequestOverviewPanel } from './github/pullRequestOverview';
-import { getPullRequestQuickPickItem } from './github/pullRequestQuickPick';
 import { chooseItem } from './github/quickPicks';
 import { RepositoriesManager } from './github/repositoriesManager';
 import { codespacesPrLink, getIssuesUrl, getPullsUrl, isInCodespaces, ISSUE_OR_URL_EXPRESSION, parseIssueExpressionOutput, vscodeDevPrLink } from './github/utils';
@@ -130,6 +130,14 @@ export async function closeAllPrAndReviewEditors() {
 	}
 }
 
+export function getPullRequestQuickPickItem(pr: PullRequestNumberData): vscode.QuickPickItem & { prNumber: number } {
+	return {
+		label: `#${pr.number}`,
+		description: `${pr.title} by @${pr.author.login}`,
+		prNumber: pr.number,
+	};
+}
+
 function isCrossChatSessionWithPR(value: any): value is CrossChatSessionWithPR {
 	const asCrossChatSessionWithPR = value as Partial<CrossChatSessionWithPR>;
 	return !!asCrossChatSessionWithPR.pullRequestDetails;

src/github/pullRequestQuickPick.ts

@@ -1,7 +1,29 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See License.txt in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
 import { default as assert } from 'assert';
 import { parseDiffHunk } from '../common/diffHunk';
+import { getPullRequestQuickPickItem } from '../commands';
 
 describe('Extension Tests', function () {
+	describe('getPullRequestQuickPickItem', () => {
+		it('separates pull request numbers from titles to prioritize exact number matches', () => {
+			const item = getPullRequestQuickPickItem({
+				number: 10063,
+				title: 'upgrade library to v5',
+				author: { login: 'octocat' },
+			});
+
+			assert.deepStrictEqual(item, {
+				label: '#10063',
+				description: 'upgrade library to v5 by @octocat',
+				prNumber: 10063,
+			});
+		});
+	});
+
 	describe('parseDiffHunk', () => {
 		it('should handle empty string', () => {
 			const diffHunk = parseDiffHunk('');