Don't show active PR view when there are multiple PRs

package.json

@@ -525,7 +525,7 @@
 					"id": "github:activePullRequest",
 					"type": "webview",
 					"name": "Active Pull Request",
-					"when": "github:inReviewMode && github:focusedReview && !github:createPullRequest",
+					"when": "github:inReviewMode && github:focusedReview && !github:createPullRequest && github:activePRCount <= 1",
 					"initialSize": 2
 				},
 				{

src/common/executeCommands.ts

@@ -11,6 +11,7 @@ export namespace contexts {
 	export const IN_REVIEW_MODE = 'github:inReviewMode';
 	export const REPOS_NOT_IN_REVIEW_MODE = 'github:reposNotInReviewMode';
 	export const REPOS_IN_REVIEW_MODE = 'github:reposInReviewMode';
+	export const ACTIVE_PR_COUNT = 'github:activePRCount';
 }
 
 export namespace commands {

src/github/repositoriesManager.ts

@@ -7,9 +7,10 @@ import * as path from 'path';
 import * as vscode from 'vscode';
 import { Repository, UpstreamRef } from '../api/api';
 import { AuthProvider } from '../common/authentication';
+import { commands, contexts } from '../common/executeCommands';
 import { ITelemetry } from '../common/telemetry';
 import { EventType } from '../common/timelineEvent';
-import { compareIgnoreCase } from '../common/utils';
+import { compareIgnoreCase, dispose } from '../common/utils';
 import { CredentialStore } from './credentials';
 import { FolderRepositoryManager, ReposManagerState, ReposManagerStateContext } from './folderRepositoryManager';
 import { IssueModel } from './issueModel';
@@ -67,7 +68,7 @@ export const NO_MILESTONE: string = 'No Milestone';
 export class RepositoriesManager implements vscode.Disposable {
 	static ID = 'RepositoriesManager';
 
-	private _subs: vscode.Disposable[];
+	private _subs: Map<FolderRepositoryManager, vscode.Disposable[]>;
 
 	private _onDidChangeState = new vscode.EventEmitter<void>();
 	readonly onDidChangeState: vscode.Event<void> = this._onDidChangeState.event;
@@ -85,25 +86,42 @@ export class RepositoriesManager implements vscode.Disposable {
 		private _credentialStore: CredentialStore,
 		private _telemetry: ITelemetry,
 	) {
-		this._subs = [];
+		this._subs = new Map();
 		vscode.commands.executeCommand('setContext', ReposManagerStateContext, this._state);
 
-		this._subs.push(
-			..._folderManagers.map(folderManager => {
-				return folderManager.onDidLoadRepositories(state => {
-					this.state = state;
-					this._onDidLoadAnyRepositories.fire();
-				});
-			}),
-		);
+		this.updateActiveReviewCount();
+		for (const folderManager of this._folderManagers) {
+			this.registerFolderListeners(folderManager);
+		}
+	}
+
+	private updateActiveReviewCount() {
+		let count = 0;
+		for (const folderManager of this._folderManagers) {
+			if (folderManager.activePullRequest) {
+				count++;
+			}
+		}
+		commands.setContext(contexts.ACTIVE_PR_COUNT, count);
 	}
 
 	get folderManagers(): FolderRepositoryManager[] {
 		return this._folderManagers;
 	}
 
+	private registerFolderListeners(folderManager: FolderRepositoryManager) {
+		const disposables = [
+			folderManager.onDidLoadRepositories(state => {
+				this.state = state;
+				this._onDidLoadAnyRepositories.fire();
+			}),
+			folderManager.onDidChangeActivePullRequest(() => this.updateActiveReviewCount())
+		];
+		this._subs.set(folderManager, disposables);
+	}
+
 	insertFolderManager(folderManager: FolderRepositoryManager) {
-		this._subs.push(folderManager.onDidLoadRepositories(state => (this.state = state)));
+		this.registerFolderListeners(folderManager);
 
 		// Try to insert the new repository in workspace folder order
 		const workspaceFolders = vscode.workspace.workspaceFolders;
@@ -116,11 +134,13 @@ export class RepositoriesManager implements vscode.Disposable {
 				this._folderManagers = this._folderManagers.slice(0, index);
 				this._folderManagers.push(folderManager);
 				this._folderManagers.push(...arrayEnd);
+				this.updateActiveReviewCount();
 				this._onDidChangeFolderRepositories.fire();
 				return;
 			}
 		}
 		this._folderManagers.push(folderManager);
+		this.updateActiveReviewCount();
 		this._onDidChangeFolderRepositories.fire();
 	}
 
@@ -130,8 +150,11 @@ export class RepositoriesManager implements vscode.Disposable {
 		);
 		if (existingFolderManagerIndex > -1) {
 			const folderManager = this._folderManagers[existingFolderManagerIndex];
+			dispose(this._subs.get(folderManager)!);
+			this._subs.delete(folderManager);
 			this._folderManagers.splice(existingFolderManagerIndex);
 			folderManager.dispose();
+			this.updateActiveReviewCount();
 			this._onDidChangeFolderRepositories.fire();
 		}
 	}
@@ -222,7 +245,7 @@ export class RepositoriesManager implements vscode.Disposable {
 	}
 
 	dispose() {
-		this._subs.forEach(sub => sub.dispose());
+		this._subs.forEach(sub => dispose(sub));
 	}
 }
 

