Add support for simplified URL format with uri parameter

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

Author: Copilot

src/common/uri.ts

@@ -685,6 +685,27 @@ export function fromOpenOrCheckoutPullRequestWebviewUri(uri: vscode.Uri): OpenPu
 		return;
 	}
 	try {
+		// Check if the query uses the new simplified format: uri=https://github.com/owner/repo/pull/number
+		const queryParams = new URLSearchParams(uri.query);
+		const uriParam = queryParams.get('uri');
+		if (uriParam) {
+			// Parse the GitHub PR URL
+			const match = uriParam.match(/^https?:\/\/github\.com\/([^\/]+)\/([^\/]+)\/pull\/(\d+)/);
+			if (match) {
+				const [, owner, repo, pullRequestNumber] = match;
+				const params = {
+					owner,
+					repo,
+					pullRequestNumber: parseInt(pullRequestNumber, 10)
+				};
+				if (!validateOpenWebviewParams(params.owner, params.repo, params.pullRequestNumber.toString())) {
+					return;
+				}
+				return params;
+			}
+		}
+
+		// Fall back to the old JSON format for backward compatibility
 		const query = JSON.parse(uri.query.split('&')[0]);
 		if (!validateOpenWebviewParams(query.owner, query.repo, query.pullRequestNumber)) {
 			return;

src/test/common/uri.test.ts

@@ -0,0 +1,101 @@
+/*---------------------------------------------------------------------------------------------
+ *  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 * as vscode from 'vscode';
+import { fromOpenOrCheckoutPullRequestWebviewUri } from '../../common/uri';
+
+describe('uri', () => {
+	describe('fromOpenOrCheckoutPullRequestWebviewUri', () => {
+		it('should parse the new simplified format with uri parameter', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com/microsoft/vscode-css-languageservice/pull/460');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'microsoft');
+			assert.strictEqual(result?.repo, 'vscode-css-languageservice');
+			assert.strictEqual(result?.pullRequestNumber, 460);
+		});
+
+		it('should parse the new simplified format with http (not https)', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=http://github.com/owner/repo/pull/123');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'owner');
+			assert.strictEqual(result?.repo, 'repo');
+			assert.strictEqual(result?.pullRequestNumber, 123);
+		});
+
+		it('should parse the old JSON format for backward compatibility', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?%7B%22owner%22%3A%22microsoft%22%2C%22repo%22%3A%22vscode-css-languageservice%22%2C%22pullRequestNumber%22%3A460%7D');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'microsoft');
+			assert.strictEqual(result?.repo, 'vscode-css-languageservice');
+			assert.strictEqual(result?.pullRequestNumber, 460);
+		});
+
+		it('should work for open-pull-request-webview path', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/open-pull-request-webview?uri=https://github.com/test/example/pull/789');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'test');
+			assert.strictEqual(result?.repo, 'example');
+			assert.strictEqual(result?.pullRequestNumber, 789);
+		});
+
+		it('should return undefined for invalid authority', () => {
+			const uri = vscode.Uri.parse('vscode://invalid-authority/checkout-pull-request?uri=https://github.com/owner/repo/pull/1');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result, undefined);
+		});
+
+		it('should return undefined for invalid path', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/invalid-path?uri=https://github.com/owner/repo/pull/1');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result, undefined);
+		});
+
+		it('should return undefined for invalid GitHub URL format', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://example.com/owner/repo/pull/1');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result, undefined);
+		});
+
+		it('should return undefined for non-numeric pull request number', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com/owner/repo/pull/abc');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result, undefined);
+		});
+
+		it('should handle repos with dots and dashes', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com/my-org/my.awesome-repo/pull/42');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'my-org');
+			assert.strictEqual(result?.repo, 'my.awesome-repo');
+			assert.strictEqual(result?.pullRequestNumber, 42);
+		});
+
+		it('should handle repos with underscores', () => {
+			const uri = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com/owner/repo_name/pull/1');
+			const result = fromOpenOrCheckoutPullRequestWebviewUri(uri);
+
+			assert.strictEqual(result?.owner, 'owner');
+			assert.strictEqual(result?.repo, 'repo_name');
+			assert.strictEqual(result?.pullRequestNumber, 1);
+		});
+
+		it('should validate owner and repo names', () => {
+			// Invalid owner (empty)
+			const uri1 = vscode.Uri.parse('vscode://github.vscode-pull-request-github/checkout-pull-request?uri=https://github.com//repo/pull/1');
+			const result1 = fromOpenOrCheckoutPullRequestWebviewUri(uri1);
+			assert.strictEqual(result1, undefined);
+		});
+	});
+});