Shows the item that matches the entered URL (if exists)

(#3543, #3684)

Author: sergeibbb

src/git/models/__tests__/pullRequest.test.ts

@@ -0,0 +1,84 @@
+import * as assert from 'assert';
+import { suite, test } from 'mocha';
+import { getPullRequestIdentityValuesFromSearch } from '../pullRequest';
+
+suite('Test GitHub PR URL parsing to identity: getPullRequestIdentityValuesFromSearch()', () => {
+	function t(message: string, query: string, prNumber: string | undefined, ownerAndRepo?: string) {
+		assert.deepStrictEqual(
+			getPullRequestIdentityValuesFromSearch(query),
+			{
+				ownerAndRepo: ownerAndRepo,
+				prNumber: prNumber,
+			},
+			`${message} (${JSON.stringify(query)})`,
+		);
+	}
+
+	test('full URL or without protocol but with domain, should parse to ownerAndRepo and prNumber', () => {
+		t('full URL', 'https://github.com/eamodio/vscode-gitlens/pull/1', '1', 'eamodio/vscode-gitlens');
+		t(
+			'with suffix',
+			'https://github.com/eamodio/vscode-gitlens/pull/1/files?diff=unified#hello',
+			'1',
+			'eamodio/vscode-gitlens',
+		);
+		t(
+			'with query',
+			'https://github.com/eamodio/vscode-gitlens/pull/1?diff=unified#hello',
+			'1',
+			'eamodio/vscode-gitlens',
+		);
+
+		t('with anchor', 'https://github.com/eamodio/vscode-gitlens/pull/1#hello', '1', 'eamodio/vscode-gitlens');
+		t('a weird suffix', 'https://github.com/eamodio/vscode-gitlens/pull/1-files', '1', 'eamodio/vscode-gitlens');
+		t('numeric repo name', 'https://github.com/sergeibbb/1/pull/16', '16', 'sergeibbb/1');
+
+		t('no protocol with leading slash', '/github.com/sergeibbb/1/pull/16?diff=unified', '16', 'sergeibbb/1');
+		t('no protocol without leading slash', 'github.com/sergeibbb/1/pull/16/files', '16', 'sergeibbb/1');
+	});
+
+	test('no domain, should parse to ownerAndRepo and prNumber', () => {
+		t('with leading slash', '/sergeibbb/1/pull/16#hello', '16', 'sergeibbb/1');
+		t('words in repo name', 'eamodio/vscode-gitlens/pull/1?diff=unified#hello', '1', 'eamodio/vscode-gitlens');
+		t('numeric repo name', 'sergeibbb/1/pull/16/files', '16', 'sergeibbb/1');
+	});
+
+	test('domain vs. no domain', () => {
+		t(
+			'with anchor',
+			'https://github.com/eamodio/vscode-gitlens/pull/1#hello/sergeibbb/1/pull/16',
+			'1',
+			'eamodio/vscode-gitlens',
+		);
+	});
+
+	test('has "pull/" fragment', () => {
+		t('with leading slash', '/pull/16/files#hello', '16');
+		t('without leading slash', 'pull/16?diff=unified#hello', '16');
+		t('with numeric repo name', '1/pull/16?diff=unified#hello', '16');
+		t('with double slash', '1//pull/16?diff=unified#hello', '16');
+	});
+
+	test('has "/<num>" fragment', () => {
+		t('with leading slash', '/16/files#hello', '16');
+	});
+
+	test('is a number', () => {
+		t('just a number', '16', '16');
+		t('with a hash', '#16', '16');
+	});
+
+	test('does not match', () => {
+		t('without leading slash', '16?diff=unified#hello', undefined);
+		t('with leading hash', '/#16/files#hello', undefined);
+		t('number is a part of a word', 'hello16', undefined);
+		t('number is a part of a word', '16hello', undefined);
+
+		t('with a number', '1/16?diff=unified#hello', '16');
+		t('with a number and slash', '/1/16?diff=unified#hello', '1');
+		t('with a word', 'anything/16?diff=unified#hello', '16');
+
+		t('with a wrong character leading to pull', 'sergeibbb/1/-pull/16?diff=unified#hello', '1');
+		t('with a wrong character leading to pull', 'sergeibbb/1-pull/16?diff=unified#hello', '1');
+	});
+});

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,60 @@ 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 "/"
+		if (match != null) {
+			prNumber = match[1];
+		}
+	}
+
+	if (prNumber == null) {
+		match = search.match(/^#?(\d+)$/); // just a number or with a leading "#"
+		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/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';
@@ -540,12 +544,53 @@ export class LaunchpadCommand extends QuickCommand<State> {
 				RefreshQuickInputButton,
 			],
 			onDidChangeValue: quickpick => {
+				const { value } = quickpick;
 				const hideGroups = Boolean(quickpick.value?.length);
 
 				if (groupsHidden !== hideGroups) {
 					groupsHidden = hideGroups;
 					quickpick.items = hideGroups ? items.filter(i => !isDirectiveQuickPickItem(i)) : items;
 				}
+				const activeLaunchpadItems = quickpick.activeItems.filter(
+					(i): i is LaunchpadItemQuickPickItem => 'item' in i && !i.alwaysShow,
+				);
+
+				let updated = false;
+				for (const item of quickpick.items) {
+					if (item.alwaysShow) {
+						item.alwaysShow = false;
+						updated = true;
+					}
+				}
+				if (updated) {
+					// Force quickpick to update by changing the items object:
+					quickpick.items = [...quickpick.items];
+				}
+
+				if (!value?.length || activeLaunchpadItems.length) {
+					// Nothing to search
+					return true;
+				}
+
+				const prUrlIdentity = getPullRequestIdentityValuesFromSearch(value);
+				if (prUrlIdentity.prNumber != null) {
+					const launchpadItems = quickpick.items.filter((i): i is LaunchpadItemQuickPickItem => 'item' in i);
+					let item = launchpadItems.find(i =>
+						// perform strict match first
+						doesPullRequestSatisfyRepositoryURLIdentity(i.item, prUrlIdentity),
+					);
+					if (item == null) {
+						// Haven't found full match, so let's at least find something with the same pr number
+						item = launchpadItems.find(i => i.item.id === prUrlIdentity.prNumber);
+					}
+					if (item != null) {
+						if (!item.alwaysShow) {
+							item.alwaysShow = true;
+							// Force quickpick to update by changing the items object:
+							quickpick.items = [...quickpick.items];
+						}
+					}
+				}
 
 				return true;
 			},