未验证 提交 03cd68f8 编写于 作者: A Alex Dima

Fixes #104898

上级 936211bb
...@@ -590,17 +590,6 @@ export function asArray<T>(x: T | T[]): T[] { ...@@ -590,17 +590,6 @@ export function asArray<T>(x: T | T[]): T[] {
return Array.isArray(x) ? x : [x]; 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 { export function getRandomElement<T>(arr: T[]): T | undefined {
return arr[Math.floor(Math.random() * arr.length)]; return arr[Math.floor(Math.random() * arr.length)];
} }
...@@ -7,7 +7,6 @@ import { Color } from 'vs/base/common/color'; ...@@ -7,7 +7,6 @@ import { Color } from 'vs/base/common/color';
import { Emitter, Event } from 'vs/base/common/event'; import { Emitter, Event } from 'vs/base/common/event';
import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle';
import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes'; import { ColorId, ITokenizationRegistry, ITokenizationSupport, ITokenizationSupportChangedEvent } from 'vs/editor/common/modes';
import { toArray } from 'vs/base/common/arrays';
export class TokenizationRegistryImpl implements ITokenizationRegistry { export class TokenizationRegistryImpl implements ITokenizationRegistry {
...@@ -82,7 +81,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry { ...@@ -82,7 +81,7 @@ export class TokenizationRegistryImpl implements ITokenizationRegistry {
public setColorMap(colorMap: Color[]): void { public setColorMap(colorMap: Color[]): void {
this._colorMap = colorMap; this._colorMap = colorMap;
this._onDidChange.fire({ this._onDidChange.fire({
changedLanguages: toArray(this._map.keys()), changedLanguages: Array.from(this._map.keys()),
changedColorMap: true changedColorMap: true
}); });
} }
......
...@@ -9,7 +9,6 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands'; ...@@ -9,7 +9,6 @@ import { CommandsRegistry } from 'vs/platform/commands/common/commands';
import { ConfigurationTarget, IConfigurationService } from 'vs/platform/configuration/common/configuration'; 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 { 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 { KeybindingResolver } from 'vs/platform/keybinding/common/keybindingResolver';
import { toArray } from 'vs/base/common/arrays';
const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context'; const KEYBINDING_CONTEXT_ATTR = 'data-keybinding-context';
...@@ -102,7 +101,7 @@ class ConfigAwareContextValuesContainer extends Context { ...@@ -102,7 +101,7 @@ class ConfigAwareContextValuesContainer extends Context {
this._listener = this._configurationService.onDidChangeConfiguration(event => { this._listener = this._configurationService.onDidChangeConfiguration(event => {
if (event.source === ConfigurationTarget.DEFAULT) { if (event.source === ConfigurationTarget.DEFAULT) {
// new setting, reset everything // new setting, reset everything
const allKeys = toArray(this._values.keys()); const allKeys = Array.from(this._values.keys());
this._values.clear(); this._values.clear();
emitter.fire(new ArrayContextKeyChangeEvent(allKeys)); emitter.fire(new ArrayContextKeyChangeEvent(allKeys));
} else { } else {
......
...@@ -12,7 +12,6 @@ import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/c ...@@ -12,7 +12,6 @@ import { Extensions, IJSONContributionRegistry } from 'vs/platform/jsonschemas/c
import { Registry } from 'vs/platform/registry/common/platform'; import { Registry } from 'vs/platform/registry/common/platform';
import { IMessage } from 'vs/workbench/services/extensions/common/extensions'; import { IMessage } from 'vs/workbench/services/extensions/common/extensions';
import { ExtensionIdentifier, IExtensionDescription, EXTENSION_CATEGORIES } from 'vs/platform/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); const schemaRegistry = Registry.as<IJSONContributionRegistry>(Extensions.JSONContribution);
export type ExtensionKind = 'workspace' | 'ui' | undefined; export type ExtensionKind = 'workspace' | 'ui' | undefined;
...@@ -446,7 +445,7 @@ export class ExtensionsRegistryImpl { ...@@ -446,7 +445,7 @@ export class ExtensionsRegistryImpl {
} }
public getExtensionPoints(): ExtensionPoint<any>[] { public getExtensionPoints(): ExtensionPoint<any>[] {
return toArray(this._extensionPoints.values()); return Array.from(this._extensionPoints.values());
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册