Skip to content

Commit 5677ffc

Browse files
committed
Copilot PR feedback
1 parent e088666 commit 5677ffc

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

src/github/activityBarViewProvider.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,13 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
203203
this._folderRepositoryManager.mergeQueueMethodForBranch(pullRequestModel.base.ref, pullRequestModel.remote.owner, pullRequestModel.remote.repositoryName),
204204
ensureEmojis(this._folderRepositoryManager.context),
205205
]);
206-
this._updatingPromise = updatingPromise;
206+
const clearingPromise = updatingPromise.finally(() => {
207+
if (this._updatingPromise === clearingPromise) {
208+
this._updatingPromise = undefined;
209+
}
210+
});
211+
this._updatingPromise = clearingPromise;
207212
const [pullRequest, repositoryAccess, timelineEvents, requestedReviewers, branchInfo, defaultBranch, currentUser, viewerCanEdit, hasReviewDraft, coAuthors, mergeQueueMethod] = await updatingPromise;
208-
this._updatingPromise = undefined;
209213

210214
if (!pullRequest) {
211215
throw new Error(
@@ -308,8 +312,6 @@ export class PullRequestViewProvider extends WebviewViewBase implements vscode.W
308312

309313
} catch (e) {
310314
vscode.window.showErrorMessage(`Error updating active pull request view: ${formatError(e)}`);
311-
} finally {
312-
this._updatingPromise = undefined;
313315
}
314316
}
315317

0 commit comments

Comments
 (0)