Fixes microsoft#104898

alexdima · alexdima · commit 03cd68f8384f · 2020-08-30T17:12:22.000+02:00
diff --git a/src/vs/base/common/arrays.ts b/src/vs/base/common/arrays.ts
@@ -590,17 +590,6 @@ export function asArray<T>(x: T | T[]): T[] {
 	return Array.isArray(x) ? x : [x];
 }
 
-/**
- * @deprecated Use `Array.from` or `[...iter]`
- */
-export function toArray<T>(iterable: IterableIterator<T>): T[] {
-	const result: T[] = [];
-	for (let element of iterable) {
-		result.push(element);
-	}
-	return result;
-}
-
 export function getRandomElement<T>(arr: T[]): T | undefined {
 	return arr[Math.floor(Math.random() * arr.length)];
 }
diff --git a/src/vs/editor/common/modes/tokenizationRegistry.ts b/src/vs/editor/common/modes/tokenizationRegistry.ts
@@ -7,7 +7,6 @@ import { Color } from 'vs/base/common/color';
 import { Emitter, Event } from 'vs/base/common/event';
 import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
 import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes';
-import { toArray } from 'vs/base/common/arrays';
 
 export class TokenizationRegistryImpl implements ITokenizationRegistry {
 
@@ -82,7 +81,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
 	public setColorMap(colorMap: Color[]): void {
 		this._colorMap = colorMap;
 		this._onDidChange.fire({
-			changedLanguages: toArray(this._map.keys()),
+			changedLanguages: Array.from(this._map.keys()),
 			changedColorMap: true
 		});
 	}
diff --git a/src/vs/platform/contextkey/browser/contextKeyService.ts b/src/vs/platform/contextkey/browser/contextKeyService.ts
@@ -9,7 +9,6 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
 import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration';
 import { IContext, IContextKey, IContextKeyChangeEvent, IContextKeyService, IContextKeyServiceTarget, IReadableSet, SET_CONTEXT_COMMAND_ID, ContextKeyExpression } from 'vs/platform/contextkey/common/contextkey';
 import { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
-import { toArray } from 'vs/base/common/arrays';
 
 const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context';
 
@@ -102,7 +101,7 @@ class ConfigAwareContextValuesContainer extends Context {
 		this._listener = this._configurationService.onDidChangeConfiguration(event => {
 			if (event.source === ConfigurationTarget.DEFAULT) {
 				// new setting, reset everything
-				const allKeys = toArray(this._values.keys());
+				const allKeys = Array.from(this._values.keys());
 				this._values.clear();
 				emitter.fire(new ArrayContextKeyChangeEvent(allKeys));
 			} else {
diff --git a/src/vs/workbench/services/extensions/common/extensionsRegistry.ts b/src/vs/workbench/services/extensions/common/extensionsRegistry.ts
@@ -12,7 +12,6 @@ import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/c
 import { Registry } from 'vs/platform/registry/common/platform';
 import { IMessage } from 'vs/workbench/services/extensions/common/extensions';
 import { ExtensionIdentifier, IExtensionDescription, EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';
-import { toArray } from 'vs/base/common/arrays';
 
 const schemaRegistry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution);
 export type ExtensionKind = 'workspace' | 'ui' | undefined;
@@ -446,7 +445,7 @@ export class ExtensionsRegistryImpl {
 	}
 
 	public getExtensionPoints(): ExtensionPoint<any>[] {
-		return toArray(this._extensionPoints.values());
+		return Array.from(this._extensionPoints.values());
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@ import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/c`
`12`	`12`	`import { Registry } from 'vs/platform/registry/common/platform';`
`13`	`13`	`import { IMessage } from 'vs/workbench/services/extensions/common/extensions';`
`14`	`14`	`import { ExtensionIdentifier, IExtensionDescription, EXTENSION_CATEGORIES } from 'vs/platform/extensions/common/extensions';`
`15`		`-import { toArray } from 'vs/base/common/arrays';`
`16`	`15`
`17`	`16`	`const schemaRegistry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution);`
`18`	`17`	`export type ExtensionKind = 'workspace' \| 'ui' \| undefined;`
`@@ -446,7 +445,7 @@ export class ExtensionsRegistryImpl {`
`446`	`445`	`}`
`447`	`446`
`448`	`447`	`public getExtensionPoints(): ExtensionPoint<any>[] {`
`449`		`- return toArray(this._extensionPoints.values());`
	`448`	`+ return Array.from(this._extensionPoints.values());`
`450`	`449`	`}`
`451`	`450`	`}`
`452`	`451`