Closing a pull request doesn't remove it from the copilot on my behalf section (#7401)

Fixes #7364

Author: alexr00

src/github/folderRepositoryManager.ts

@@ -42,7 +42,7 @@ import { ConflictModel } from './conflictGuide';
 import { ConflictResolutionCoordinator } from './conflictResolutionCoordinator';
 import { Conflict, ConflictResolutionModel } from './conflictResolutionModel';
 import { CredentialStore } from './credentials';
-import { CopilotWorkingStatus, GitHubRepository, GraphQLError, GraphQLErrorType, IMetadata, ItemsData, PULL_REQUEST_PAGE_SIZE, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
+import { CopilotWorkingStatus, GitHubRepository, GraphQLError, GraphQLErrorType, IMetadata, ItemsData, PULL_REQUEST_PAGE_SIZE, PullRequestChangeEvent, PullRequestData, TeamReviewerRefreshKind, ViewerPermission } from './githubRepository';
 import { MergeMethod as GraphQLMergeMethod, MergePullRequestInput, MergePullRequestResponse, PullRequestResponse, PullRequestState } from './graphql';
 import { IAccount, ILabel, IMilestone, IProject, IPullRequestsPagingOptions, Issue, ITeam, MergeMethod, PRType, PullRequestMergeability, RepoAccessAndMergeMethods, User } from './interface';
 import { IssueModel } from './issueModel';
@@ -214,8 +214,8 @@ export class FolderRepositoryManager extends Disposable {
 	readonly onDidChangeGithubRepositories: vscode.Event<GitHubRepository[]> = this._onDidChangeGithubRepositories.event;
 
 	private _onDidChangePullRequestsEvents: vscode.Disposable[] = [];
-	private readonly _onDidChangeAnyPullRequests = this._register(new vscode.EventEmitter<IssueModel[]>());
-	readonly onDidChangeAnyPullRequests: vscode.Event<IssueModel[]> = this._onDidChangeAnyPullRequests.event;
+	private readonly _onDidChangeAnyPullRequests = this._register(new vscode.EventEmitter<PullRequestChangeEvent[]>());
+	readonly onDidChangeAnyPullRequests: vscode.Event<PullRequestChangeEvent[]> = this._onDidChangeAnyPullRequests.event;
 	private readonly _onDidAddPullRequest = this._register(new vscode.EventEmitter<IssueModel>());
 	readonly onDidAddPullRequest: vscode.Event<IssueModel> = this._onDidAddPullRequest.event;
 

src/github/githubRepository.ts

@@ -58,7 +58,7 @@ import {
 	RepoAccessAndMergeMethods,
 	User,
 } from './interface';
-import { IssueModel } from './issueModel';
+import { IssueChangeEvent, IssueModel } from './issueModel';
 import { LoggingOctokit } from './loggingOctokit';
 import { PullRequestModel } from './pullRequestModel';
 import defaultSchema from './queries.gql';
@@ -152,6 +152,11 @@ export enum CopilotWorkingStatus {
 	Done = 'Done',
 }
 
+export interface PullRequestChangeEvent {
+	model: IssueModel;
+	event: IssueChangeEvent;
+}
+
 export class GitHubRepository extends Disposable {
 	static ID = 'GitHubRepository';
 	protected _initialized: boolean = false;
@@ -171,8 +176,8 @@ export class GitHubRepository extends Disposable {
 
 	private _onDidAddPullRequest: vscode.EventEmitter<PullRequestModel> = this._register(new vscode.EventEmitter());
 	public readonly onDidAddPullRequest: vscode.Event<PullRequestModel> = this._onDidAddPullRequest.event;
-	private _onDidChangePullRequests: vscode.EventEmitter<IssueModel[]> = this._register(new vscode.EventEmitter());
-	public readonly onDidChangePullRequests: vscode.Event<IssueModel[]> = this._onDidChangePullRequests.event;
+	private _onDidChangePullRequests: vscode.EventEmitter<PullRequestChangeEvent[]> = this._register(new vscode.EventEmitter());
+	public readonly onDidChangePullRequests: vscode.Event<PullRequestChangeEvent[]> = this._onDidChangePullRequests.event;
 
 	public get hub(): GitHub {
 		if (!this._hub) {
@@ -977,7 +982,7 @@ export class GitHubRepository extends Disposable {
 			model = new PullRequestModel(this._credentialStore, this.telemetry, this, this.remote, pullRequest);
 			const prModel = model;
 			const disposables: vscode.Disposable[] = [];
-			disposables.push(model.onDidChange(() => this._onPullRequestModelChanged(prModel)));
+			disposables.push(model.onDidChange(e => this._onPullRequestModelChanged(prModel, e)));
 			this._pullRequestModelsByNumber.set(pullRequest.number, { model, disposables });
 			if (!silent) {
 				this._onDidAddPullRequest.fire(model);
@@ -987,8 +992,8 @@ export class GitHubRepository extends Disposable {
 		return model;
 	}
 
-	private _onPullRequestModelChanged(model: PullRequestModel): void {
-		this._onDidChangePullRequests.fire([model]);
+	private _onPullRequestModelChanged(model: PullRequestModel, change: IssueChangeEvent): void {
+		this._onDidChangePullRequests.fire([{ model, event: change }]);
 	}
 
 	async createPullRequest(params: OctokitCommon.PullsCreateParams): Promise<PullRequestModel> {

src/github/issueModel.ts

@@ -29,11 +29,12 @@ export interface IssueChangeEvent {
 	title?: true;
 	body?: true;
 	milestone?: true;
-	updatedAt?: true;
+	// updatedAt?: true;
 	state?: true;
 	labels?: true;
 	assignees?: true;
 	projects?: true;
+	comments?: true;
 
 	timeline?: true;
 
@@ -164,7 +165,6 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 			this.milestone = issue.milestone;
 		}
 		if (this.updatedAt !== issue.updatedAt) {
-			changes.updatedAt = true;
 			this.updatedAt = issue.updatedAt;
 		}
 		const newState = this.stateToStateEnum(issue.state);
@@ -528,11 +528,7 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 					const newEvents = timelineEvents.filter(event => (eventTime(event) ?? 0) > oldEventTime);
 					allEvents = [...issueModel.timelineEvents, ...newEvents];
 				}
-				const oldTimeline = issueModel.timelineEvents;
 				issueModel.timelineEvents = allEvents;
-				if (oldLastEvent && (allEvents.length !== oldTimeline.length)) {
-					this._onDidChange.fire({ timeline: true });
-				}
 			}
 			return timelineEvents;
 		} catch (e) {

src/github/pullRequestModel.ts

@@ -146,8 +146,6 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 
 	private _hasComments: boolean;
 	private _comments: readonly IComment[] | undefined;
-	private _onDidChangeComments: vscode.EventEmitter<void> = this._register(new vscode.EventEmitter<void>());
-	public readonly onDidChangeComments: vscode.Event<void> = this._onDidChangeComments.event;
 
 	// Whether the pull request is currently checked out locally
 	private _isActive: boolean;
@@ -226,7 +224,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 
 	set comments(comments: readonly IComment[]) {
 		this._comments = comments;
-		this._onDidChangeComments.fire();
+		this._onDidChange.fire({ comments: true });
 	}
 
 	get fileChangeViewedState(): FileViewedState {
@@ -356,7 +354,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 				"pr.approve" : {}
 			*/
 			this._telemetry.sendTelemetryEvent('pr.approve');
-			this._onDidChangeComments.fire();
+			this._onDidChange.fire({ comments: true, timeline: true });
 			return x;
 		});
 	}
@@ -374,8 +372,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			"pr.requestChanges" : {}
 		*/
 		this._telemetry.sendTelemetryEvent('pr.requestChanges');
-		this._onDidChangeComments.fire();
-		this._onDidChange.fire({ timeline: true });
+		this._onDidChange.fire({ timeline: true, comments: true });
 		return action;
 	}
 
@@ -470,8 +467,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 				threadWithComment.viewerCanResolve = true;
 				this._onDidChangeReviewThreads.fire({ added: [], changed: [threadWithComment], removed: [] });
 			}
-			this._onDidChangeComments.fire();
-			this._onDidChange.fire({ timeline: true });
+			this._onDidChange.fire({ timeline: true, comments: true });
 			return reviewEvent;
 		} else {
 			throw new Error(`Submitting review failed, no pending review for current pull request: ${this.number}.`);
@@ -696,8 +692,7 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 			this._onDidChangeReviewThreads.fire({ added: [], changed: [threadWithComment], removed: [] });
 		}
 
-		this._onDidChangeComments.fire();
-		this._onDidChange.fire({ timeline: true });
+		this._onDidChange.fire({ timeline: true, comments: true });
 		return newComment;
 	}
 

src/github/pullRequestOverview.ts

@@ -160,8 +160,8 @@ export class PullRequestOverviewPanel extends IssueOverviewPanel<PullRequestMode
 		}));
 
 		if (this._item) {
-			this._prListeners.push(this._item.onDidChangeComments(() => {
-				if (!this._isUpdating) {
+			this._prListeners.push(this._item.onDidChange(e => {
+				if (e.comments && !this._isUpdating) {
 					this.refreshPanel();
 				}
 			}));

src/github/repositoriesManager.ts

@@ -15,6 +15,7 @@ import { fromPRUri, fromRepoUri, Schemes } from '../common/uri';
 import { compareIgnoreCase, isDescendant } from '../common/utils';
 import { CredentialStore } from './credentials';
 import { FolderRepositoryManager, ReposManagerState, ReposManagerStateContext } from './folderRepositoryManager';
+import { PullRequestChangeEvent } from './githubRepository';
 import { IssueModel } from './issueModel';
 import { findDotComAndEnterpriseRemotes, getEnterpriseUri, hasEnterpriseUri, setEnterpriseUri } from './utils';
 
@@ -45,7 +46,7 @@ export class RepositoriesManager extends Disposable {
 	private _onDidLoadAnyRepositories = new vscode.EventEmitter<void>();
 	readonly onDidLoadAnyRepositories = this._onDidLoadAnyRepositories.event;
 
-	private _onDidChangeAnyPullRequests = new vscode.EventEmitter<IssueModel[]>();
+	private _onDidChangeAnyPullRequests = new vscode.EventEmitter<PullRequestChangeEvent[]>();
 	readonly onDidChangeAnyPullRequests = this._onDidChangeAnyPullRequests.event;
 
 	private _onDidAddPullRequest = new vscode.EventEmitter<IssueModel>();

src/view/prsTreeDataProvider.ts

@@ -15,8 +15,8 @@ import { EXTENSION_ID } from '../constants';
 import { CopilotRemoteAgentManager } from '../github/copilotRemoteAgent';
 import { CredentialStore } from '../github/credentials';
 import { FolderRepositoryManager, ReposManagerState } from '../github/folderRepositoryManager';
+import { PullRequestChangeEvent } from '../github/githubRepository';
 import { PRType } from '../github/interface';
-import { IssueModel } from '../github/issueModel';
 import { issueMarkdown } from '../github/markdownUtils';
 import { NotificationProvider } from '../github/notifications';
 import { PullRequestModel } from '../github/pullRequestModel';
@@ -60,7 +60,7 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 		this._register(this.prsTreeModel.onDidChangeData(e => {
 			if (e instanceof FolderRepositoryManager) {
 				this.refreshRepo(e);
-			} else if (Array.isArray(e) && e[0] instanceof IssueModel) {
+			} else if (Array.isArray(e)) {
 				this.refreshPullRequests(e);
 			} else {
 				this.refresh(undefined, true);
@@ -322,18 +322,52 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 		}
 	}
 
-	private refreshPullRequests(pullRequests: IssueModel[]): void {
+	private refreshPullRequests(pullRequests: PullRequestChangeEvent[]): void {
 		if (!this._children?.length || !pullRequests?.length) {
 			return;
 		}
-		const toRefresh: TreeNode[] = [];
+		const prNodesToRefresh: TreeNode[] = [];
+		const prsWithStateChange = new Set();
+		const prNumbers = new Set();
+
+		for (const prChange of pullRequests) {
+			prNumbers.add(prChange.model.number);
+			if (prChange.event.state) {
+				prsWithStateChange.add(prChange.model.number);
+			}
+		}
+
+		const hasPRNode = (node: TreeNode) => {
+			const prNodes = node.children ?? [];
+			for (const prNode of prNodes) {
+				if (prNode instanceof PRNode && prsWithStateChange.has(prNode.pullRequestModel.number)) {
+					return true;
+				}
+			}
+			return false;
+		};
+
+		const categoriesToRefresh: Set<CategoryTreeNode> = new Set();
+		// First find the categories to refresh, since if we refresh a category we don't need to specifically refresh its children
+		for (const child of this._children) {
+			if (child instanceof WorkspaceFolderNode) {
+				const categories = child.children ?? [];
+				for (const category of categories) {
+					if (category instanceof CategoryTreeNode && !categoriesToRefresh.has(category) && hasPRNode(category)) {
+						categoriesToRefresh.add(category);
+					}
+				}
+			} else if (child instanceof CategoryTreeNode && !categoriesToRefresh.has(child) && hasPRNode(child)) {
+				categoriesToRefresh.add(child);
+			}
+		}
+
 		// Yes, multiple PRs can exist in different repos with the same number, but at worst we'll refresh all the duplicate numbers, which shouldn't be many.
-		const prNumbers = new Set(pullRequests.map(pr => pr.number));
 		const collectPRNodes = (node: TreeNode) => {
 			const prNodes = node.children ?? [];
 			for (const prNode of prNodes) {
 				if (prNode instanceof PRNode && prNumbers.has(prNode.pullRequestModel.number)) {
-					toRefresh.push(prNode);
+					prNodesToRefresh.push(prNode);
 				}
 			}
 		};
@@ -342,16 +376,16 @@ export class PullRequestsTreeDataProvider extends Disposable implements vscode.T
 			if (child instanceof WorkspaceFolderNode) {
 				const categories = child.children ?? [];
 				for (const category of categories) {
-					if (category instanceof CategoryTreeNode) {
+					if (category instanceof CategoryTreeNode && !categoriesToRefresh.has(category)) {
 						collectPRNodes(category);
 					}
 				}
-			} else if (child instanceof CategoryTreeNode) {
+			} else if (child instanceof CategoryTreeNode && !categoriesToRefresh.has(child)) {
 				collectPRNodes(child);
 			}
 		}
-		if (toRefresh.length) {
-			this._onDidChangeTreeData.fire(toRefresh);
+		if (prNodesToRefresh.length || categoriesToRefresh.size > 0) {
+			this._onDidChangeTreeData.fire([...Array.from(categoriesToRefresh), ...prNodesToRefresh]);
 		}
 	}
 

src/view/prsTreeModel.ts

@@ -9,8 +9,8 @@ import { getReviewMode } from '../common/settingsUtils';
 import { ITelemetry } from '../common/telemetry';
 import { createPRNodeIdentifier } from '../common/uri';
 import { FolderRepositoryManager, ItemsResponseResult } from '../github/folderRepositoryManager';
+import { PullRequestChangeEvent } from '../github/githubRepository';
 import { CheckState, PRType, PullRequestChecks, PullRequestReviewRequirement } from '../github/interface';
-import { IssueModel } from '../github/issueModel';
 import { PullRequestModel } from '../github/pullRequestModel';
 import { RepositoriesManager } from '../github/repositoriesManager';
 import { UnsatisfiedChecks } from '../github/utils';
@@ -28,7 +28,7 @@ export class PrsTreeModel extends Disposable {
 	private _activePRDisposables: Map<FolderRepositoryManager, vscode.Disposable[]> = new Map();
 	private readonly _onDidChangePrStatus: vscode.EventEmitter<string[]> = this._register(new vscode.EventEmitter<string[]>());
 	public readonly onDidChangePrStatus = this._onDidChangePrStatus.event;
-	private readonly _onDidChangeData: vscode.EventEmitter<IssueModel[] | FolderRepositoryManager | void> = this._register(new vscode.EventEmitter<IssueModel[] | FolderRepositoryManager | void>());
+	private readonly _onDidChangeData: vscode.EventEmitter<PullRequestChangeEvent[] | FolderRepositoryManager | void> = this._register(new vscode.EventEmitter<PullRequestChangeEvent[] | FolderRepositoryManager | void>());
 	public readonly onDidChangeData = this._onDidChangeData.event;
 	private _expandedQueries: Set<string> | undefined;
 	private _hasLoaded: boolean = false;
@@ -51,12 +51,12 @@ export class PrsTreeModel extends Disposable {
 			}
 
 			this._repoEvents.get(manager)!.push(manager.onDidChangeActivePullRequest(e => {
-				const prs: IssueModel[] = [];
+				const prs: PullRequestChangeEvent[] = [];
 				if (e.old) {
-					prs.push(e.old);
+					prs.push({ model: e.old, event: {} });
 				}
 				if (e.new) {
-					prs.push(e.new);
+					prs.push({ model: e.new, event: {} });
 				}
 				this._onDidChangeData.fire(prs);
 
@@ -66,9 +66,9 @@ export class PrsTreeModel extends Disposable {
 				}
 				if (manager.activePullRequest) {
 					this._activePRDisposables.set(manager, [
-						manager.activePullRequest.onDidChangeComments(() => {
-							if (manager.activePullRequest) {
-								this._onDidChangeData.fire([manager.activePullRequest]);
+						manager.activePullRequest.onDidChange(e => {
+							if (e.comments && manager.activePullRequest) {
+								this._onDidChangeData.fire([{ model: manager.activePullRequest, event: e }]);
 							}
 						})]);
 				}
@@ -81,7 +81,9 @@ export class PrsTreeModel extends Disposable {
 		}
 
 		this._register(this._reposManager.onDidChangeAnyPullRequests((prs) => {
-			this._onDidChangeData.fire(prs);
+			const needsRefresh = prs.filter(pr => pr.event.state || pr.event.title || pr.event.body || pr.event.comments || pr.event.draft || pr.event.timeline);
+			this.clearQueriesContainingPullRequests(needsRefresh);
+			this._onDidChangeData.fire(needsRefresh);
 		}));
 
 		this._register(this._reposManager.onDidAddPullRequest(() => {
@@ -280,6 +282,26 @@ export class PrsTreeModel extends Disposable {
 		return prs;
 	}
 
+	private clearQueriesContainingPullRequests(pullRequests: PullRequestChangeEvent[]): void {
+		const withStateChange = pullRequests.filter(prChange => prChange.event.state);
+		if (!withStateChange || withStateChange.length === 0) {
+			return;
+		}
+		for (const [, queries] of this._cachedPRs.entries()) {
+			for (const [queryKey, itemsResult] of queries.entries()) {
+				if (!itemsResult || !itemsResult.items || itemsResult.items.length === 0) {
+					continue;
+				}
+				const hasPR = withStateChange.some(prChange =>
+					itemsResult.items.some(item => item === prChange.model)
+				);
+				if (hasPR) {
+					queries.delete(queryKey);
+				}
+			}
+		}
+	}
+
 	override dispose() {
 		super.dispose();
 		disposeAll(Array.from(this._activePRDisposables.values()).flat());

src/view/treeNodes/commitsCategoryNode.ts

@@ -31,9 +31,11 @@ export class CommitsNode extends TreeNode implements vscode.TreeItem {
 			Logger.appendLine(`Review threads have changed, refreshing Commits node`, PR_TREE);
 			this.refresh(this);
 		}));
-		this.childrenDisposables.push(this._pr.onDidChangeComments(() => {
-			Logger.appendLine(`Comments have changed, refreshing Commits node`, PR_TREE);
-			this.refresh(this);
+		this.childrenDisposables.push(this._pr.onDidChange(e => {
+			if (e.comments) {
+				Logger.appendLine(`Comments have changed, refreshing Commits node`, PR_TREE);
+				this.refresh(this);
+			}
 		}));
 	}