src/view/prChangesTreeDataProvider.ts

@@ -76,7 +76,7 @@ export class PullRequestChangesTreeDataProvider extends vscode.Disposable implem
 
 		this._view.title = pullRequestNumber
 			? `Changes in Pull Request #${pullRequestNumber}`
-			: 'Changes in Pull Request';
+			: (this._pullRequestManagerMap.size > 1 ? 'Changes in Pull Requests' : 'Changes in Pull Request');
 	}
 
 	async addPrToView(

src/view/reviewManager.ts

@@ -257,15 +257,15 @@ export class ReviewManager {
 		await this._folderRepoManager.updateRepositories(false);
 
 		if (!this._repository.state.HEAD) {
-			this.clear(true);
+			await this.clear(true);
 			return;
 		}
 
 		const branch = this._repository.state.HEAD;
 		const ignoreBranches = vscode.workspace.getConfiguration(SETTINGS_NAMESPACE).get<string[]>(IGNORE_PR_BRANCHES);
 		if (ignoreBranches?.find(value => value === branch.name)) {
 			Logger.appendLine(`Branch ${branch.name} is ignored in ${IGNORE_PR_BRANCHES}.`, ReviewManager.ID);
-			this.clear(true);
+			await this.clear(true);
 			return;
 		}
 
@@ -288,14 +288,14 @@ export class ReviewManager {
 			Logger.appendLine(
 				`Review> no matching pull request metadata found on GitHub for current branch ${branch.name}`,
 			);
-			this.clear(true);
+			await this.clear(true);
 			return;
 		}
 
 		const remote = branch.upstream ? branch.upstream.remote : null;
 		if (!remote) {
 			Logger.appendLine(`Review> current branch ${this._repository.state.HEAD.name} hasn't setup remote yet`);
-			this.clear(true);
+			await this.clear(true);
 			return;
 		}
 
@@ -314,7 +314,7 @@ export class ReviewManager {
 			matchingPullRequestMetadata.prNumber,
 		);
 		if (!pr || !pr.isResolved()) {
-			this.clear(true);
+			await this.clear(true);
 			this._prNumber = undefined;
 			Logger.appendLine('Review> This PR is no longer valid');
 			return;
@@ -326,19 +326,19 @@ export class ReviewManager {
 			return;
 		}
 		this._isShowingLastReviewChanges = pr.showChangesSinceReview;
-		this.clear(false);
+		await this.clear(false);
 
 		const useReviewConfiguration = vscode.workspace.getConfiguration(PR_SETTINGS_NAMESPACE)
 			.get<{ merged: boolean, closed: boolean }>(USE_REVIEW_MODE, { merged: true, closed: false });
 
 		if (pr.isClosed && !useReviewConfiguration.closed) {
-			this.clear(true);
+			await this.clear(true);
 			Logger.appendLine('Review> This PR is closed');
 			return;
 		}
 
 		if (pr.isMerged && !useReviewConfiguration.merged) {
-			this.clear(true);
+			await this.clear(true);
 			Logger.appendLine('Review> This PR is merged');
 			return;
 		}
@@ -967,15 +967,8 @@ export class ReviewManager {
 		}
 	}
 
-	private clear(quitReviewMode: boolean) {
-		this._updateMessageShown = false;
-		this._reviewModel.clear();
-		this._localToDispose.forEach(disposable => disposable.dispose());
-		// Ensure file explorer decorations are removed. When switching to a different PR branch,
-		// comments are recalculated when getting the data and the change decoration fired then,
-		// so comments only needs to be emptied in this case.
-		this._folderRepoManager.activePullRequest?.clear();
-
+	private async clear(quitReviewMode: boolean) {
+		const activePullRequest = this._folderRepoManager.activePullRequest;
 		if (quitReviewMode) {
 			this._prNumber = undefined;
 			this._folderRepoManager.activePullRequest = undefined;
@@ -985,11 +978,23 @@ export class ReviewManager {
 			}
 
 			if (this.changesInPrDataProvider) {
-				this.changesInPrDataProvider.removePrFromView(this._folderRepoManager);
+				await this.changesInPrDataProvider.removePrFromView(this._folderRepoManager);
+			}
+			if (activePullRequest) {
+				this._activePrViewCoordinator.removePullRequest(activePullRequest);
 			}
 
 			vscode.commands.executeCommand('pr.refreshList');
 		}
+
+		this._updateMessageShown = false;
+		this._reviewModel.clear();
+		this._localToDispose.forEach(disposable => disposable.dispose());
+		// Ensure file explorer decorations are removed. When switching to a different PR branch,
+		// comments are recalculated when getting the data and the change decoration fired then,
+		// so comments only needs to be emptied in this case.
+		activePullRequest?.clear();
+
 	}
 
 	async provideTextDocumentContent(uri: vscode.Uri): Promise<string | undefined> {

src/view/webviewViewCoordinator.ts

@@ -11,7 +11,7 @@ import { ReviewManager } from './reviewManager';
 
 export class WebviewViewCoordinator {
 	private _webviewViewProvider?: PullRequestViewProvider;
-	private _pullRequestModel?: PullRequestModel;
+	private _pullRequestModel: Map<PullRequestModel, { folderRepositoryManager: FolderRepositoryManager, reviewManager: ReviewManager }> = new Map();
 
 	constructor(private _context: vscode.ExtensionContext) { }
 
@@ -31,16 +31,31 @@ export class WebviewViewCoordinator {
 	}
 
 	public setPullRequest(pullRequestModel: PullRequestModel, folderRepositoryManager: FolderRepositoryManager, reviewManager: ReviewManager) {
-		this._pullRequestModel = pullRequestModel;
+		this._pullRequestModel.set(pullRequestModel, { folderRepositoryManager, reviewManager });
+		this.updatePullRequest();
+	}
+
+	private updatePullRequest() {
+		const pullRequestModel = Array.from(this._pullRequestModel.keys())[0];
+		const { folderRepositoryManager, reviewManager } = this._pullRequestModel.get(pullRequestModel)!;
 		if (!this._webviewViewProvider) {
 			this.create(pullRequestModel, folderRepositoryManager, reviewManager);
 		} else {
 			this._webviewViewProvider.updatePullRequest(pullRequestModel);
 		}
 	}
 
+	public removePullRequest(pullReqestModel: PullRequestModel) {
+		const oldHead = Array.from(this._pullRequestModel.keys())[0];
+		this._pullRequestModel.delete(pullReqestModel);
+		const newHead = Array.from(this._pullRequestModel.keys())[0];
+		if (newHead !== oldHead) {
+			this.updatePullRequest();
+		}
+	}
+
 	public show(pullReqestModel: PullRequestModel) {
-		if (this._webviewViewProvider && (this._pullRequestModel === pullReqestModel)) {
+		if (this._webviewViewProvider && (this._pullRequestModel.size > 0) && (Array.from(this._pullRequestModel.keys())[0] === pullReqestModel)) {
 			this._webviewViewProvider.show();
 		}
 	}