CCR feedback

Co-authored-by: Copilot <copilot@github.com>

Author: alexr00

src/github/pullRequestOverview.ts

@@ -460,14 +460,17 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 				revertable: pullRequest.state === GithubItemStateEnum.Merged,
 				isCopilotOnMyBehalf: await isCopilotOnMyBehalf(pullRequest, currentUser, coAuthors),
 				generateDescriptionTitle: this.getGenerateDescriptionTitle(),
-				closingIssues: await Promise.all((pullRequest.closingIssues ?? []).map(async issue => {
+				closingIssues: await (async () => {
 					const enterpriseUri = pullRequest.remote.isEnterprise ? getEnterpriseUri() : undefined;
-					const parsed = parseIssueExpressionOutput(issue.url.match(getIssueOrURLExpression(enterpriseUri)));
-					const owner = parsed?.owner ?? pullRequest.remote.owner;
-					const repo = parsed?.name ?? pullRequest.remote.repositoryName;
-					const webviewUri = await toOpenIssueWebviewUri({ owner, repo, issueNumber: issue.number });
-					return { ...issue, url: webviewUri.toString() };
-				})),
+					const issueOrUrlExpression = getIssueOrURLExpression(enterpriseUri);
+					return Promise.all((pullRequest.closingIssues ?? []).map(async issue => {
+						const parsed = parseIssueExpressionOutput(issue.url.match(issueOrUrlExpression));
+						const owner = parsed?.owner ?? pullRequest.remote.owner;
+						const repo = parsed?.name ?? pullRequest.remote.repositoryName;
+						const webviewUri = await toOpenIssueWebviewUri({ owner, repo, issueNumber: issue.number });
+						return { ...issue, url: webviewUri.toString() };
+					}));
+				})(),
 			};
 			this._postMessage({
 				command: 'pr.initialize',

src/test/issues/issuesUtils.test.ts

@@ -4,7 +4,8 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { default as assert } from 'assert';
-import { parseIssueExpressionOutput, ISSUE_OR_URL_EXPRESSION } from '../../github/utils';
+import * as vscode from 'vscode';
+import { getIssueOrURLExpression, ISSUE_OR_URL_EXPRESSION, parseIssueExpressionOutput } from '../../github/utils';
 
 describe('Issues utilities', function () {
 	it('regular expressions', async function () {
@@ -65,4 +66,44 @@ describe('Issues utilities', function () {
 		assert.strictEqual(prUrlHttpParsed?.name, 'repo');
 		assert.strictEqual(prUrlHttpParsed?.owner, 'owner');
 	});
+
+	it('getIssueOrURLExpression matches enterprise host URLs', function () {
+		const enterpriseExpression = getIssueOrURLExpression(vscode.Uri.parse('https://my.ghe.host'));
+
+		// Enterprise host URL is matched
+		const enterpriseIssueUrl = 'https://my.ghe.host/org/repo/issues/123';
+		const enterpriseIssueParsed = parseIssueExpressionOutput(enterpriseIssueUrl.match(enterpriseExpression));
+		assert.strictEqual(enterpriseIssueParsed?.issueNumber, 123);
+		assert.strictEqual(enterpriseIssueParsed?.commentNumber, undefined);
+		assert.strictEqual(enterpriseIssueParsed?.name, 'repo');
+		assert.strictEqual(enterpriseIssueParsed?.owner, 'org');
+
+		// Enterprise PR URL is matched
+		const enterprisePrUrl = 'https://my.ghe.host/org/repo/pull/456';
+		const enterprisePrParsed = parseIssueExpressionOutput(enterprisePrUrl.match(enterpriseExpression));
+		assert.strictEqual(enterprisePrParsed?.issueNumber, 456);
+		assert.strictEqual(enterprisePrParsed?.name, 'repo');
+		assert.strictEqual(enterprisePrParsed?.owner, 'org');
+
+		// Enterprise comment URL is matched
+		const enterpriseCommentUrl = 'https://my.ghe.host/org/repo/issues/789#issuecomment-12345';
+		const enterpriseCommentParsed = parseIssueExpressionOutput(enterpriseCommentUrl.match(enterpriseExpression));
+		assert.strictEqual(enterpriseCommentParsed?.issueNumber, 789);
+		assert.strictEqual(enterpriseCommentParsed?.commentNumber, 12345);
+		assert.strictEqual(enterpriseCommentParsed?.name, 'repo');
+		assert.strictEqual(enterpriseCommentParsed?.owner, 'org');
+
+		// github.com URLs are still matched when an enterprise URI is provided
+		const dotComUrl = 'https://github.com/microsoft/vscode/issues/96';
+		const dotComParsed = parseIssueExpressionOutput(dotComUrl.match(enterpriseExpression));
+		assert.strictEqual(dotComParsed?.issueNumber, 96);
+		assert.strictEqual(dotComParsed?.name, 'vscode');
+		assert.strictEqual(dotComParsed?.owner, 'microsoft');
+
+		// Without an enterprise URI, only github.com URLs are matched as full URLs
+		const defaultExpression = getIssueOrURLExpression();
+		const enterpriseAgainstDefault = parseIssueExpressionOutput(enterpriseIssueUrl.match(defaultExpression));
+		// The owner/repo/number should not match the URL form (the alternate `owner/repo#num` form is also not present here).
+		assert.strictEqual(enterpriseAgainstDefault, undefined);
+	});
 });