From 306be61f22cb974b78c950ed80851ef23af4edd6 Mon Sep 17 00:00:00 2001
From: Matt Bierner <matb@microsoft.com>
Date: Tue, 2 Jul 2019 17:33:51 -0700
Subject: [PATCH] Fix monaco editor check errors

---
 src/vs/platform/actions/common/actions.ts               | 8 +++++---
 src/vs/platform/commands/common/commands.ts             | 3 ++-
 src/vs/platform/keybinding/common/keybindingResolver.ts | 5 +++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/vs/platform/actions/common/actions.ts b/src/vs/platform/actions/common/actions.ts
index d4a1359982c..046c46b157f 100644
--- a/src/vs/platform/actions/common/actions.ts
+++ b/src/vs/platform/actions/common/actions.ts
@@ -157,7 +157,9 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 	}
 
 	getCommands(): ICommandsMap {
-		return new Map<string, ICommandAction>(this._commands.entries());
+		const map = new Map<string, ICommandAction>();
+		this._commands.forEach((value, key) => map.set(key, value));
+		return map;
 	}
 
 	appendMenuItem(id: MenuId, item: IMenuItem | ISubmenuItem): IDisposable {
@@ -202,11 +204,11 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
 				set.add(alt.id);
 			}
 		}
-		for (const [id, command] of this._commands) {
+		this._commands.forEach((command, id) => {
 			if (!set.has(id)) {
 				result.push({ command });
 			}
-		}
+		});
 	}
 };
 
diff --git a/src/vs/platform/commands/common/commands.ts b/src/vs/platform/commands/common/commands.ts
index 7605efb866d..4777d1ddef7 100644
--- a/src/vs/platform/commands/common/commands.ts
+++ b/src/vs/platform/commands/common/commands.ts
@@ -9,6 +9,7 @@ import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/com
 import { Event, Emitter } from 'vs/base/common/event';
 import { LinkedList } from 'vs/base/common/linkedList';
 import { IJSONSchema } from 'vs/base/common/jsonSchema';
+import { keys } from 'vs/base/common/map';
 
 export const ICommandService = createDecorator<ICommandService>('commandService');
 
@@ -121,7 +122,7 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
 
 	getCommands(): ICommandsMap {
 		const result = new Map<string, ICommand>();
-		for (const key of this._commands.keys()) {
+		for (const key of keys(this._commands)) {
 			const command = this.getCommand(key);
 			if (command) {
 				result.set(key, command);
diff --git a/src/vs/platform/keybinding/common/keybindingResolver.ts b/src/vs/platform/keybinding/common/keybindingResolver.ts
index 2b36653666d..1436cfa6604 100644
--- a/src/vs/platform/keybinding/common/keybindingResolver.ts
+++ b/src/vs/platform/keybinding/common/keybindingResolver.ts
@@ -8,6 +8,7 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
 import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
 import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
 import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
+import { keys } from 'vs/base/common/map';
 
 export interface IResolveResult {
 	enterChord: boolean;
@@ -334,10 +335,10 @@ export class KeybindingResolver {
 			}
 			unboundCommands.push(id);
 		};
-		for (const id of MenuRegistry.getCommands().keys()) {
+		for (const id of keys(MenuRegistry.getCommands())) {
 			addCommand(id, true);
 		}
-		for (const id of CommandsRegistry.getCommands().keys()) {
+		for (const id of keys(CommandsRegistry.getCommands())) {
 			addCommand(id, false);
 		}
 
-- 
GitLab