Sync Pull Requests view with currently open PR overview/description (#7123)

* Initial plan

* Implement PR overview and tree view sync feature

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

* Add comprehensive tests for PR overview sync functionality

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

* Change event nalme

* Don't move selection if already correct and avoid unneeded refresh

* Add sync when tree view becomes visible with active PR

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

* Delete tests

* Delete tests

* Logger, not console

Author: Copilot

.github/copilot-instructions.md

@@ -12,6 +12,7 @@
 - **Activation Events**: Only add new activation events if absolutely necessary.
 - **Webviews**: Place webview code in the `webviews/` directory. Use the shared `common/` code where possible.
 - **Commands**: Register new commands in `package.json` and implement them in `src/commands.ts` or a relevant module.
+- **Logging**: Use the `Logger` utility for all logging purposes. Don't use console.log or similar methods directly.
 
 ---
 _Last updated: 2025-06-20_

.vscode/launch.json

@@ -92,6 +92,7 @@
 				"--extensionDevelopmentPath=${workspaceFolder}",
 				"--extensionTestsPath=${workspaceFolder}/out/src/test",
 				"--disable-extensions",
+				"--user-data-dir=${workspaceFolder}/.vscode-test"
 			],
 			"preLaunchTask": "npm: test:preprocess",
 			"smartStep": true,

src/github/pullRequestOverview.ts

@@ -45,6 +45,12 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	 */
 	public static override currentPanel?: PullRequestOverviewPanel;
 
+	/**
+	 * Event emitter for when a PR overview becomes active
+	 */
+	private static _onVisible = new vscode.EventEmitter<PullRequestModel>();
+	public static readonly onVisible = PullRequestOverviewPanel._onVisible.event;
+
 	private _repositoryDefaultBranch: string;
 	private _existingReviewers: ReviewState[] = [];
 	private _teamsCount = 0;
@@ -100,6 +106,13 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		}
 	}
 
+	/**
+	 * Get the currently active pull request from the current panel
+	 */
+	public static getCurrentPullRequest(): PullRequestModel | undefined {
+		return this.currentPanel?._item;
+	}
+
 	protected constructor(
 		telemetry: ITelemetry,
 		extensionUri: vscode.Uri,
@@ -157,6 +170,11 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 	protected override onDidChangeViewState(e: vscode.WebviewPanelOnDidChangeViewStateEvent): void {
 		super.onDidChangeViewState(e);
 		this.setVisibilityContext();
+
+		// If the panel becomes visible and we have an item, notify that this PR is active
+		if (this._panel.visible && this._item) {
+			PullRequestOverviewPanel._onVisible.fire(this._item);
+		}
 	}
 
 	private setVisibilityContext() {
@@ -308,7 +326,12 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 			this._panel.webview.html = this.getHtmlForWebview();
 		}
 
-		return vscode.window.withProgress({ location: { viewId: 'pr:github' } }, () => this.updateItem(pullRequestModel));
+		const result = vscode.window.withProgress({ location: { viewId: 'pr:github' } }, () => this.updateItem(pullRequestModel));
+
+		// Notify that this PR overview is now active
+		PullRequestOverviewPanel._onVisible.fire(pullRequestModel);
+
+		return result;
 	}
 
 	protected override async _onDidReceiveMessage(message: IRequestMessage<any>) {
@@ -803,6 +826,13 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		super.dispose();
 		disposeAll(this._prListeners);
 	}
+
+	/**
+	 * Static dispose method to clean up static resources
+	 */
+	public static dispose() {
+		PullRequestOverviewPanel._onVisible.dispose();
+	}
 }
 
 export function getDefaultMergeMethod(

src/view/prsTreeDataProvider.ts

@@ -18,6 +18,7 @@ import { PRType } from '../github/interface';
 import { issueMarkdown } from '../github/markdownUtils';
 import { NotificationProvider } from '../github/notifications';
 import { PullRequestModel } from '../github/pullRequestModel';
+import { PullRequestOverviewPanel } from '../github/pullRequestOverview';
 import { RepositoriesManager } from '../github/repositoriesManager';
 import { findDotComAndEnterpriseRemotes } from '../github/utils';
 import { PRStatusDecorationProvider } from './prStatusDecorationProvider';
@@ -29,6 +30,7 @@ import { PRNode } from './treeNodes/pullRequestNode';
 import { BaseTreeNode, TreeNode } from './treeNodes/treeNode';
 import { TreeUtils } from './treeNodes/treeUtils';
 import { WorkspaceFolderNode } from './treeNodes/workspaceFolderNode';
+import Logger from '../common/logger';
 
 export class PullRequestsTreeDataProvider extends Disposable implements vscode.TreeDataProvider<TreeNode>, BaseTreeNode {
 	private _onDidChangeTreeData = new vscode.EventEmitter<TreeNode | void>();
@@ -81,6 +83,12 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 					this._view.badge = undefined;
 					this._notificationClearTimeout = undefined;
 				}, 5000);
