Fixes build issues

eamodio · eamodio · commit d35d3861156c · 2025-05-04T11:26:13.000-04:00
diff --git a/src/views/nodes/branchesNode.ts b/src/views/nodes/branchesNode.ts
@@ -5,7 +5,6 @@ import type { Repository } from '../../git/models/repository';
 import { getOpenedWorktreesByBranch } from '../../git/utils/-webview/worktree.utils';
 import { getLocalBranchUpstreamNames } from '../../git/utils/branch.utils';
 import { makeHierarchical } from '../../system/array';
-import { debug } from '../../system/decorators/log';
 import { PageableResult } from '../../system/paging';
 import type { ViewsWithBranchesNode } from '../viewBase';
 import { CacheableChildrenViewNode } from './abstract/cacheableChildrenViewNode';
@@ -129,9 +128,4 @@ export class BranchesNode extends CacheableChildrenViewNode<'branches', ViewsWit
 
 		return item;
 	}
-
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
 }
diff --git a/src/views/nodes/compareBranchNode.ts b/src/views/nodes/compareBranchNode.ts
@@ -305,9 +305,9 @@ export class CompareBranchNode extends SubscribeableViewNode<
 	}
 
 	@debug()
-	override refresh(reset?: boolean): void {
-		super.refresh(reset);
+	override refresh(reset?: boolean): void | { cancel: boolean } | Promise<void | { cancel: boolean }> {
 		this.loadCompareWith();
+		return super.refresh(reset);
 	}
 
 	@log()
diff --git a/src/views/nodes/contributorsNode.ts b/src/views/nodes/contributorsNode.ts
@@ -150,11 +150,6 @@ export class ContributorsNode extends CacheableChildrenViewNode<
 		}
 	}
 
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
-
 	@debug({ args: false })
 	private async getPresenceMap(contributors: GitContributor[]) {
 		// Only get presence for the current user, because it is far too slow otherwise
diff --git a/src/views/nodes/reflogNode.ts b/src/views/nodes/reflogNode.ts
@@ -68,12 +68,11 @@ export class ReflogNode
 	}
 
 	@debug()
-	override refresh(reset?: boolean): void {
-		super.refresh(true);
-
+	override refresh(reset?: boolean): void | { cancel: boolean } | Promise<void | { cancel: boolean }> {
 		if (reset) {
 			this._reflog = undefined;
 		}
+		return super.refresh(true);
 	}
 
 	private _reflog: GitReflog | undefined;
diff --git a/src/views/nodes/remotesNode.ts b/src/views/nodes/remotesNode.ts
@@ -1,7 +1,6 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import type { GitUri } from '../../git/gitUri';
 import type { Repository } from '../../git/models/repository';
-import { debug } from '../../system/decorators/log';
 import type { ViewsWithRemotesNode } from '../viewBase';
 import { CacheableChildrenViewNode } from './abstract/cacheableChildrenViewNode';
 import type { ViewNode } from './abstract/viewNode';
@@ -51,9 +50,4 @@ export class RemotesNode extends CacheableChildrenViewNode<'remotes', ViewsWithR
 
 		return item;
 	}
-
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
 }
diff --git a/src/views/nodes/repositoriesNode.ts b/src/views/nodes/repositoriesNode.ts
@@ -71,7 +71,7 @@ export class RepositoriesNode extends SubscribeableViewNode<
 	@debug()
 	override async refresh(reset: boolean = false): Promise<void> {
 		const hasChildren = this.children != null;
-		super.refresh(reset);
+		await super.refresh(reset);
 		if (!hasChildren) return;
 
 		if (reset) {
diff --git a/src/views/nodes/repositoryNode.ts b/src/views/nodes/repositoryNode.ts
@@ -330,8 +330,8 @@ export class RepositoryNode extends SubscribeableViewNode<'repository', ViewsWit
 
 	@gate()
 	@debug()
-	override async refresh(reset: boolean = false): Promise<void> {
-		super.refresh(reset);
+	override async refresh(reset?: boolean): Promise<void | { cancel: boolean }> {
+		await super.refresh(reset);
 
 		if (reset) {
 			this._status = this.repo.git.status().getStatus();
diff --git a/src/views/nodes/stashesNode.ts b/src/views/nodes/stashesNode.ts
@@ -1,7 +1,6 @@
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import type { GitUri } from '../../git/gitUri';
 import type { Repository } from '../../git/models/repository';
-import { debug } from '../../system/decorators/log';
 import { map } from '../../system/iterable';
 import type { ViewsWithStashesNode } from '../viewBase';
 import { CacheableChildrenViewNode } from './abstract/cacheableChildrenViewNode';
@@ -49,9 +48,4 @@ export class StashesNode extends CacheableChildrenViewNode<'stashes', ViewsWithS
 		item.iconPath = new ThemeIcon('gitlens-stashes');
 		return item;
 	}
-
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
 }
diff --git a/src/views/nodes/tagsNode.ts b/src/views/nodes/tagsNode.ts
@@ -2,7 +2,6 @@ import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from 'vscode';
 import { GitUri } from '../../git/gitUri';
 import type { Repository } from '../../git/models/repository';
 import { makeHierarchical } from '../../system/array';
-import { debug } from '../../system/decorators/log';
 import type { ViewsWithTagsNode } from '../viewBase';
 import { CacheableChildrenViewNode } from './abstract/cacheableChildrenViewNode';
 import type { ViewNode } from './abstract/viewNode';
@@ -64,9 +63,4 @@ export class TagsNode extends CacheableChildrenViewNode<'tags', ViewsWithTagsNod
 		item.iconPath = new ThemeIcon('tag');
 		return item;
 	}
-
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
 }
diff --git a/src/views/nodes/worktreeNode.ts b/src/views/nodes/worktreeNode.ts
@@ -415,13 +415,12 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit
 	}
 
 	@debug()
