Searches by URL for self hosted GitHub and GitLab on Launchpad

CHANGELOG.md

@@ -10,6 +10,10 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 
 - Fixes [#3938](https://github.com/gitkraken/vscode-gitlens/issues/3938) - GitLens automatically initiating an external sign-in after install on vscode.dev
 
+#### Added
+
+- Searches by URL for self hosted GitHub and GitLab on Launchpad
+
 ## [16.2.1] - 2025-01-21
 
 ### Fixed

src/git/utils/pullRequest.utils.ts

@@ -1,4 +1,4 @@
-import type { HostingIntegrationId } from '../../constants.integrations';
+import type { HostingIntegrationId, SelfHostedIntegrationId } from '../../constants.integrations';
 import type {
 	PullRequest,
 	PullRequestComparisonRefs,
@@ -9,7 +9,7 @@ import type {
 import { shortenRevision } from './revision.utils';
 
 export interface PullRequestUrlIdentity {
-	provider?: HostingIntegrationId;
+	provider?: SelfHostedIntegrationId | HostingIntegrationId;
 
 	ownerAndRepo?: string;
 	prNumber: string;

src/plus/integrations/providers/github.ts

@@ -20,8 +20,9 @@ import type {
 	IntegrationAuthenticationProviderDescriptor,
 	IntegrationAuthenticationService,
 } from '../authentication/integrationAuthentication';
-import type { RepositoryDescriptor, SupportedIntegrationIds } from '../integration';
+import type { RepositoryDescriptor } from '../integration';
 import { HostingIntegration } from '../integration';
+import type { GitHubRelatedIntegrationIds } from './github/github.utils';
 import { getGitHubPullRequestIdentityFromMaybeUrl } from './github/github.utils';
 import { providersMetadata } from './models';
 import type { ProvidersApi } from './providersApi';
@@ -45,7 +46,7 @@ const cloudEnterpriseAuthProvider: IntegrationAuthenticationProviderDescriptor =
 
 export type GitHubRepositoryDescriptor = RepositoryDescriptor;
 
-abstract class GitHubIntegrationBase<ID extends SupportedIntegrationIds> extends HostingIntegration<
+abstract class GitHubIntegrationBase<ID extends GitHubRelatedIntegrationIds> extends HostingIntegration<
 	ID,
 	GitHubRepositoryDescriptor
 > {
@@ -267,6 +268,16 @@ abstract class GitHubIntegrationBase<ID extends SupportedIntegrationIds> extends
 			baseUrl: this.apiBaseUrl,
 		});
 	}
+
+	protected override getProviderPullRequestIdentityFromMaybeUrl(search: string): PullRequestUrlIdentity | undefined {
+		const identity = getGitHubPullRequestIdentityFromMaybeUrl(search);
+		if (identity == null) return undefined;
+
+		return {
+			...identity,
+			provider: this.id,
+		};
+	}
 }
 
 export class GitHubIntegration extends GitHubIntegrationBase<HostingIntegrationId.GitHub> {
@@ -301,10 +312,6 @@ export class GitHubIntegration extends GitHubIntegrationBase<HostingIntegrationI
 			super.refresh();
 		}
 	}
-
-	protected override getProviderPullRequestIdentityFromMaybeUrl(search: string): PullRequestUrlIdentity | undefined {
-		return getGitHubPullRequestIdentityFromMaybeUrl(search);
-	}
 }
 
 export class GitHubEnterpriseIntegration extends GitHubIntegrationBase<

src/plus/integrations/providers/github/__tests__/github.utils.test.ts

@@ -12,7 +12,6 @@ suite('Test GitHub PR URL parsing to identity: getPullRequestIdentityFromMaybeUr
 				: {
 						ownerAndRepo: ownerAndRepo,
 						prNumber: prNumber,
-						provider: 'github',
 				  },
 			`Parse: ${message} (${JSON.stringify(query)})`,
 		);

src/plus/integrations/providers/github/github.utils.ts

