Skip to content

Commit 1066de6

Browse files
authored
Element with id Assigned To Mehttps://github.com/microsoft/vscode/pull/227347 is already registered (#6232)
Fixes #6218
1 parent f6aa0bd commit 1066de6

File tree

3 files changed

+8
-9
lines changed

3 files changed

+8
-9
lines changed

src/view/prsTreeModel.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ export class PrsTreeModel implements vscode.Disposable {
204204
return { hasMorePages: false, hasUnsearchedRepositories: false, items: prs };
205205
}
206206

207-
async getPullRequestsForQuery(folderRepoManager: FolderRepositoryManager, fetchNextPage: boolean, query: string, update?: boolean): Promise<ItemsResponseResult<PullRequestModel>> {
207+
async getPullRequestsForQuery(folderRepoManager: FolderRepositoryManager, fetchNextPage: boolean, query: string): Promise<ItemsResponseResult<PullRequestModel>> {
208208
const cache = this.getFolderCache(folderRepoManager);
209-
if (!update && cache.has(query)) {
209+
if (!fetchNextPage && cache.has(query)) {
210210
return cache.get(query)!;
211211
}
212212

src/view/reviewCommentController.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import { RemoteFileChangeModel } from './fileChangeModel';
3838
import { ReviewManager } from './reviewManager';
3939
import { ReviewModel } from './reviewModel';
4040
import { GitFileChangeNode, gitFileChangeNodeFilter, RemoteFileChangeNode } from './treeNodes/fileChangeNode';
41-
import { IDisposable } from 'cockatiel';
4241

4342
export interface SuggestionInformation {
4443
originalStartLine: number;
@@ -362,7 +361,7 @@ export class ReviewCommentController extends CommentControllerBase
362361
this._localToDispose.push(vscode.window.onDidChangeActiveTextEditor(e => this.onDidChangeActiveTextEditor(e)));
363362
}
364363

365-
private _commentContentChangedListner: IDisposable | undefined;
364+
private _commentContentChangedListner: vscode.Disposable | undefined;
366365
private onDidChangeActiveTextEditor(editor: vscode.TextEditor | undefined) {
367366
this._commentContentChangedListner?.dispose();
368367
this._commentContentChangedListner = undefined;

src/view/treeNodes/categoryNode.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,8 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
316316
let hasMorePages = false;
317317
let hasUnsearchedRepositories = false;
318318
let needLogin = false;
319+
const fetchNextPage = this.fetchNextPage;
320+
this.fetchNextPage = false;
319321
if (this.type === PRType.LocalPullRequest) {
320322
try {
321323
this.prs = (await this._prsTreeModel.getLocalPullRequests(this._folderRepoManager)).items;
@@ -328,13 +330,13 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
328330
let response: ItemsResponseResult<PullRequestModel>;
329331
switch (this.type) {
330332
case PRType.All:
331-
response = await this._prsTreeModel.getAllPullRequests(this._folderRepoManager, this.fetchNextPage);
333+
response = await this._prsTreeModel.getAllPullRequests(this._folderRepoManager, fetchNextPage);
332334
break;
333335
case PRType.Query:
334-
response = await this._prsTreeModel.getPullRequestsForQuery(this._folderRepoManager, this.fetchNextPage, this._categoryQuery!);
336+
response = await this._prsTreeModel.getPullRequestsForQuery(this._folderRepoManager, fetchNextPage, this._categoryQuery!);
335337
break;
336338
}
337-
if (!this.fetchNextPage) {
339+
if (!fetchNextPage) {
338340
this.prs = response.items;
339341
} else {
340342
this.prs = this.prs.concat(response.items);
@@ -353,8 +355,6 @@ export class CategoryTreeNode extends TreeNode implements vscode.TreeItem {
353355
}
354356
});
355357
needLogin = e instanceof AuthenticationError;
356-
} finally {
357-
this.fetchNextPage = false;
358358
}
359359
}
360360

0 commit comments

Comments
 (0)