-	override refresh(reset?: boolean): void {
-		super.refresh(true);
-
+	override refresh(reset?: boolean): void | { cancel: boolean } | Promise<void | { cancel: boolean }> {
 		if (reset) {
 			this._log = undefined;
 			this.deleteState();
 		}
+		return super.refresh(reset);
 	}
 
 	private async getAssociatedPullRequest(
diff --git a/src/views/nodes/worktreesNode.ts b/src/views/nodes/worktreesNode.ts
@@ -4,7 +4,6 @@ import type { GitUri } from '../../git/gitUri';
 import type { Repository } from '../../git/models/repository';
 import { sortWorktrees } from '../../git/utils/-webview/sorting';
 import { filterMap, makeHierarchical } from '../../system/array';
-import { debug } from '../../system/decorators/log';
 import { map } from '../../system/iterable';
 import { Logger } from '../../system/logger';
 import type { ViewsWithWorktreesNode } from '../viewBase';
@@ -108,9 +107,4 @@ export class WorktreesNode extends CacheableChildrenViewNode<'worktrees', ViewsW
 		item.iconPath = new ThemeIcon('folder-opened');
 		return item;
 	}
-
-	@debug()
-	override refresh(): void {
-		super.refresh(true);
-	}
 }

Original file line number	Diff line number	Diff line change
`@@ -305,9 +305,9 @@ export class CompareBranchNode extends SubscribeableViewNode<`
`305`	`305`	`}`
`306`	`306`
`307`	`307`	`@debug()`
`308`		`- override refresh(reset?: boolean): void {`
`309`		`- super.refresh(reset);`
	`308`	`+ override refresh(reset?: boolean): void \| { cancel: boolean } \| Promise<void \| { cancel: boolean }> {`
`310`	`309`	`this.loadCompareWith();`
	`310`	`+ return super.refresh(reset);`
`311`	`311`	`}`
`312`	`312`
`313`	`313`	`@log()`
Original file line number	Diff line number	Diff line change
`@@ -150,11 +150,6 @@ export class ContributorsNode extends CacheableChildrenViewNode<`
`150`	`150`	`}`
`151`	`151`	`}`
`152`	`152`
`153`		`- @debug()`
`154`		`- override refresh(): void {`
`155`		`- super.refresh(true);`
`156`		`- }`
`157`		`-`
`158`	`153`	`@debug({ args: false })`
`159`	`154`	`private async getPresenceMap(contributors: GitContributor[]) {`
`160`	`155`	`// Only get presence for the current user, because it is far too slow otherwise`
Original file line number	Diff line number	Diff line change
`@@ -68,12 +68,11 @@ export class ReflogNode`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`@debug()`
`71`		`- override refresh(reset?: boolean): void {`
`72`		`- super.refresh(true);`
`73`		`-`
	`71`	`+ override refresh(reset?: boolean): void \| { cancel: boolean } \| Promise<void \| { cancel: boolean }> {`
`74`	`72`	`if (reset) {`
`75`	`73`	`this._reflog = undefined;`
`76`	`74`	`}`
	`75`	`+ return super.refresh(true);`
`77`	`76`	`}`
`78`	`77`
`79`	`78`	`private _reflog: GitReflog \| undefined;`
Original file line number	Diff line number	Diff line change
`@@ -415,13 +415,12 @@ export class WorktreeNode extends CacheableChildrenViewNode<'worktree', ViewsWit`
`415`	`415`	`}`
`416`	`416`
`417`	`417`	`@debug()`
`418`		`- override refresh(reset?: boolean): void {`
`419`		`- super.refresh(true);`
`420`		`-`
	`418`	`+ override refresh(reset?: boolean): void \| { cancel: boolean } \| Promise<void \| { cancel: boolean }> {`
`421`	`419`	`if (reset) {`
`422`	`420`	`this._log = undefined;`
`423`	`421`	`this.deleteState();`
`424`	`422`	`}`
	`423`	`+ return super.refresh(reset);`
`425`	`424`	`}`
`426`	`425`
`427`	`426`	`private async getAssociatedPullRequest(`