Fixes #3518 only "promote" open worktrees

Author: eamodio

CHANGELOG.md

@@ -13,6 +13,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 ### Fixed
 
 - Fixes [#3514](https://github.com/gitkraken/vscode-gitlens/issues/3514) - Attempting to delete the main worktree's branch causes a invalid prompt to delete the main worktree
+- Fixes [#3518](https://github.com/gitkraken/vscode-gitlens/issues/3518) - Branches in worktrees are no longer collapsed into folder groupings
 
 ## [15.4.0] - 2024-09-04
 

src/views/nodes/branchNode.ts

@@ -17,6 +17,7 @@ import { getWorktreeBranchIconPath } from '../../git/utils/worktree-utils';
 import { getContext } from '../../system/context';
 import { gate } from '../../system/decorators/gate';
 import { log } from '../../system/decorators/log';
+import { memoize } from '../../system/decorators/memoize';
 import { map } from '../../system/iterable';
 import type { Deferred } from '../../system/promise';
 import { defer, getSettledValue } from '../../system/promise';
@@ -107,7 +108,7 @@ export class BranchNode
 	}
 
 	private get avoidCompacting(): boolean {
-		return this.root || this.current || this.worktree != null || this.branch.detached || this.branch.starred;
+		return this.root || this.current || this.worktree?.opened || this.branch.detached || this.branch.starred;
 	}
 
 	compacted: boolean = false;
@@ -135,6 +136,7 @@ export class BranchNode
 		return this.avoidCompacting ? [this.branch.name] : this.branch.getNameWithoutRemote().split('/');
 	}
 
+	@memoize()
 	get worktree(): GitWorktree | undefined {
 		const worktree = this.context.worktreesByBranch?.get(this.branch.id);
 		return worktree?.main ? undefined : worktree;