Remove invalidate (#7311)

Author: alexr00

src/github/activityBarViewProvider.ts

@@ -188,7 +188,7 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
 			disposeAll(this._prDisposables);
 		}
 		this._prDisposables = [];
-		this._prDisposables.push(pullRequestModel.onDidInvalidate(() => this.updatePullRequest(pullRequestModel)));
+		this._prDisposables.push(pullRequestModel.onDidChange(() => this.updatePullRequest(pullRequestModel)));
 		this._prDisposables.push(pullRequestModel.onDidChangePendingReviewState(() => this.updatePullRequest(pullRequestModel)));
 	}
 

src/github/githubRepository.ts

@@ -960,7 +960,6 @@ export class GitHubRepository extends Disposable {
 		} else {
 			model = new PullRequestModel(this._credentialStore, this._telemetry, this, this.remote, pullRequest);
 			const prModel = model;
-			model.onDidInvalidate(() => this.getPullRequest(pullRequest.number));
 			const disposables: vscode.Disposable[] = [];
 			disposables.push(model.onDidChange(() => this._onPullRequestModelChanged(prModel)));
 			this._pullRequestModelsByNumber.set(pullRequest.number, { model, disposables });

src/github/issueModel.ts

@@ -34,6 +34,9 @@ export interface IssueChangeEvent {
 	projects?: true;
 
 	timeline?: true;
+
+	draft?: true;
+	reviewers?: true;
 }
 
 export class IssueModel<TItem extends Issue = Issue> extends Disposable {
@@ -58,9 +61,6 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 
 	private _timelineEvents: readonly TimelineEvent[] | undefined;
 
-	private _onDidInvalidate = this._register(new vscode.EventEmitter<void>());
-	public onDidInvalidate = this._onDidInvalidate.event;
-
 	protected _onDidChange = this._register(new vscode.EventEmitter<IssueChangeEvent>());
 	public onDidChange = this._onDidChange.event;
 
@@ -86,11 +86,6 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 		}
 	}
 
-	public invalidate() {
-		// Something about the PR data is stale
-		this._onDidInvalidate.fire();
-	}
-
 	public get isOpen(): boolean {
 		return this.state === GithubItemStateEnum.Open;
 	}
@@ -242,7 +237,6 @@ export class IssueModel<TItem extends Issue = Issue> extends Disposable {
 					this.title = data.updateIssue.issue.title;
 					this.titleHTML = data.updateIssue.issue.titleHTML;
 				}
-				this.invalidate();
 				this._onDidChange.fire(changes);
 			}
 			return data!.updateIssue.issue;

src/github/pullRequestModel.ts

@@ -111,11 +111,6 @@ export type FileViewedState = { [key: string]: ViewedState };
 
 const BATCH_SIZE = 100;
 
-interface PullRequestChangeEvent extends IssueChangeEvent {
-	draft?: true;
-	reviewers?: true;
-}
-
 export class PullRequestModel extends IssueModel<PullRequest> implements IPullRequestModel {
 	static override ID = 'PullRequestModel';
 
@@ -151,8 +146,6 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 	private _onDidChangeComments: vscode.EventEmitter<void> = this._register(new vscode.EventEmitter<void>());
 	public readonly onDidChangeComments: vscode.Event<void> = this._onDidChangeComments.event;
 
-	protected override _onDidChange = this._register(new vscode.EventEmitter<PullRequestChangeEvent>());
-
 	// Whether the pull request is currently checked out locally
 	private _isActive: boolean;
 	public get isActive(): boolean {
@@ -252,8 +245,8 @@ export class PullRequestModel extends IssueModel<PullRequest> implements IPullRe
 		return newState;
 	}
 
-	protected override doUpdate(item: PullRequest): PullRequestChangeEvent {
-		const changes = super.doUpdate(item) as PullRequestChangeEvent;
+	protected override doUpdate(item: PullRequest): IssueChangeEvent {
+		const changes = super.doUpdate(item) as IssueChangeEvent;
 		if (this.isDraft !== item.isDraft) {
 			changes.draft = true;
 			this.isDraft = item.isDraft;

src/view/pullRequestCommentController.ts

@@ -356,7 +356,7 @@ export class PullRequestCommentController extends CommentControllerBase implemen
 			if (e.graphQLErrors?.length && e.graphQLErrors[0].type === 'NOT_FOUND') {
 				vscode.window.showWarningMessage('The comment that you\'re replying to was deleted. Refresh to update.', 'Refresh').then(result => {
 					if (result === 'Refresh') {
-						this.pullRequestModel.invalidate();
+						this.pullRequestModel.githubRepository.getPullRequest(this.pullRequestModel.number);
 					}
 				});
 			} else {

src/view/treeNodes/pullRequestNode.ts

@@ -53,7 +53,11 @@ export class PRNode extends TreeNode implements vscode.CommentingRangeProvider2
 		super(parent);
 		this.registerSinceReviewChange();
 		this.registerConfigurationChange();
-		this._register(this.pullRequestModel.onDidInvalidate(() => this.refresh(this)));
+		this._register(this.pullRequestModel.onDidChange((e) => {
+			if (e.title || e.state) {
+				this.refresh(this);
+			}
+		}));
 		this._register(this._folderReposManager.onDidChangeActivePullRequest(e => {
 			if (e.new?.number === this.pullRequestModel.number || e.old?.number === this.pullRequestModel.number) {
 				this.refresh(this);

src/view/treeNodes/repositoryChangesNode.ts

@@ -70,8 +70,10 @@ export class RepositoryChangesNode extends TreeNode implements vscode.TreeItem {
 			this.revealActiveEditorInTree(activeEditorUri);
 		}));
 
-		this._register(this.pullRequestModel.onDidInvalidate(() => {
-			this.refresh();
+		this._register(this.pullRequestModel.onDidChange(e => {
+			if (e.title || e.state) {
+				this.refresh();
+			}
 		}));
 	}