scm: don't use ResourceTree model if view mode is List

joaomoreno · joaomoreno · commit e80d909439c2 · 2019-10-10T18:37:38.000+02:00
related to microsoft#82203
diff --git a/src/vs/base/common/resourceTree.ts b/src/vs/base/common/resourceTree.ts
@@ -69,6 +69,10 @@ class BranchNode<T, C> extends Node<C> implements IBranchNode<T, C> {
 	delete(path: string): void {
 		this._children.delete(path);
 	}
+
+	clear(): void {
+		this._children.clear();
+	}
 }
 
 class LeafNode<T, C> extends Node<C> implements ILeafNode<T, C> {
@@ -195,4 +199,8 @@ export class ResourceTree<T extends NonNullable<any>, C> {
 		node.delete(name);
 		return child.element;
 	}
+
+	clear(): void {
+		this.root.clear();
+	}
 }
diff --git a/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts b/src/vs/workbench/contrib/scm/browser/repositoryPanel.ts
@@ -403,6 +403,17 @@ class ViewModel {
 	get mode(): ViewModelMode { return this._mode; }
 	set mode(mode: ViewModelMode) {
 		this._mode = mode;
+
+		for (const item of this.items) {
+			item.tree.clear();
+
+			if (mode === ViewModelMode.Tree) {
+				for (const resource of item.resources) {
+					item.tree.add(resource.sourceUri, resource);
+				}
+			}
+		}
+
 		this.refresh();
 		this._onDidChangeMode.fire(mode);
 	}
@@ -432,10 +443,12 @@ class ViewModel {
 				group.onDidSplice(splice => this.onDidSpliceGroup(item, splice))
 			);
 
-			const item = { group, resources, tree, disposable };
+			const item: IGroupItem = { group, resources, tree, disposable };
 
-			for (const resource of resources) {
-				item.tree.add(resource.sourceUri, resource);
+			if (this._mode === ViewModelMode.Tree) {
+				for (const resource of resources) {
+					item.tree.add(resource.sourceUri, resource);
+				}
 			}
 
 			itemsToInsert.push(item);
@@ -451,14 +464,18 @@ class ViewModel {
 	}
 
 	private onDidSpliceGroup(item: IGroupItem, { start, deleteCount, toInsert }: ISplice<ISCMResource>): void {
-		for (const resource of toInsert) {
-			item.tree.add(resource.sourceUri, resource);
+		if (this._mode === ViewModelMode.Tree) {
+			for (const resource of toInsert) {
+				item.tree.add(resource.sourceUri, resource);
+			}
 		}
 
 		const deleted = item.resources.splice(start, deleteCount, ...toInsert);
 
-		for (const resource of deleted) {
-			item.tree.delete(resource.sourceUri);
+		if (this._mode === ViewModelMode.Tree) {
+			for (const resource of deleted) {
+				item.tree.delete(resource.sourceUri);
+			}
 		}
 
 		this.refresh(item);

Original file line number	Diff line number	Diff line change
`@@ -69,6 +69,10 @@ class BranchNode<T, C> extends Node<C> implements IBranchNode<T, C> {`
`69`	`69`	`delete(path: string): void {`
`70`	`70`	`this._children.delete(path);`
`71`	`71`	`}`
	`72`	`+`
	`73`	`+ clear(): void {`
	`74`	`+ this._children.clear();`
	`75`	`+ }`
`72`	`76`	`}`
`73`	`77`
`74`	`78`	`class LeafNode<T, C> extends Node<C> implements ILeafNode<T, C> {`
`@@ -195,4 +199,8 @@ export class ResourceTree<T extends NonNullable<any>, C> {`
`195`	`199`	`node.delete(name);`
`196`	`200`	`return child.element;`
`197`	`201`	`}`
	`202`	`+`
	`203`	`+ clear(): void {`
	`204`	`+ this.root.clear();`
	`205`	`+ }`
`198`	`206`	`}`