Moves PR URL util functions to pullRequest.ts from github.ts and rename,

because they are not GitHub specific.
(#3543)

Author: sergeibbb

src/plus/integrations/providers/__tests__/github.test.ts renamed to src/git/models/__tests__/pullRequest.test.ts

@@ -1,6 +1,6 @@
 import * as assert from 'assert';
 import { suite, test } from 'mocha';
-import { getPullRequestIdentityValuesFromSearch } from '../github';
+import { getPullRequestIdentityValuesFromSearch } from '../pullRequest'
 
 suite('Test GitHub PR URL parsing to identity: getPullRequestIdentityValuesFromSearch()', () => {
 	function t(message: string, query: string, prNumber: string | undefined, ownerAndRepo?: string) {

src/git/models/pullRequest.ts

@@ -2,6 +2,7 @@ import { Uri, window } from 'vscode';
 import { Schemes } from '../../constants';
 import { Container } from '../../container';
 import type { RepositoryIdentityDescriptor } from '../../gk/models/repositoryIdentities';
+import type { EnrichablePullRequest } from '../../plus/integrations/providers/models';
 import { formatDate, fromNow } from '../../system/date';
 import { memoize } from '../../system/decorators/memoize';
 import type { LeftRightCommitCountResult } from '../gitProvider';
@@ -415,3 +416,53 @@ export async function getOpenedPullRequestRepo(
 	const repo = await getOrOpenPullRequestRepository(container, pr, { promptIfNeeded: true });
 	return repo;
 }
+
+export type PullRequestURLIdentity = {
+	ownerAndRepo?: string;
+	prNumber?: string;
+};
+
+export function getPullRequestIdentityValuesFromSearch(search: string): PullRequestURLIdentity {
+	let ownerAndRepo: string | undefined = undefined;
+	let prNumber: string | undefined = undefined;
+
+	let match = search.match(/([^/]+\/[^/]+)\/pull\/(\d+)/); // with org and rep name
+	if (match != null) {
+		ownerAndRepo = match[1];
+		prNumber = match[2];
+	}
+
+	if (prNumber == null) {
+		match = search.match(/(?:\/|^)pull\/(\d+)/); // without repo name
+		if (match != null) {
+			prNumber = match[1];
+		}
+	}
+
+	if (prNumber == null) {
+		match = search.match(/(?:#|\/)(\d+)/); // any number starting with # or /
+		if (match != null) {
+			prNumber = match[1];
+		}
+	}
+
+	return { ownerAndRepo: ownerAndRepo, prNumber: prNumber };
+}
+
+export function doesPullRequestSatisfyRepositoryURLIdentity(
+	pr: EnrichablePullRequest | undefined,
+	{ ownerAndRepo, prNumber }: PullRequestURLIdentity,
+): boolean {
+	if (pr == null) {
+		return false;
+	}
+	const satisfiesPrNumber = prNumber != null && pr.number === parseInt(prNumber, 10);
+	if (!satisfiesPrNumber) {
+		return false;
+	}
+	const satisfiesOwnerAndRepo = ownerAndRepo != null && pr.repoIdentity.name === ownerAndRepo;
+	if (!satisfiesOwnerAndRepo) {
+		return false;
+	}
+	return true;
+}

src/plus/integrations/providers/github.ts

@@ -13,7 +13,6 @@ import type {
 } from '../../../git/models/pullRequest';
 import type { RepositoryMetadata } from '../../../git/models/repositoryMetadata';
 import { log } from '../../../system/decorators/log';
-import type { LaunchpadPullRequest } from '../../launchpad/launchpadProvider';
 import { ensurePaidPlan } from '../../utils';
 import type {
 	IntegrationAuthenticationProviderDescriptor,
@@ -318,53 +317,3 @@ export class GitHubEnterpriseIntegration extends GitHubIntegrationBase<SelfHoste
 		return super.connect(source);
 	}
 }
-
-export type GitHubPullRequestURLIdentity = {
-	ownerAndRepo?: string;
-	prNumber?: string;
-};
-
-export function getPullRequestIdentityValuesFromSearch(search: string): GitHubPullRequestURLIdentity {
-	let ownerAndRepo: string | undefined = undefined;
-	let prNumber: string | undefined = undefined;
-
-	let match = search.match(/([^/]+\/[^/]+)\/pull\/(\d+)/); // with org and rep name
-	if (match != null) {
-		ownerAndRepo = match[1];
-		prNumber = match[2];
-	}
-
-	if (prNumber == null) {
-		match = search.match(/(?:\/|^)pull\/(\d+)/); // without repo name
-		if (match != null) {
-			prNumber = match[1];
-		}
-	}
-
-	if (prNumber == null) {
-		match = search.match(/(?:#|\/)(\d+)/); // any number starting with # or /
-		if (match != null) {
-			prNumber = match[1];
-		}
-	}
-
-	return { ownerAndRepo: ownerAndRepo, prNumber: prNumber };
-}
-
-export function doesPullRequestSatisfyGitHubRepositoryURLIdentity(
-	pr: LaunchpadPullRequest | undefined,
-	{ ownerAndRepo, prNumber }: GitHubPullRequestURLIdentity,
-): boolean {
-	if (pr == null) {
-		return false;
-	}
-	const satisfiesPrNumber = prNumber != null && pr.number === parseInt(prNumber, 10);
-	if (!satisfiesPrNumber) {
-		return false;
-	}
-	const satisfiesOwnerAndRepo = ownerAndRepo != null && pr.repoIdentity.name === ownerAndRepo;
-	if (!satisfiesOwnerAndRepo) {
-		return false;
-	}
-	return true;
-}

src/plus/launchpad/launchpad.ts

@@ -42,6 +42,10 @@ import { HostingIntegrationId, SelfHostedIntegrationId } from '../../constants.i
 import type { LaunchpadTelemetryContext, Source, Sources, TelemetryEvents } from '../../constants.telemetry';
 import type { Container } from '../../container';
 import { PlusFeatures } from '../../features';
+import {
+	doesPullRequestSatisfyRepositoryURLIdentity,
+	getPullRequestIdentityValuesFromSearch,
+} from '../../git/models/pullRequest';
 import type { QuickPickItemOfT } from '../../quickpicks/items/common';
 import { createQuickPickItemOfT, createQuickPickSeparator } from '../../quickpicks/items/common';
 import type { DirectiveQuickPickItem } from '../../quickpicks/items/directive';
@@ -54,10 +58,6 @@ import { createAsyncDebouncer } from '../../system/vscode/asyncDebouncer';
 import { executeCommand } from '../../system/vscode/command';
 import { configuration } from '../../system/vscode/configuration';
 import { openUrl } from '../../system/vscode/utils';
-import {
-	doesPullRequestSatisfyGitHubRepositoryURLIdentity,
-	getPullRequestIdentityValuesFromSearch,
-} from '../integrations/providers/github';
 import { ProviderBuildStatusState, ProviderPullRequestReviewState } from '../integrations/providers/models';
 import type {
 	LaunchpadAction,
@@ -603,7 +603,7 @@ export class LaunchpadCommand extends QuickCommand<State> {
 				const launchpadItems = quickpick.items.filter((i): i is LaunchpadItemQuickPickItem => 'item' in i);
 				let item = launchpadItems.find(i =>
 					// perform strict match first
-					doesPullRequestSatisfyGitHubRepositoryURLIdentity(i.item, prUrlIdentity),
+					doesPullRequestSatisfyRepositoryURLIdentity(i.item, prUrlIdentity),
 				);
 				if (item == null) {
 					// Haven't found full match, so let's at least find something with the same pr number
@@ -623,7 +623,7 @@ export class LaunchpadCommand extends QuickCommand<State> {
 				// Nothing is found above, so let's perform search in the API:
 				await updateItems(quickpick, value);
 				quickpick.items.forEach(i => {
-					if ('item' in i && doesPullRequestSatisfyGitHubRepositoryURLIdentity(i.item, prUrlIdentity)) {
+					if ('item' in i && doesPullRequestSatisfyRepositoryURLIdentity(i.item, prUrlIdentity)) {
 						i.alwaysShow = true;
 					}
 				});

src/plus/launchpad/launchpadProvider.ts

@@ -19,6 +19,7 @@ import type { PullRequest, SearchedPullRequest } from '../../git/models/pullRequ
 import {
 	getComparisonRefsForPullRequest,
 	getOrOpenPullRequestRepository,
+	getPullRequestIdentityValuesFromSearch,
 	getRepositoryIdentityForPullRequest,
 } from '../../git/models/pullRequest';
 import type { GitRemote } from '../../git/models/remote';
@@ -42,7 +43,6 @@ import type { ShowWipArgs } from '../../webviews/commitDetails/protocol';
 import type { IntegrationResult } from '../integrations/integration';
 import type { ConnectionStateChangeEvent } from '../integrations/integrationService';
 import type { GitHubRepositoryDescriptor } from '../integrations/providers/github';
-import { getPullRequestIdentityValuesFromSearch } from '../integrations/providers/github';
 import type { EnrichablePullRequest, ProviderActionablePullRequest } from '../integrations/providers/models';
 import {
 	fromProviderPullRequest,