first successful CollapsibleTreeModel tests, woo

joaomoreno · joaomoreno · commit a8e7ed08c61f · 2018-06-23T00:15:21.000+02:00
diff --git a/src/vs/base/browser/ui/list/treeModel.ts b/src/vs/base/browser/ui/list/treeModel.ts
@@ -6,7 +6,7 @@
 'use strict';
 
 import { ISpliceable } from 'vs/base/common/sequence';
-import { IIterator, map, collect, forEach, iter } from 'vs/base/common/iterator';
+import { IIterator, map, collect, forEach, iter, empty } from 'vs/base/common/iterator';
 import { last } from 'vs/base/common/arrays';
 import { Tree } from 'vs/base/common/tree';
 
@@ -127,6 +127,17 @@ interface ICollapsibleElement<T> {
 export type ICollapsibleTreeElement<T> = ITreeElement<ICollapsibleElement<T>>;
 export type ICollapsibleTreeListElement<T> = ITreeListElement<ICollapsibleElement<T>>;
 
+function asVisibleElement<T>(element: ICollapsibleTreeElement<T>): ICollapsibleTreeElement<T> {
+	if (element.element.collapsed) {
+		return { element: element.element, children: empty() };
+	}
+
+	return {
+		element: element.element,
+		children: map(element.children, asVisibleElement)
+	};
+}
+
 export class CollapsibleTreeModel<T> {
 
 	private model = new Tree<ICollapsibleElement<T>>();
@@ -145,7 +156,7 @@ export class CollapsibleTreeModel<T> {
 		const isVisible = ancestors.every(el => !el.collapsed);
 
 		if (isVisible) {
-			this.viewModel.splice(location, deleteCount, elementsToInsert);
+			this.viewModel.splice(location, deleteCount, map(elementsToInsert, asVisibleElement));
 		}
 
 		return result;
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
@@ -14,6 +14,16 @@ export interface IIterator<T> {
 	next(): IIteratorResult<T>;
 }
 
+const _empty: IIterator<any> = {
+	next() {
+		return { done: true, value: undefined };
+	}
+};
+
+export function empty<T>(): IIterator<T> {
+	return _empty;
+}
+
 export function iter<T>(array: T[], index = 0, length = array.length): IIterator<T> {
 	return {
 		next(): IIteratorResult<T> {
diff --git a/src/vs/base/test/browser/ui/list/treeModel.test.ts b/src/vs/base/test/browser/ui/list/treeModel.test.ts
@@ -205,4 +205,29 @@ suite('CollapsibleTreeModel', () => {
 		assert.deepEqual(list[5].element.element, 2);
 		assert.deepEqual(list[5].depth, 1);
 	});
+
+	test('deep insert collapsed', () => {
+		const list = [] as ICollapsibleTreeListElement<number>[];
+		const model = new CollapsibleTreeModel<number>(toSpliceable(list));
+
+		model.splice([0], 0, iter([
+			{
+				element: { element: 0, collapsed: true }, children: iter([
+					{ element: { element: 10, collapsed: false }, children: iter([]) },
+					{ element: { element: 11, collapsed: false }, children: iter([]) },
+					{ element: { element: 12, collapsed: false }, children: iter([]) },
+				])
+			},
+			{ element: { element: 1, collapsed: false }, children: iter([]) },
+			{ element: { element: 2, collapsed: false }, children: iter([]) }
+		]));
+
+		assert.deepEqual(list.length, 3);
+		assert.deepEqual(list[0].element.element, 0);
+		assert.deepEqual(list[0].depth, 1);
+		assert.deepEqual(list[1].element.element, 1);
+		assert.deepEqual(list[1].depth, 1);
+		assert.deepEqual(list[2].element.element, 2);
+		assert.deepEqual(list[2].depth, 1);
+	});
 });