+
+				// Sync with currently active PR when view becomes visible
+				const currentPR = PullRequestOverviewPanel.getCurrentPullRequest();
+				if (currentPR) {
+					this.syncWithActivePullRequest(currentPR);
+				}
 			}
 		}));
 
@@ -107,6 +115,14 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 
 		this._register(this._copilotManager.onDidCreatePullRequest(() => this.refresh()));
 
+		// Listen for PR overview panel changes to sync the tree view
+		this._register(PullRequestOverviewPanel.onVisible(pullRequest => {
+			// Only sync if view is already visible (don't open the view)
+			if (this._view.visible) {
+				this.syncWithActivePullRequest(pullRequest);
+			}
+		}));
+
 		this._children = [];
 
 		this._register(vscode.commands.registerCommand('pr.configurePRViewlet', async () => {
@@ -174,6 +190,73 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 		return this._view.reveal(element, options);
 	}
 
+	/**
+	 * Sync the tree view with the currently active PR overview
+	 */
+	private async syncWithActivePullRequest(pullRequest: PullRequestModel): Promise<void> {
+		const alreadySelected = this._view.selection.find(child => child instanceof PRNode && (child.pullRequestModel.number === pullRequest.number) && (child.pullRequestModel.remote.owner === pullRequest.remote.owner) && (child.pullRequestModel.remote.repositoryName === pullRequest.remote.repositoryName));
+		if (alreadySelected) {
+			return;
+		}
+		try {
+			// Find the PR node in the tree and reveal it
+			const prNode = await this.findPRNode(pullRequest);
+			if (prNode) {
+				await this.reveal(prNode, { select: true, focus: false, expand: false });
+			}
+		} catch (error) {
+			// Silently ignore errors to avoid disrupting the user experience
+			Logger.warn(`Failed to sync tree view with active PR: ${error}`);
+		}
+	}
+
+	/**
+	 * Find a PR node in the tree structure
+	 */
+	private async findPRNode(pullRequest: PullRequestModel): Promise<PRNode | undefined> {
+		if (this._children.length === 0) {
+			await this.getChildren();
+		}
+
+		for (const child of this._children) {
+			if (child instanceof WorkspaceFolderNode) {
+				const found = await this.findPRNodeInWorkspaceFolder(child, pullRequest);
+				if (found) return found;
+			} else if (child instanceof CategoryTreeNode) {
+				const found = await this.findPRNodeInCategory(child, pullRequest);
+				if (found) return found;
+			}
+		}
+		return undefined;
+	}
+
+	/**
+	 * Search for PR node within a workspace folder node
+	 */
+	private async findPRNodeInWorkspaceFolder(workspaceNode: WorkspaceFolderNode, pullRequest: PullRequestModel): Promise<PRNode | undefined> {
+		const children = await workspaceNode.getChildren(false);
+		for (const child of children) {
+			if (child instanceof CategoryTreeNode) {
+				const found = await this.findPRNodeInCategory(child, pullRequest);
+				if (found) return found;
+			}
+		}
+		return undefined;
+	}
+
+	/**
+	 * Search for PR node within a category node
+	 */
+	private async findPRNodeInCategory(categoryNode: CategoryTreeNode, pullRequest: PullRequestModel): Promise<PRNode | undefined> {
+		const children = await categoryNode.getChildren(false);
+		for (const child of children) {
+			if (child instanceof PRNode && (child.pullRequestModel.number === pullRequest.number) && (child.pullRequestModel.remote.owner === pullRequest.remote.owner) && (child.pullRequestModel.remote.repositoryName === pullRequest.remote.repositoryName)) {
+				return child;
+			}
+		}
+		return undefined;
+	}
+
 	initialize(reviewModels: ReviewModel[], credentialStore: CredentialStore) {
 		if (this._initialized) {
 			throw new Error('Tree has already been initialized!');

src/view/treeNodes/categoryNode.ts

@@ -207,8 +207,11 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
 		return false;
 	}
 
-	override async getChildren(): Promise<TreeNode[]> {
-		await super.getChildren();
+	override async getChildren(shouldDispose: boolean = true): Promise<TreeNode[]> {
+		await super.getChildren(shouldDispose);
+		if (!shouldDispose && this.children) {
+			return this.children;
+		}
 		const isFirstLoad = !this._firstLoad;
 		if (isFirstLoad) {
 			this._firstLoad = this.doGetChildren();

src/view/treeNodes/workspaceFolderNode.ts

@@ -63,8 +63,11 @@ export class WorkspaceFolderNode extends TreeNode implements vscode.TreeItem {
 		return this;
 	}
 
-	override async getChildren(): Promise<TreeNode[]> {
-		super.getChildren();
+	override async getChildren(shouldDispose: boolean = true): Promise<TreeNode[]> {
+		super.getChildren(shouldDispose);
+		if (!shouldDispose && this.children) {
+			return this.children;
+		}
 		this.children = await WorkspaceFolderNode.getCategoryTreeNodes(this.folderManager, this.telemetry, this, this.notificationProvider, this.context, this._prsTreeModel, this._copilotMananger);
 		return this.children;
 	}