ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 10:58:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge from vscode 1b314ab317fbff7d799b21754326b7d849889ceb

Browse Source
This commit is contained in:
ADS Merger
2020-07-15 23:51:18 +00:00
parent aae013d498
commit 9d3f12d0b7
554 changed files with 15159 additions and 8223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/platform/keybinding/common/keybindingResolver.ts
View File

@@ -8,7 +8,6 @@ import { MenuRegistry } from 'vs/platform/actions/common/actions';
import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
import { IContext, ContextKeyExpression, ContextKeyExprType } from 'vs/platform/contextkey/common/contextkey';
import { ResolvedKeybindingItem } from 'vs/platform/keybinding/common/resolvedKeybindingItem';
import { keys } from 'vs/base/common/map';
export interface IResolveResult {
/** Whether the resolved keybinding is entering a chord */
@@ -353,10 +352,10 @@ export class KeybindingResolver {
}
unboundCommands.push(id);
};
for (const id of keys(MenuRegistry.getCommands())) {
for (const id of MenuRegistry.getCommands().keys()) {
addCommand(id, true);
}
for (const id of keys(CommandsRegistry.getCommands())) {
for (const id of CommandsRegistry.getCommands().keys()) {
addCommand(id, false);
}

2
src/vs/platform/keybinding/common/keybindingsRegistry.ts
View File

@@ -39,7 +39,7 @@ export interface IKeybindingRule extends IKeybindings {
id: string;
weight: number;
args?: any;
when: ContextKeyExpression | null | undefined;
when?: ContextKeyExpression | null | undefined;
}
export interface IKeybindingRule2 {