diff --git a/src/vs/platform/configuration/common/configurationModels.ts b/src/vs/platform/configuration/common/configurationModels.ts index 5fe331da136..1260ca7ac41 100644 --- a/src/vs/platform/configuration/common/configurationModels.ts +++ b/src/vs/platform/configuration/common/configurationModels.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ import * as json from 'vs/base/common/json'; -import { ResourceMap, values, getOrSet } from 'vs/base/common/map'; +import { ResourceMap, getOrSet } from 'vs/base/common/map'; import * as arrays from 'vs/base/common/arrays'; import * as types from 'vs/base/common/types'; import * as objects from 'vs/base/common/objects'; @@ -692,7 +692,7 @@ export class Configuration { this.userConfiguration.freeze().keys.forEach(key => keys.add(key)); this._workspaceConfiguration.freeze().keys.forEach(key => keys.add(key)); this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.freeze().keys.forEach(key => keys.add(key))); - return values(keys); + return [...keys.values()]; } protected getAllKeysForOverrideIdentifier(overrideIdentifier: string): string[] { @@ -701,7 +701,7 @@ export class Configuration { this.userConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this._workspaceConfiguration.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key)); this._folderConfigurations.forEach(folderConfiguraiton => folderConfiguraiton.getKeysForOverrideIdentifier(overrideIdentifier).forEach(key => keys.add(key))); - return values(keys); + return [...keys.values()]; } static parse(data: IConfigurationData): Configuration { @@ -738,8 +738,8 @@ export function mergeChanges(...changes: IConfigurationChange[]): IConfiguration }); } const overrides: [string, string[]][] = []; - overridesMap.forEach((keys, identifier) => overrides.push([identifier, values(keys)])); - return { keys: values(keysSet), overrides }; + overridesMap.forEach((keys, identifier) => overrides.push([identifier, [...keys.values()]])); + return { keys: [...keysSet.values()], overrides }; } export class ConfigurationChangeEvent implements IConfigurationChangeEvent { @@ -753,7 +753,7 @@ export class ConfigurationChangeEvent implements IConfigurationChangeEvent { const keysSet = new Set(); change.keys.forEach(key => keysSet.add(key)); change.overrides.forEach(([, keys]) => keys.forEach(key => keysSet.add(key))); - this.affectedKeys = values(keysSet); + this.affectedKeys = [...keysSet.values()]; const configurationModel = new ConfigurationModel(); this.affectedKeys.forEach(key => configurationModel.setValue(key, {})); diff --git a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts index 9c71df411fc..624ecc44a47 100644 --- a/src/vs/platform/extensionManagement/common/extensionGalleryService.ts +++ b/src/vs/platform/extensionManagement/common/extensionGalleryService.ts @@ -13,7 +13,6 @@ import { IRequestService, asJson, asText } from 'vs/platform/request/common/requ import { IRequestOptions, IRequestContext, IHeaders } from 'vs/base/parts/request/common/request'; import { isEngineValid } from 'vs/platform/extensions/common/extensionValidator'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; -import { values } from 'vs/base/common/map'; import { CancellationToken } from 'vs/base/common/cancellation'; import { ILogService } from 'vs/platform/log/common/log'; import { IExtensionManifest } from 'vs/platform/extensions/common/extensions'; @@ -759,7 +758,7 @@ export class ExtensionGalleryService implements IExtensionGalleryService { } } - return Promise.resolve(values(map)); + return [...map.values()]; }); }); } diff --git a/src/vs/platform/files/common/keyValueFileSystemProvider.ts b/src/vs/platform/files/common/keyValueFileSystemProvider.ts index e8dfb610926..15742e9b9ec 100644 --- a/src/vs/platform/files/common/keyValueFileSystemProvider.ts +++ b/src/vs/platform/files/common/keyValueFileSystemProvider.ts @@ -9,7 +9,6 @@ import { Disposable, IDisposable } from 'vs/base/common/lifecycle'; import { Event, Emitter } from 'vs/base/common/event'; import { VSBuffer } from 'vs/base/common/buffer'; import { joinPath, extUri, dirname } from 'vs/base/common/resources'; -import { values } from 'vs/base/common/map'; import { localize } from 'vs/nls'; export abstract class KeyValueFileSystemProvider extends Disposable implements IFileSystemProviderWithFileReadWriteCapability { @@ -97,7 +96,7 @@ export abstract class KeyValueFileSystemProvider extends Disposable implements I } } } - return values(files); + return [...files.values()]; } async readFile(resource: URI): Promise { diff --git a/src/vs/platform/userDataSync/common/settingsMerge.ts b/src/vs/platform/userDataSync/common/settingsMerge.ts index 0a881199424..2e2d865672f 100644 --- a/src/vs/platform/userDataSync/common/settingsMerge.ts +++ b/src/vs/platform/userDataSync/common/settingsMerge.ts @@ -6,7 +6,6 @@ import * as objects from 'vs/base/common/objects'; import { parse, JSONVisitor, visit } from 'vs/base/common/json'; import { setProperty, withFormatting, applyEdits } from 'vs/base/common/jsonEdit'; -import { values } from 'vs/base/common/map'; import { IStringDictionary } from 'vs/base/common/collections'; import { FormattingOptions, Edit, getEOL } from 'vs/base/common/jsonFormatter'; import * as contentUtil from 'vs/platform/userDataSync/common/content'; @@ -223,7 +222,7 @@ export function merge(originalLocalContent: string, originalRemoteContent: strin const hasConflicts = conflicts.size > 0 || !areSame(localContent, remoteContent, ignoredSettings); const hasLocalChanged = hasConflicts || !areSame(localContent, originalLocalContent, []); const hasRemoteChanged = hasConflicts || !areSame(remoteContent, originalRemoteContent, []); - return { localContent: hasLocalChanged ? localContent : null, remoteContent: hasRemoteChanged ? remoteContent : null, conflictsSettings: values(conflicts), hasConflicts }; + return { localContent: hasLocalChanged ? localContent : null, remoteContent: hasRemoteChanged ? remoteContent : null, conflictsSettings: [...conflicts.values()], hasConflicts }; } export function areSame(localContent: string, remoteContent: string, ignoredSettings: string[]): boolean { diff --git a/src/vs/platform/userDataSync/common/snippetsMerge.ts b/src/vs/platform/userDataSync/common/snippetsMerge.ts index 53dcbaa7451..7f8e3e486d2 100644 --- a/src/vs/platform/userDataSync/common/snippetsMerge.ts +++ b/src/vs/platform/userDataSync/common/snippetsMerge.ts @@ -3,7 +3,6 @@ * Licensed under the MIT License. See License.txt in the project root for license information. *--------------------------------------------------------------------------------------------*/ -import { values } from 'vs/base/common/map'; import { IStringDictionary } from 'vs/base/common/collections'; export interface IMergeResult { @@ -27,7 +26,7 @@ export function merge(local: IStringDictionary, remote: IStringDictionar if (!remote) { return { - local: { added: localAdded, updated: localUpdated, removed: values(localRemoved) }, + local: { added: localAdded, updated: localUpdated, removed: [...localRemoved.values()] }, remote: { added: local, updated: {}, removed: [] }, conflicts: [] }; @@ -37,7 +36,7 @@ export function merge(local: IStringDictionary, remote: IStringDictionar if (localToRemote.added.size === 0 && localToRemote.removed.size === 0 && localToRemote.updated.size === 0) { // No changes found between local and remote. return { - local: { added: localAdded, updated: localUpdated, removed: values(localRemoved) }, + local: { added: localAdded, updated: localUpdated, removed: [...localRemoved.values()] }, remote: { added: {}, updated: {}, removed: [] }, conflicts: [] }; @@ -145,9 +144,9 @@ export function merge(local: IStringDictionary, remote: IStringDictionar } return { - local: { added: localAdded, removed: values(localRemoved), updated: localUpdated }, - remote: { added: remoteAdded, removed: values(remoteRemoved), updated: remoteUpdated }, - conflicts: values(conflicts), + local: { added: localAdded, removed: [...localRemoved.values()], updated: localUpdated }, + remote: { added: remoteAdded, removed: [...remoteRemoved.values()], updated: remoteUpdated }, + conflicts: [...conflicts.values()], }; } diff --git a/src/vs/platform/userDataSync/common/snippetsSync.ts b/src/vs/platform/userDataSync/common/snippetsSync.ts index 38120e538bf..f4acdb1fb05 100644 --- a/src/vs/platform/userDataSync/common/snippetsSync.ts +++ b/src/vs/platform/userDataSync/common/snippetsSync.ts @@ -21,7 +21,6 @@ import { CancellationToken } from 'vs/base/common/cancellation'; import { IStorageService } from 'vs/platform/storage/common/storage'; import { deepClone } from 'vs/base/common/objects'; import { localize } from 'vs/nls'; -import { values } from 'vs/base/common/map'; export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserDataSynchroniser { @@ -286,7 +285,7 @@ export class SnippetsSynchroniser extends AbstractSynchroniser implements IUserD } } - return values(resourcePreviews); + return [...resourcePreviews.values()]; } async getAssociatedResources({ uri }: ISyncResourceHandle): Promise<{ resource: URI, comparableResource?: URI }[]> { diff --git a/src/vs/platform/userDataSync/common/storageKeys.ts b/src/vs/platform/userDataSync/common/storageKeys.ts index 43c150d4b3a..10c2db84ee6 100644 --- a/src/vs/platform/userDataSync/common/storageKeys.ts +++ b/src/vs/platform/userDataSync/common/storageKeys.ts @@ -4,7 +4,6 @@ *--------------------------------------------------------------------------------------------*/ import { Event, Emitter } from 'vs/base/common/event'; -import { values } from 'vs/base/common/map'; import { Disposable, toDisposable } from 'vs/base/common/lifecycle'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; @@ -43,7 +42,7 @@ export class StorageKeysSyncRegistryService extends Disposable implements IStora _serviceBrand: any; private readonly _storageKeys = new Map(); - get storageKeys(): ReadonlyArray { return values(this._storageKeys); } + get storageKeys(): ReadonlyArray { return [...this._storageKeys.values()]; } private readonly _onDidChangeStorageKeys: Emitter> = this._register(new Emitter>()); readonly onDidChangeStorageKeys = this._onDidChangeStorageKeys.event; diff --git a/src/vs/workbench/common/views.ts b/src/vs/workbench/common/views.ts index 9c8e2795336..089de9fa378 100644 --- a/src/vs/workbench/common/views.ts +++ b/src/vs/workbench/common/views.ts @@ -11,7 +11,7 @@ import { localize } from 'vs/nls'; import { createDecorator } from 'vs/platform/instantiation/common/instantiation'; import { IDisposable, Disposable, toDisposable } from 'vs/base/common/lifecycle'; import { ThemeIcon } from 'vs/platform/theme/common/themeService'; -import { values, keys, getOrSet } from 'vs/base/common/map'; +import { getOrSet } from 'vs/base/common/map'; import { Registry } from 'vs/platform/registry/common/platform'; import { IKeybindings } from 'vs/platform/keybinding/common/keybindingsRegistry'; import { IAction, IActionViewItem } from 'vs/base/common/actions'; @@ -140,7 +140,7 @@ class ViewContainersRegistryImpl extends Disposable implements IViewContainersRe private readonly defaultViewContainers: ViewContainer[] = []; get all(): ViewContainer[] { - return flatten(values(this.viewContainers)); + return flatten([...this.viewContainers.values()]); } registerViewContainer(viewContainerDescriptor: IViewContainerDescriptor, viewContainerLocation: ViewContainerLocation, isDefault?: boolean): ViewContainer { @@ -160,7 +160,7 @@ class ViewContainersRegistryImpl extends Disposable implements IViewContainersRe } deregisterViewContainer(viewContainer: ViewContainer): void { - for (const viewContainerLocation of keys(this.viewContainers)) { + for (const viewContainerLocation of this.viewContainers.keys()) { const viewContainers = this.viewContainers.get(viewContainerLocation)!; const index = viewContainers?.indexOf(viewContainer); if (index !== -1) { @@ -183,7 +183,7 @@ class ViewContainersRegistryImpl extends Disposable implements IViewContainersRe } getViewContainerLocation(container: ViewContainer): ViewContainerLocation { - return keys(this.viewContainers).filter(location => this.getViewContainers(location).filter(viewContainer => viewContainer.id === container.id).length > 0)[0]; + return [...this.viewContainers.keys()].filter(location => this.getViewContainers(location).filter(viewContainer => viewContainer.id === container.id).length > 0)[0]; } getDefaultViewContainer(location: ViewContainerLocation): ViewContainer | undefined { @@ -365,7 +365,7 @@ class ViewsRegistry extends Disposable implements IViewsRegistry { } moveViews(viewsToMove: IViewDescriptor[], viewContainer: ViewContainer): void { - keys(this._views).forEach(container => { + for (const container of this._views.keys()) { if (container !== viewContainer) { const views = this.removeViews(viewsToMove, container); if (views.length) { @@ -373,7 +373,7 @@ class ViewsRegistry extends Disposable implements IViewsRegistry { this._onDidChangeContainer.fire({ views, from: container, to: viewContainer }); } } - }); + } } getViews(loc: ViewContainer): IViewDescriptor[] { diff --git a/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts b/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts index 9bb5657c0cc..b9cc0f9941e 100644 --- a/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts +++ b/src/vs/workbench/contrib/extensions/browser/configBasedRecommendations.ts @@ -15,7 +15,6 @@ import { IStorageService } from 'vs/platform/storage/common/storage'; import { IStorageKeysSyncRegistryService } from 'vs/platform/userDataSync/common/storageKeys'; import { IWorkspaceContextService, IWorkspaceFoldersChangeEvent } from 'vs/platform/workspace/common/workspace'; import { distinct } from 'vs/base/common/arrays'; -import { values } from 'vs/base/common/map'; export class ConfigBasedRecommendations extends ExtensionRecommendations { @@ -60,8 +59,8 @@ export class ConfigBasedRecommendations extends ExtensionRecommendations { } } } - this.importantTips = values(importantTips); - this.otherTips = values(otherTips).filter(tip => !importantTips.has(tip.extensionId)); + this.importantTips = [...importantTips.values()]; + this.otherTips = [...otherTips.values()].filter(tip => !importantTips.has(tip.extensionId)); this._recommendations = [...this.importantTips, ...this.otherTips].map(tip => this.toExtensionRecommendation(tip)); } diff --git a/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts b/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts index 206a53472e1..382344da69b 100644 --- a/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts +++ b/src/vs/workbench/contrib/extensions/browser/extensionsDependencyChecker.ts @@ -9,7 +9,6 @@ import { IExtensionService } from 'vs/workbench/services/extensions/common/exten import { CommandsRegistry } from 'vs/platform/commands/common/commands'; import { MenuRegistry, MenuId } from 'vs/platform/actions/common/actions'; import { localize } from 'vs/nls'; -import { values } from 'vs/base/common/map'; import { areSameExtensions } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; import { Action } from 'vs/base/common/actions'; @@ -55,7 +54,7 @@ export class ExtensionDependencyChecker extends Disposable implements IWorkbench }); } } - return values(missingDependencies); + return [...missingDependencies.values()]; } private async installMissingDependencies(): Promise { diff --git a/src/vs/workbench/services/preferences/common/preferencesModels.ts b/src/vs/workbench/services/preferences/common/preferencesModels.ts index c6315e072ec..79adc7018b4 100644 --- a/src/vs/workbench/services/preferences/common/preferencesModels.ts +++ b/src/vs/workbench/services/preferences/common/preferencesModels.ts @@ -171,7 +171,7 @@ export class SettingsEditorModel extends AbstractSettingsModel implements ISetti } protected update(): IFilterResult | undefined { - const resultGroups = map.values(this._currentResultGroups); + const resultGroups = [...this._currentResultGroups.values()]; if (!resultGroups.length) { return undefined; } diff --git a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts index 568e65afa34..fecc3af3434 100644 --- a/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts +++ b/src/vs/workbench/services/userDataSync/browser/userDataSyncWorkbenchService.ts @@ -11,7 +11,6 @@ import { AuthenticationSession, AuthenticationSessionsChangeEvent } from 'vs/edi import { Disposable, DisposableStore } from 'vs/base/common/lifecycle'; import { Emitter, Event } from 'vs/base/common/event'; import { flatten } from 'vs/base/common/arrays'; -import { values } from 'vs/base/common/map'; import { IAuthenticationService } from 'vs/workbench/services/authentication/browser/authenticationService'; import { IUserDataSyncAccountService } from 'vs/platform/userDataSync/common/userDataSyncAccount'; import { IQuickInputService, IQuickPickSeparator } from 'vs/platform/quickinput/common/quickInput'; @@ -69,7 +68,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat readonly onDidChangeAccountStatus = this._onDidChangeAccountStatus.event; private _all: Map = new Map(); - get all(): UserDataSyncAccount[] { return flatten(values(this._all)); } + get all(): UserDataSyncAccount[] { return flatten([...this._all.values()]); } get current(): UserDataSyncAccount | undefined { return this.all.filter(account => this.isCurrentAccount(account))[0]; } @@ -178,7 +177,7 @@ export class UserDataSyncWorkbenchService extends Disposable implements IUserDat accounts.set(currentAccount.accountName, currentAccount); } - return values(accounts); + return [...accounts.values()]; } private async updateToken(current: UserDataSyncAccount | undefined): Promise { diff --git a/src/vs/workbench/services/views/common/viewContainerModel.ts b/src/vs/workbench/services/views/common/viewContainerModel.ts index 4b50252805c..60c69da9c41 100644 --- a/src/vs/workbench/services/views/common/viewContainerModel.ts +++ b/src/vs/workbench/services/views/common/viewContainerModel.ts @@ -14,7 +14,6 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { URI } from 'vs/base/common/uri'; import { firstIndex, move } from 'vs/base/common/arrays'; import { isUndefined, isUndefinedOrNull } from 'vs/base/common/types'; -import { values } from 'vs/base/common/map'; import { isEqual } from 'vs/base/common/resources'; class CounterSet implements IReadableSet { @@ -229,7 +228,7 @@ class ViewDescriptorsState extends Disposable { } private setStoredGlobalState(storedGlobalState: Map): void { - this.globalViewsStatesValue = JSON.stringify(values(storedGlobalState)); + this.globalViewsStatesValue = JSON.stringify([...storedGlobalState.values()]); } private parseStoredGlobalState(value: string): { state: Map, hasDuplicates: boolean } {