Fixes worktree find/reveal

Author: eamodio

src/views/repositoriesView.ts

@@ -507,13 +507,13 @@ export class RepositoriesView extends ViewBase<'repositories', RepositoriesNode,
 		const { repoPath, uri } = worktree;
 		const url = uri.toString();
 
-		return this.findNode(n => n instanceof WorktreeNode && worktree.uri.toString() === url, {
+		return this.findNode(n => n instanceof WorktreeNode && n.worktree.uri.toString() === url, {
 			maxDepth: 2,
 			canTraverse: n => {
 				// Only search for worktree nodes in the same repo within WorktreesNode
 				if (n instanceof RepositoriesNode) return true;
 
-				if (n instanceof RepositoryNode || n instanceof WorktreesNode) {
+				if (n instanceof RepositoryNode || n instanceof WorktreesNode || n instanceof BranchOrTagFolderNode) {
 					return n.repoPath === repoPath;
 				}
 

src/views/worktreesView.ts

@@ -15,6 +15,7 @@ import { gate } from '../system/decorators/-webview/gate';
 import { RepositoriesSubscribeableNode } from './nodes/abstract/repositoriesSubscribeableNode';
 import { RepositoryFolderNode } from './nodes/abstract/repositoryFolderNode';
 import type { ViewNode } from './nodes/abstract/viewNode';
+import { BranchOrTagFolderNode } from './nodes/branchOrTagFolderNode';
 import { WorktreeNode } from './nodes/worktreeNode';
 import { WorktreesNode } from './nodes/worktreesNode';
 import type { GroupedViewContext, RevealOptions } from './viewBase';
@@ -217,12 +218,12 @@ export class WorktreesView extends ViewBase<'worktrees', WorktreesViewNode, Work
 		const { repoPath, uri } = worktree;
 		const url = uri.toString();
 
-		return this.findNode(n => n instanceof WorktreeNode && worktree.uri.toString() === url, {
+		return this.findNode(n => n instanceof WorktreeNode && n.worktree.uri.toString() === url, {
 			maxDepth: 2,
 			canTraverse: n => {
 				if (n instanceof WorktreesViewNode) return true;
 
-				if (n instanceof WorktreesRepositoryNode) {
+				if (n instanceof WorktreesRepositoryNode || n instanceof BranchOrTagFolderNode) {
 					return n.repoPath === repoPath;
 				}