Fixes state getting lost w/ search/compare nodes

Removes ViewNode.instanceId
Better persists search/compare tree ids

Author: eamodio

src/views/nodes/branchNode.ts

@@ -30,11 +30,9 @@ export class BranchNode extends ViewRefNode<RepositoriesView> implements Pageabl
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.branch.repoPath})${this._root ? ':root:' : ''}:branch(${
-            this.branch.name
-        })${this.branch.current ? '+current:' : ''}${this.branch.remote ? '+remote' : ''}${
-            this.branch.starred ? '+starred:' : ''
-        }`;
+        return `gitlens:repository(${this.branch.repoPath})${this._root ? ':root' : ''}:branch(${this.branch.name})${
+            this.branch.current ? '+current' : ''
+        }${this.branch.remote ? '+remote' : ''}${this.branch.starred ? '+starred' : ''}`;
     }
 
     get current(): boolean {
@@ -206,7 +204,7 @@ export class BranchNode extends ViewRefNode<RepositoriesView> implements Pageabl
 
     @gate()
     @debug()
-    refresh() {
+    refresh(reset: boolean = false) {
         this._children = undefined;
     }
 }

src/views/nodes/branchOrTagFolderNode.ts

@@ -23,7 +23,7 @@ export class BranchOrTagFolderNode extends ViewNode {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.repoPath})${
+        return `gitlens:repository(${this.repoPath})${
             this._key === undefined ? '' : `:${this._key}`
         }:${this.type}-folder(${this.relativePath})`;
     }

src/views/nodes/branchTrackingStatusNode.ts

@@ -32,7 +32,7 @@ export class BranchTrackingStatusNode extends ViewNode<ViewWithFiles> implements
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.status.repoPath}):${this._root ? 'root:' : ''}branch(${
+        return `gitlens:repository(${this.status.repoPath}):${this._root ? 'root:' : ''}branch(${
             this.status.ref
         }):status:upstream:(${this.status.upstream}):${this.direction}`;
     }

src/views/nodes/branchesNode.ts

@@ -17,7 +17,7 @@ export class BranchesNode extends ViewNode<RepositoriesView> {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.repo.path}):branches`;
+        return `gitlens:repository(${this.repo.path}):branches`;
     }
 
     async getChildren(): Promise<ViewNode[]> {

src/views/nodes/compareBranchNode.ts

@@ -22,7 +22,7 @@ export class CompareBranchNode extends ViewNode<RepositoriesView> {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.branch.repoPath}):branch(${this.branch.name}):compareWith`;
+        return `gitlens:repository(${this.branch.repoPath}):branch(${this.branch.name}):compareWith`;
     }
 
     getChildren(): ViewNode[] {

src/views/nodes/compareNode.ts

@@ -119,7 +119,7 @@ export class CompareNode extends ViewNode<CompareView> {
 
         const promises: Promise<any>[] = [
             ...Iterables.filterMap(this._children, c => {
-                const result = c.refresh();
+                const result = c.refresh === undefined ? false : c.refresh();
                 return Functions.isPromise<boolean | void>(result) ? result : undefined;
             })
         ];

src/views/nodes/compareResultsNode.ts

@@ -9,8 +9,11 @@ import { CommitsQueryResults, ResultsCommitsNode } from './resultsCommitsNode';
 import { ResultsFilesNode } from './resultsFilesNode';
 import { ResourceType, SubscribeableViewNode, ViewNode } from './viewNode';
 
+let instanceId = 0;
+
 export class CompareResultsNode extends SubscribeableViewNode<CompareView> {
     private _children: ViewNode[] | undefined;
+    private _instanceId: number;
 
     constructor(
         view: CompareView,
@@ -20,6 +23,11 @@ export class CompareResultsNode extends SubscribeableViewNode<CompareView> {
         private _pinned: boolean = false
     ) {
         super(GitUri.fromRepoPath(repoPath), view);
+        this._instanceId = instanceId++;
+    }
+
+    get id(): string {
+        return `gitlens:repository(${this.repoPath}):compare(${this._ref1.ref}:${this._ref2.ref})|${this._instanceId}`;
     }
 
     get label() {

src/views/nodes/contributorNode.ts

@@ -19,7 +19,7 @@ export class ContributorNode extends ViewNode<RepositoriesView> implements Pagea
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.contributor.repoPath}):contributor(${this.contributor.name}|${this.contributor.email}}`;
+        return `gitlens:repository(${this.contributor.repoPath}):contributor(${this.contributor.name}|${this.contributor.email}}`;
     }
 
     async getChildren(): Promise<ViewNode[]> {

src/views/nodes/contributorsNode.ts

@@ -13,7 +13,7 @@ export class ContributorsNode extends ViewNode<RepositoriesView> {
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.repo.path}):contributors`;
+        return `gitlens:repository(${this.repo.path}):contributors`;
     }
 
     async getChildren(): Promise<ViewNode[]> {

src/views/nodes/reflogNode.ts

@@ -19,7 +19,7 @@ export class ReflogNode extends ViewNode<RepositoriesView> implements PageableVi
     }
 
     get id(): string {
-        return `${this._instanceId}:gitlens:repository(${this.repo.path}):reflog`;
+        return `gitlens:repository(${this.repo.path}):reflog`;
     }
 
     async getChildren(): Promise<ViewNode[]> {