提交 306be61f 编写于 作者: M Matt Bierner

Fix monaco editor check errors

上级 abe0c069
...@@ -157,7 +157,9 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry { ...@@ -157,7 +157,9 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
} }
getCommands(): ICommandsMap { 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 { appendMenuItem(id: MenuId, item: IMenuItem | ISubmenuItem): IDisposable {
...@@ -202,11 +204,11 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry { ...@@ -202,11 +204,11 @@ export const MenuRegistry: IMenuRegistry = new class implements IMenuRegistry {
set.add(alt.id); set.add(alt.id);
} }
} }
for (const [id, command] of this._commands) { this._commands.forEach((command, id) => {
if (!set.has(id)) { if (!set.has(id)) {
result.push({ command }); result.push({ command });
} }
} });
} }
}; };
......
...@@ -9,6 +9,7 @@ import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/com ...@@ -9,6 +9,7 @@ import { ServicesAccessor, createDecorator } from 'vs/platform/instantiation/com
import { Event, Emitter } from 'vs/base/common/event'; import { Event, Emitter } from 'vs/base/common/event';
import { LinkedList } from 'vs/base/common/linkedList'; import { LinkedList } from 'vs/base/common/linkedList';
import { IJSONSchema } from 'vs/base/common/jsonSchema'; import { IJSONSchema } from 'vs/base/common/jsonSchema';
import { keys } from 'vs/base/common/map';
export const ICommandService = createDecorator<ICommandService>('commandService'); export const ICommandService = createDecorator<ICommandService>('commandService');
...@@ -121,7 +122,7 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR ...@@ -121,7 +122,7 @@ export const CommandsRegistry: ICommandRegistry = new class implements ICommandR
getCommands(): ICommandsMap { getCommands(): ICommandsMap {
const result = new Map<string, ICommand>(); 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); const command = this.getCommand(key);
if (command) { if (command) {
result.set(key, command); result.set(key, command);
......
...@@ -8,6 +8,7 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions'; ...@@ -8,6 +8,7 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands'; import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey'; import { ContextKeyAndExpr, ContextKeyExpr, IContext } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem'; import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { keys } from 'vs/base/common/map';
export interface IResolveResult { export interface IResolveResult {
enterChord: boolean; enterChord: boolean;
...@@ -334,10 +335,10 @@ export class KeybindingResolver { ...@@ -334,10 +335,10 @@ export class KeybindingResolver {
} }
unboundCommands.push(id); unboundCommands.push(id);
}; };
for (const id of MenuRegistry.getCommands().keys()) { for (const id of keys(MenuRegistry.getCommands())) {
addCommand(id, true); addCommand(id, true);
} }
for (const id of CommandsRegistry.getCommands().keys()) { for (const id of keys(CommandsRegistry.getCommands())) {
addCommand(id, false); addCommand(id, false);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册