Iterator.fromArray

src/vs/base/browser/ui/tree/treeModel.ts

@@ -77,7 +77,7 @@ function getTreeElementIterator<T>(elements: Iterator<ITreeElement<T>> | ITreeEl
 	if (!elements) {
 		return Iterator.empty();
 	} else if (Array.isArray(elements)) {
-		return Iterator.iterate(elements);
+		return Iterator.fromArray(elements);
 	} else {
 		return elements;
 	}
@@ -102,7 +102,7 @@ function treeElementToNode<T>(treeElement: ITreeElement<T>, parent: IMutableTree
 
 function treeNodeToElement<T>(node: IMutableTreeNode<T>): ITreeElement<T> {
 	const { element, collapsed } = node;
-	const children = Iterator.map(Iterator.iterate(node.children), treeNodeToElement);
+	const children = Iterator.map(Iterator.fromArray(node.children), treeNodeToElement);
 
 	return { element, children, collapsed };
 }
@@ -155,7 +155,7 @@ export class TreeModel<T> {
 			this.list.splice(listIndex, visibleDeleteCount, treeListElementsToInsert);
 		}
 
-		return Iterator.map(Iterator.iterate(deletedNodes), treeNodeToElement);
+		return Iterator.map(Iterator.fromArray(deletedNodes), treeNodeToElement);
 	}
 
 	getListIndex(location: number[]): number {

src/vs/base/common/iterator.ts

@@ -25,7 +25,7 @@ export module Iterator {
 		return _empty;
 	}
 
-	export function iterate<T>(array: T[], index = 0, length = array.length): Iterator<T> {
+	export function fromArray<T>(array: T[], index = 0, length = array.length): Iterator<T> {
 		return {
 			next(): IteratorResult<T> {
 				if (index >= length) {
@@ -81,7 +81,7 @@ export type ISequence<T> = Iterator<T> | T[];
 
 export function getSequenceIterator<T>(arg: Iterator<T> | T[]): Iterator<T> {
 	if (Array.isArray(arg)) {
-		return Iterator.iterate(arg);
+		return Iterator.fromArray(arg);
 	} else {
 		return arg;
 	}

src/vs/base/test/browser/ui/tree/treeModel.test.ts

@@ -33,7 +33,7 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{ element: 0 },
 			{ element: 1 },
 			{ element: 2 }
@@ -55,9 +55,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, children: Iterator.iterate([
+				element: 0, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -92,9 +92,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, collapsed: true, children: Iterator.iterate([
+				element: 0, collapsed: true, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -120,7 +120,7 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{ element: 0 },
 			{ element: 1 },
 			{ element: 2 }
@@ -145,9 +145,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, children: Iterator.iterate([
+				element: 0, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -179,9 +179,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, children: Iterator.iterate([
+				element: 0, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -207,9 +207,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, collapsed: true, children: Iterator.iterate([
+				element: 0, collapsed: true, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -232,9 +232,9 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
-				element: 0, children: Iterator.iterate([
+				element: 0, children: Iterator.fromArray([
 					{ element: 10 },
 					{ element: 11 },
 					{ element: 12 },
@@ -263,9 +263,9 @@ suite('TreeModel2', function () {
 	// 	const list = [] as ITreeNode<number>[];
 	// 	const model = new TreeModel<number>(toSpliceable(list));
 
-	// 	model.splice([0], 0, Iterator.iterate([
+	// 	model.splice([0], 0, Iterator.fromArray([
 	// 		{
-	// 			element: 0, collapsed: true, children: Iterator.iterate([
+	// 			element: 0, collapsed: true, children: Iterator.fromArray([
 	// 				{ element: 10 },
 	// 				{ element: 11 },
 	// 				{ element: 12 },
@@ -303,7 +303,7 @@ suite('TreeModel2', function () {
 		const list = [] as ITreeNode<number>[];
 		const model = new TreeModel<number>(toSpliceable(list));
 
-		model.splice([0], 0, Iterator.iterate([
+		model.splice([0], 0, Iterator.fromArray([
 			{
 				element: 1, children: [
 					{