@@ -2,18 +2,22 @@
 // That's why this file has been created that can collect more simple functions which
 // don't require Container and can be tested.
 
-import { HostingIntegrationId } from '../../../../constants.integrations';
+import type { HostingIntegrationId, SelfHostedIntegrationId } from '../../../../constants.integrations';
 import type { PullRequestUrlIdentity } from '../../../../git/utils/pullRequest.utils';
 
+export type GitHubRelatedIntegrationIds =
+	| HostingIntegrationId.GitHub
+	| SelfHostedIntegrationId.GitHubEnterprise
+	| SelfHostedIntegrationId.CloudGitHubEnterprise;
+
 export function isMaybeGitHubPullRequestUrl(url: string): boolean {
 	if (url == null) return false;
-
 	return getGitHubPullRequestIdentityFromMaybeUrl(url) != null;
 }
 
 export function getGitHubPullRequestIdentityFromMaybeUrl(
 	search: string,
-): (PullRequestUrlIdentity & { provider: HostingIntegrationId.GitHub }) | undefined {
+): Omit<PullRequestUrlIdentity, 'provider'> | undefined {
 	let ownerAndRepo: string | undefined = undefined;
 	let prNumber: string | undefined = undefined;
 
@@ -30,7 +34,5 @@ export function getGitHubPullRequestIdentityFromMaybeUrl(
 		}
 	}
 
-	return prNumber != null
-		? { ownerAndRepo: ownerAndRepo, prNumber: prNumber, provider: HostingIntegrationId.GitHub }
-		: undefined;
+	return prNumber != null ? { ownerAndRepo: ownerAndRepo, prNumber: prNumber } : undefined;
 }

src/plus/integrations/providers/gitlab.ts

@@ -438,7 +438,13 @@ abstract class GitLabIntegrationBase<
 	}
 
 	protected override getProviderPullRequestIdentityFromMaybeUrl(search: string): PullRequestUrlIdentity | undefined {
-		return getGitLabPullRequestIdentityFromMaybeUrl(search);
+		const identity = getGitLabPullRequestIdentityFromMaybeUrl(search);
+		if (identity == null) return undefined;
+
+		return {
+			...identity,
+			provider: this.id,
+		};
 	}
 }
 

src/plus/integrations/providers/gitlab/__tests__/gitlab.utils.test.ts

@@ -11,7 +11,6 @@ suite('Test GitLab PR URL parsing to identity: getPullRequestIdentityFromMaybeUr
 				: {
 						ownerAndRepo: ownerAndRepo,
 						prNumber: prNumber,
-						provider: 'gitlab',
 				  },
 			`Parse: ${message} (${JSON.stringify(query)})`,
 		);

src/plus/integrations/providers/gitlab/gitlab.utils.ts

@@ -2,7 +2,6 @@
 // That's why this file has been created that can collect more simple functions which
 // don't require Container and can be tested.
 
-import { HostingIntegrationId } from '../../../../constants.integrations';
 import type { PullRequestUrlIdentity } from '../../../../git/utils/pullRequest.utils';
 
 export function isMaybeGitLabPullRequestUrl(url: string): boolean {
@@ -11,7 +10,7 @@ export function isMaybeGitLabPullRequestUrl(url: string): boolean {
 
 export function getGitLabPullRequestIdentityFromMaybeUrl(
 	search: string,
-): (PullRequestUrlIdentity & { provider: HostingIntegrationId.GitLab }) | undefined {
+): Omit<PullRequestUrlIdentity, 'provider'> | undefined {
 	let ownerAndRepo: string | undefined = undefined;
 	let prNumber: string | undefined = undefined;
 
@@ -28,7 +27,5 @@ export function getGitLabPullRequestIdentityFromMaybeUrl(
 		}
 	}
 
-	return prNumber != null
-		? { ownerAndRepo: ownerAndRepo, prNumber: prNumber, provider: HostingIntegrationId.GitLab }
-		: undefined;
+	return prNumber != null ? { ownerAndRepo: ownerAndRepo, prNumber: prNumber } : undefined;
 }