diff --git a/src/vs/workbench/contrib/codeActions/common/codeActionsContribution.ts b/src/vs/workbench/contrib/codeActions/common/codeActionsContribution.ts index 886e17a9323..9b017fc85e9 100644 --- a/src/vs/workbench/contrib/codeActions/common/codeActionsContribution.ts +++ b/src/vs/workbench/contrib/codeActions/common/codeActionsContribution.ts @@ -7,7 +7,6 @@ import { flatten } from 'vs/base/common/arrays'; import { Emitter } from 'vs/base/common/event'; import { IJSONSchema, IJSONSchemaMap } from 'vs/base/common/jsonSchema'; import { Disposable } from 'vs/base/common/lifecycle'; -import { values } from 'vs/base/common/map'; import { codeActionCommandId, refactorCommandId, sourceActionCommandId } from 'vs/editor/contrib/codeAction/codeAction'; import { CodeActionKind } from 'vs/editor/contrib/codeAction/types'; import * as nls from 'vs/nls'; @@ -137,7 +136,7 @@ export class CodeActionsContribution extends Disposable implements IWorkbenchCon out.set(action.kind, action); } } - return values(out); + return Array.from(out.values()); }; return [ diff --git a/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts b/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts index cfdff2eee71..9a84a5f8fed 100644 --- a/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts +++ b/src/vs/workbench/contrib/webview/browser/webviewWorkbenchService.ts @@ -7,7 +7,6 @@ import { equals } from 'vs/base/common/arrays'; import { memoize } from 'vs/base/common/decorators'; import { Lazy } from 'vs/base/common/lazy'; import { IDisposable, toDisposable } from 'vs/base/common/lifecycle'; -import { values } from 'vs/base/common/map'; import { isEqual } from 'vs/base/common/resources'; import { EditorActivation, IEditorModel } from 'vs/platform/editor/common/editor'; import { registerSingleton } from 'vs/platform/instantiation/common/extensions'; @@ -231,7 +230,7 @@ export class WebviewEditorService implements IWebviewWorkbenchService { public shouldPersist( webview: WebviewInput ): boolean { - if (values(this._revivers).some(reviver => canRevive(reviver, webview))) { + if (Array.from(this._revivers.values()).some(reviver => canRevive(reviver, webview))) { return true; } @@ -243,7 +242,7 @@ export class WebviewEditorService implements IWebviewWorkbenchService { private async tryRevive( webview: WebviewInput ): Promise { - for (const reviver of values(this._revivers)) { + for (const reviver of this._revivers.values()) { if (canRevive(reviver, webview)) { await reviver.resolveWebview(webview); return true;