fix build

joaomoreno · joaomoreno · commit a47886c5daa7 · 2019-09-20T20:28:25.000+02:00
diff --git a/src/vs/base/browser/ui/tree/abstractTree.ts b/src/vs/base/browser/ui/tree/abstractTree.ts
@@ -14,7 +14,7 @@ import { KeyCode } from 'vs/base/common/keyCodes';
 import { ITreeModel, ITreeNode, ITreeRenderer, ITreeEvent, ITreeMouseEvent, ITreeContextMenuEvent, ITreeFilter, ITreeNavigator, ICollapseStateChangeEvent, ITreeDragAndDrop, TreeDragOverBubble, TreeVisibility, TreeFilterResult, ITreeModelSpliceEvent, TreeMouseEventTarget } from 'vs/base/browser/ui/tree/tree';
 import { ISpliceable } from 'vs/base/common/sequence';
 import { IDragAndDropData, StaticDND, DragAndDropData } from 'vs/base/browser/dnd';
-import { range, equals, distinctES6 } from 'vs/base/common/arrays';
+import { range, equals, distinctES6, fromSet } from 'vs/base/common/arrays';
 import { ElementsDragAndDropData } from 'vs/base/browser/ui/list/listView';
 import { domEvent } from 'vs/base/browser/event';
 import { fuzzyScore, FuzzyScore } from 'vs/base/common/filters';
@@ -1266,7 +1266,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
 				set.add(node);
 			}
 
-			onDidChangeActiveNodes.fire(Array.from(set.values()));
+			onDidChangeActiveNodes.fire(fromSet(set));
 		}, null, this.disposables);
 
 		if (_options.keyboardSupport !== false) {
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
@@ -372,6 +372,12 @@ export function distinctES6<T>(array: ReadonlyArray<T>): T[] {
 	});
 }
 
+export function fromSet<T>(set: Set<T>): T[] {
+	const result: T[] = [];
+	set.forEach(o => result.push(o));
+	return result;
+}
+
 export function uniqueFilter<T>(keyFn: (t: T) => string): (t: T) => boolean {
 	const seen: { [key: string]: boolean; } = Object.create(null);
 
diff --git a/src/vs/base/common/collections.ts b/src/vs/base/common/collections.ts
@@ -95,6 +95,12 @@ export function fromMap<T>(original: Map<string, T>): IStringDictionary<T> {
 	return result;
 }
 
+export function mapValues<V>(map: Map<any, V>): V[] {
+	const result: V[] = [];
+	map.forEach((_, v) => result.push(v));
+	return result;
+}
+
 export class SetMap<K, V> {
 
 	private map = new Map<K, Set<V>>();
diff --git a/src/vs/base/common/iterator.ts b/src/vs/base/common/iterator.ts
@@ -18,6 +18,22 @@ export interface Iterator<T> {
 	next(): IteratorResult<T>;
 }
 
+interface NativeIteratorYieldResult<TYield> {
+	done?: false;
+	value: TYield;
+}
+
+interface NativeIteratorReturnResult<TReturn> {
+	done: true;
+	value: TReturn;
+}
+
+type NativeIteratorResult<T, TReturn = any> = NativeIteratorYieldResult<T> | NativeIteratorReturnResult<TReturn>;
+
+export interface NativeIterator<T> {
+	next(): NativeIteratorResult<T>;
+}
+
 export module Iterator {
 	const _empty: Iterator<any> = {
 		next() {
@@ -56,7 +72,7 @@ export module Iterator {
 		};
 	}
 
-	export function fromIterableIterator<T>(it: IterableIterator<T>): Iterator<T> {
+	export function fromNativeIterator<T>(it: NativeIterator<T>): Iterator<T> {
 		return {
 			next(): IteratorResult<T> {
 				const result = it.next();
diff --git a/src/vs/base/common/resourceTree.ts b/src/vs/base/common/resourceTree.ts
@@ -8,6 +8,7 @@ import * as paths from 'vs/base/common/path';
 import { Iterator } from 'vs/base/common/iterator';
 import { relativePath, joinPath } from 'vs/base/common/resources';
 import { URI } from 'vs/base/common/uri';
+import { mapValues } from 'vs/base/common/collections';
 
 export interface ILeafNode<T, C = void> {
 	readonly uri: URI;
@@ -49,7 +50,7 @@ class BranchNode<T, C> extends Node<C> implements IBranchNode<T, C> {
 	}
 
 	get children(): Iterator<BranchNode<T, C> | LeafNode<T, C>> {
-		return Iterator.fromIterableIterator(this._children.values());
+		return Iterator.fromArray(mapValues(this._children));
 	}
 
 	constructor(uri: URI, relativePath: string, context: C, readonly parent: IBranchNode<T, C> | undefined = undefined) {

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import * as paths from 'vs/base/common/path';`
`8`	`8`	`import { Iterator } from 'vs/base/common/iterator';`
`9`	`9`	`import { relativePath, joinPath } from 'vs/base/common/resources';`
`10`	`10`	`import { URI } from 'vs/base/common/uri';`
	`11`	`+import { mapValues } from 'vs/base/common/collections';`
`11`	`12`
`12`	`13`	`export interface ILeafNode<T, C = void> {`
`13`	`14`	`readonly uri: URI;`
`@@ -49,7 +50,7 @@ class BranchNode<T, C> extends Node<C> implements IBranchNode<T, C> {`
`49`	`50`	`}`
`50`	`51`
`51`	`52`	`get children(): Iterator<BranchNode<T, C> \| LeafNode<T, C>> {`
`52`		`- return Iterator.fromIterableIterator(this._children.values());`
	`53`	`+ return Iterator.fromArray(mapValues(this._children));`
`53`	`54`	`}`
`54`	`55`
`55`	`56`	`constructor(uri: URI, relativePath: string, context: C, readonly parent: IBranchNode<T, C> \| undefined = undefined) {`