From 1a7ca5a77bf6b63951e499ea93b7316d36118ade Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Thu, 4 Aug 2016 23:58:51 +0200 Subject: [PATCH] More cleanup around KbCtxKey --- src/vs/editor/browser/view/viewImpl.ts | 4 +- src/vs/editor/common/commonCodeEditor.ts | 14 ++- src/vs/editor/common/config/config.ts | 22 ++-- src/vs/editor/common/editorCommon.ts | 115 ++++++++---------- .../accessibility/browser/accessibility.ts | 6 +- .../contrib/clipboard/browser/clipboard.ts | 12 +- .../editor/contrib/comment/common/comment.ts | 10 +- .../contextmenu/browser/contextmenu.ts | 4 +- .../browser/defineKeybinding.ts | 4 +- .../contrib/find/common/findController.ts | 24 ++-- .../editor/contrib/folding/browser/folding.ts | 4 +- .../contrib/format/common/formatActions.ts | 4 +- .../browser/goToDeclaration.ts | 8 +- .../contrib/gotoError/browser/gotoError.ts | 8 +- src/vs/editor/contrib/hover/browser/hover.ts | 4 +- .../inPlaceReplace/common/inPlaceReplace.ts | 6 +- .../linesOperations/common/linesOperations.ts | 26 ++-- .../contrib/multicursor/common/multicursor.ts | 8 +- .../parameterHints/browser/parameterHints.ts | 8 +- .../contrib/quickFix/browser/quickFix.ts | 6 +- .../contrib/quickOpen/browser/gotoLine.ts | 4 +- .../contrib/quickOpen/browser/quickCommand.ts | 6 +- .../contrib/quickOpen/browser/quickOutline.ts | 4 +- .../browser/referenceSearch.ts | 4 +- .../editor/contrib/rename/browser/rename.ts | 8 +- .../smartSelect/common/jumpToBracket.ts | 4 +- .../contrib/smartSelect/common/smartSelect.ts | 6 +- .../editor/contrib/snippet/common/snippet.ts | 4 +- .../editor/contrib/suggest/browser/suggest.ts | 10 +- .../contrib/suggest/browser/tabCompletion.ts | 6 +- .../toggleWordWrap/common/toggleWordWrap.ts | 4 +- .../browser/parts/editor/editorCommands.ts | 4 +- .../parts/debug/browser/breakpointWidget.ts | 4 +- .../parts/debug/browser/debugActions.ts | 8 +- .../emmet/node/actions/expandAbbreviation.ts | 10 +- .../output/browser/output.contribution.ts | 4 +- 36 files changed, 189 insertions(+), 198 deletions(-) diff --git a/src/vs/editor/browser/view/viewImpl.ts b/src/vs/editor/browser/view/viewImpl.ts index af88f267e24..b24e046701f 100644 --- a/src/vs/editor/browser/view/viewImpl.ts +++ b/src/vs/editor/browser/view/viewImpl.ts @@ -47,6 +47,8 @@ import {ViewLinesViewportData} from 'vs/editor/common/viewLayout/viewLinesViewpo import {IRenderingContext} from 'vs/editor/common/view/renderingContext'; import {IPointerHandlerHelper} from 'vs/editor/browser/controller/mouseHandler'; +import EditorContextKeys = editorCommon.EditorContextKeys; + export class View extends ViewEventHandler implements editorBrowser.IView, IDisposable { private eventDispatcher:ViewEventDispatcher; @@ -174,7 +176,7 @@ export class View extends ViewEventHandler implements editorBrowser.IView, IDisp // Text Area (The focus will always be in the textarea when the cursor is blinking) this.textArea = document.createElement('textarea'); this._keybindingService = keybindingService.createScoped(this.textArea); - this._editorTextFocusContextKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS.bindTo(this._keybindingService); + this._editorTextFocusContextKey = EditorContextKeys.TextFocus.bindTo(this._keybindingService); this.textArea.className = editorBrowser.ClassNames.TEXTAREA; this.textArea.setAttribute('wrap', 'off'); this.textArea.setAttribute('autocorrect', 'off'); diff --git a/src/vs/editor/common/commonCodeEditor.ts b/src/vs/editor/common/commonCodeEditor.ts index e0dcd813e99..f998d2a1278 100644 --- a/src/vs/editor/common/commonCodeEditor.ts +++ b/src/vs/editor/common/commonCodeEditor.ts @@ -32,6 +32,8 @@ import {ViewModel} from 'vs/editor/common/viewModel/viewModelImpl'; import {hash} from 'vs/base/common/hash'; import {EditorModeContext} from 'vs/editor/common/modes/editorModeContext'; +import EditorContextKeys = editorCommon.EditorContextKeys; + var EDITOR_ID = 0; export abstract class CommonCodeEditor extends EventEmitter implements editorCommon.ICommonCodeEditor { @@ -145,12 +147,12 @@ export abstract class CommonCodeEditor extends EventEmitter implements editorCom this._commandService = commandService; this._keybindingService = keybindingService; this._editorIdContextKey = this._keybindingService.createKey('editorId', this.getId()); - this._editorFocusContextKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_FOCUS.bindTo(this._keybindingService); - this._editorTabMovesFocusKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_TAB_MOVES_FOCUS.bindTo(this._keybindingService); - this._editorReadonly = editorCommon.KEYBINDING_CONTEXT_EDITOR_READONLY.bindTo(this._keybindingService); - this._hasMultipleSelectionsKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_HAS_MULTIPLE_SELECTIONS.bindTo(this._keybindingService); - this._hasNonEmptySelectionKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_HAS_NON_EMPTY_SELECTION.bindTo(this._keybindingService); - this._langIdKey = editorCommon.KEYBINDING_CONTEXT_EDITOR_LANGUAGE_ID.bindTo(this._keybindingService); + this._editorFocusContextKey = EditorContextKeys.Focus.bindTo(this._keybindingService); + this._editorTabMovesFocusKey = EditorContextKeys.TabMovesFocus.bindTo(this._keybindingService); + this._editorReadonly = EditorContextKeys.ReadOnly.bindTo(this._keybindingService); + this._hasMultipleSelectionsKey = EditorContextKeys.HasMultipleSelections.bindTo(this._keybindingService); + this._hasNonEmptySelectionKey = EditorContextKeys.HasNonEmptySelection.bindTo(this._keybindingService); + this._langIdKey = EditorContextKeys.LanguageId.bindTo(this._keybindingService); this._lifetimeDispose.push(new EditorModeContext(this, this._keybindingService)); this._decorationTypeKeysToIds = {}; diff --git a/src/vs/editor/common/config/config.ts b/src/vs/editor/common/config/config.ts index ee53b876b4f..94ac2f36279 100644 --- a/src/vs/editor/common/config/config.ts +++ b/src/vs/editor/common/config/config.ts @@ -16,7 +16,7 @@ import {CommandsRegistry, ICommandHandler, ICommandHandlerDescription} from 'vs/ import H = editorCommon.Handler; import D = editorCommon.CommandDescription; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; export interface IKeybindingsOptions { kbExpr?: KbExpr; @@ -172,7 +172,7 @@ function registerCoreCommand(handlerId: string, kb: IKeybindings, weight?: numbe let command = new CoreCommand( handlerId, weight, - when ? when : EditorKbExpr.TextFocus, + when ? when : EditorContextKeys.TextFocus, kb ); KeybindingsRegistry.registerCommandAndKeybindingRule(command.toCommandAndKeybindingRule(KeybindingsRegistry.WEIGHT.editorCore())); @@ -378,14 +378,14 @@ registerCoreCommand(H.CursorColumnSelectPageDown, { registerCoreCommand(H.Tab, { primary: KeyCode.Tab }, KeybindingsRegistry.WEIGHT.editorCore(), KbExpr.and( - EditorKbExpr.TextFocus, - EditorKbExpr.TabDoesNotMoveFocus + EditorContextKeys.TextFocus, + EditorContextKeys.TabDoesNotMoveFocus )); registerCoreCommand(H.Outdent, { primary: KeyMod.Shift | KeyCode.Tab }, KeybindingsRegistry.WEIGHT.editorCore(), KbExpr.and( - EditorKbExpr.TextFocus, - EditorKbExpr.TabDoesNotMoveFocus + EditorContextKeys.TextFocus, + EditorContextKeys.TabDoesNotMoveFocus )); registerCoreCommand(H.DeleteLeft, { @@ -440,15 +440,15 @@ registerCoreCommand(H.CancelSelection, { primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape] }, KeybindingsRegistry.WEIGHT.editorCore(), KbExpr.and( - EditorKbExpr.TextFocus, - EditorKbExpr.HasNonEmptySelection + EditorContextKeys.TextFocus, + EditorContextKeys.HasNonEmptySelection )); registerCoreCommand(H.RemoveSecondaryCursors, { primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape] }, KeybindingsRegistry.WEIGHT.editorCore(1), KbExpr.and( - EditorKbExpr.TextFocus, - EditorKbExpr.HasMultipleSelections + EditorContextKeys.TextFocus, + EditorContextKeys.HasMultipleSelections )); registerCoreCommand(H.CursorTop, { @@ -515,6 +515,6 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({ id: 'editor.action.selectAll', handler: selectAll, weight: KeybindingsRegistry.WEIGHT.editorCore(), - when: EditorKbExpr.TextFocus, + when: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.KEY_A }); diff --git a/src/vs/editor/common/editorCommon.ts b/src/vs/editor/common/editorCommon.ts index b4eee81fa3b..41d9f34567d 100644 --- a/src/vs/editor/common/editorCommon.ts +++ b/src/vs/editor/common/editorCommon.ts @@ -3018,79 +3018,66 @@ export interface IDiffLineInformation { } /** - * A context key that is set when the editor's text has focus (cursor is blinking). * @internal */ -export const KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS = new KbCtxKey('editorTextFocus', undefined); +export namespace EditorContextKeys { + /** + * A context key that is set when the editor's text has focus (cursor is blinking). + * @internal + */ + export const TextFocus = new KbCtxKey('editorTextFocus', undefined); + /** + * A context key that is set when the editor's text or an editor's widget has focus. + * @internal + */ + export const Focus = new KbCtxKey('editorFocus', undefined); -/** - * A context key that is set when the editor's text or an editor's widget has focus. - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_FOCUS = new KbCtxKey('editorFocus', undefined); -/** - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_TAB_MOVES_FOCUS = new KbCtxKey('editorTabMovesFocus', false); -/** - * A context key that is set when the editor's text is readonly. - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_READONLY = new KbCtxKey('editorReadonly', false); -/** - * A context key that is set when the editor has multiple selections (multiple cursors). - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_HAS_MULTIPLE_SELECTIONS = new KbCtxKey('editorHasMultipleSelections', false); -/** - * A context key that is set when the editor has a non-collapsed selection. - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_HAS_NON_EMPTY_SELECTION = new KbCtxKey('editorHasSelection', false); -/** - * A context key that is set to the language associated with the model associated with the editor. - * @internal - */ -export const KEYBINDING_CONTEXT_EDITOR_LANGUAGE_ID = new KbCtxKey('editorLangId', undefined); + /** + * A context key that is set when the editor's text is readonly. + * @internal + */ + export const ReadOnly = new KbCtxKey('editorReadonly', false); -/** - * @internal - */ -export interface IEditorKbExpr { - TextFocus: KbExpr; - Focus: KbExpr; + /** + * @internal + */ + export const Writable:KbExpr = ReadOnly.toNegated(); - ReadOnly: KbExpr; - Writable: KbExpr; + /** + * A context key that is set when the editor has a non-collapsed selection. + * @internal + */ + export const HasNonEmptySelection = new KbCtxKey('editorHasSelection', false); + /** + * @internal + */ + export const HasOnlyEmptySelection:KbExpr = HasNonEmptySelection.toNegated(); - HasNonEmptySelection: KbExpr; - HasOnlyEmptySelection: KbExpr; + /** + * A context key that is set when the editor has multiple selections (multiple cursors). + * @internal + */ + export const HasMultipleSelections = new KbCtxKey('editorHasMultipleSelections', false); + /** + * @internal + */ + export const HasSingleSelection:KbExpr = HasMultipleSelections.toNegated(); - HasMultipleSelections: KbExpr; - HasSingleSelection: KbExpr; + /** + * @internal + */ + export const TabMovesFocus = new KbCtxKey('editorTabMovesFocus', false); + /** + * @internal + */ + export const TabDoesNotMoveFocus:KbExpr = TabMovesFocus.toNegated(); - TabMovesFocus: KbExpr; - TabDoesNotMoveFocus: KbExpr; -} + /** + * A context key that is set to the language associated with the model associated with the editor. + * @internal + */ + export const LanguageId = new KbCtxKey('editorLangId', undefined); -/** - * @internal - */ -export let EditorKbExpr: IEditorKbExpr = { - TextFocus: KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS, - Focus: KEYBINDING_CONTEXT_EDITOR_FOCUS, - - ReadOnly: KEYBINDING_CONTEXT_EDITOR_READONLY, - Writable: KEYBINDING_CONTEXT_EDITOR_READONLY.toNegated(), - - HasNonEmptySelection: KEYBINDING_CONTEXT_EDITOR_HAS_NON_EMPTY_SELECTION, - HasOnlyEmptySelection: KEYBINDING_CONTEXT_EDITOR_HAS_NON_EMPTY_SELECTION.toNegated(), - - HasMultipleSelections: KEYBINDING_CONTEXT_EDITOR_HAS_MULTIPLE_SELECTIONS, - HasSingleSelection: KEYBINDING_CONTEXT_EDITOR_HAS_MULTIPLE_SELECTIONS.toNegated(), - - TabMovesFocus: KEYBINDING_CONTEXT_EDITOR_TAB_MOVES_FOCUS, - TabDoesNotMoveFocus: KEYBINDING_CONTEXT_EDITOR_TAB_MOVES_FOCUS.toNegated(), }; diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts index f49138c2292..426b488acb9 100644 --- a/src/vs/editor/contrib/accessibility/browser/accessibility.ts +++ b/src/vs/editor/contrib/accessibility/browser/accessibility.ts @@ -18,7 +18,7 @@ import {ServicesAccessor} from 'vs/platform/instantiation/common/instantiation'; import {KbExpr, KbCtxKey, IKeybindingContextKey, IKeybindingService} from 'vs/platform/keybinding/common/keybinding'; import {KeybindingsRegistry} from 'vs/platform/keybinding/common/keybindingsRegistry'; import {GlobalScreenReaderNVDA} from 'vs/editor/common/config/commonEditorConfig'; -import {ICommonCodeEditor, IEditorContribution, EditorKbExpr} from 'vs/editor/common/editorCommon'; +import {ICommonCodeEditor, IEditorContribution, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry, EditorAction, EditorCommand, Command} from 'vs/editor/common/editorCommonExtensions'; import {ICodeEditor, IOverlayWidget, IOverlayWidgetPosition} from 'vs/editor/browser/editorBrowser'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; @@ -200,7 +200,7 @@ class ShowAccessibilityHelpAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: KeyMod.Alt | KeyCode.F1 }; } @@ -218,7 +218,7 @@ const AccessibilityHelpCommand = EditorCommand.bindToContribution( CommonFindController.getFindController, { weight: CommonEditorRegistry.commandWeight(5), - kbExpr: EditorKbExpr.Focus + kbExpr: EditorContextKeys.Focus } ); const VisibleWidgetFindCommand = EditorCommand.bindToContribution( CommonFindController.getFindController, { weight: CommonEditorRegistry.commandWeight(5), - kbExpr: KbExpr.and(EditorKbExpr.Focus, CONTEXT_FIND_WIDGET_VISIBLE) + kbExpr: KbExpr.and(EditorContextKeys.Focus, CONTEXT_FIND_WIDGET_VISIBLE) } ); diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index cbf1220ca52..ca0982ecdbd 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -20,7 +20,7 @@ import {IFoldingRange} from 'vs/editor/contrib/folding/common/foldingRange'; import {computeRanges, limitByIndent} from 'vs/editor/contrib/folding/common/indentFoldStrategy'; import {Selection} from 'vs/editor/common/core/selection'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; class CollapsibleRegion { @@ -654,7 +654,7 @@ abstract class FoldingAction2 extends EditorAction { super(id, label, alias, false); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: keybinding }; } diff --git a/src/vs/editor/contrib/format/common/formatActions.ts b/src/vs/editor/contrib/format/common/formatActions.ts index 0c03f552463..84611bcb554 100644 --- a/src/vs/editor/contrib/format/common/formatActions.ts +++ b/src/vs/editor/contrib/format/common/formatActions.ts @@ -18,7 +18,7 @@ import {EditOperationsCommand} from './formatCommand'; import {Selection} from 'vs/editor/common/core/selection'; import ModeContextKeys = editorCommon.ModeContextKeys; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; class FormatOnType implements editorCommon.IEditorContribution { @@ -146,7 +146,7 @@ export class FormatAction extends EditorAction { ); this.kbOpts = { - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, EditorKbExpr.Writable), + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_F, linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_I } }; diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index 67cff03b1c0..c94cae4e59d 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -33,7 +33,7 @@ import {IPeekViewService} from 'vs/editor/contrib/zoneWidget/browser/peekViewWid import {optional} from 'vs/platform/instantiation/common/instantiation'; import ModeContextKeys = editorCommon.ModeContextKeys; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; export class DefinitionActionConfig { @@ -173,7 +173,7 @@ export class GoToDefinitionAction extends DefinitionAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: goToDeclarationKb }; @@ -198,7 +198,7 @@ export class OpenDefinitionToSideAction extends DefinitionAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.chord(KeyMod.CtrlCmd | KeyCode.KEY_K, goToDeclarationKb) }; } @@ -215,7 +215,7 @@ export class PeekDefinitionAction extends DefinitionAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Alt | KeyCode.F12, linux: { primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.F10 } }; diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts index 6f6a03f006a..4fce04b8e18 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts @@ -29,7 +29,7 @@ import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; import {ZoneWidget} from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; import {getCodeActions, IQuickFix2} from 'vs/editor/contrib/quickFix/common/quickFix'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; class MarkerModel { @@ -522,7 +522,7 @@ class NextMarkerAction extends MarkerNavigationAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: KeyCode.F8 }; } @@ -538,7 +538,7 @@ class PrevMarkerAction extends MarkerNavigationAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: KeyMod.Shift | KeyCode.F8 }; } @@ -549,7 +549,7 @@ var CONTEXT_MARKERS_NAVIGATION_VISIBLE = new KbCtxKey('markersNavigatio const MarkerCommand = EditorCommand.bindToContribution( MarkerController.getMarkerController, { weight: CommonEditorRegistry.commandWeight(50), - kbExpr: KbExpr.and(EditorKbExpr.Focus, CONTEXT_MARKERS_NAVIGATION_VISIBLE) + kbExpr: KbExpr.and(EditorContextKeys.Focus, CONTEXT_MARKERS_NAVIGATION_VISIBLE) } ); diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts index a4805c15a43..98778c71942 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/browser/hover.ts @@ -21,7 +21,7 @@ import {ModesContentHoverWidget} from './modesContentHover'; import {ModesGlyphHoverWidget} from './modesGlyphHover'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; class ModesHoverController implements editorCommon.IEditorContribution { @@ -154,7 +154,7 @@ class ShowHoverAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.chord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I) }; } diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts index 4dadd421d3f..7d41a99eda2 100644 --- a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts +++ b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; import {Range} from 'vs/editor/common/core/range'; -import {EditorKbExpr, IEditorContribution, CodeEditorStateFlag, ICommonCodeEditor, IModelDecorationsChangeAccessor} from 'vs/editor/common/editorCommon'; +import {EditorContextKeys, IEditorContribution, CodeEditorStateFlag, ICommonCodeEditor, IModelDecorationsChangeAccessor} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {IInplaceReplaceSupportResult} from 'vs/editor/common/modes'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; @@ -136,7 +136,7 @@ class InPlaceReplaceUp extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_COMMA }; } @@ -157,7 +157,7 @@ class InPlaceReplaceDown extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_DOT }; } diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts index 6e7900c63c4..959e6b6d510 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {SortLinesCommand} from 'vs/editor/contrib/linesOperations/common/sortLinesCommand'; import {TrimTrailingWhitespaceCommand} from 'vs/editor/common/commands/trimTrailingWhitespaceCommand'; -import {EditorKbExpr, Handler, ICommand, ICommonCodeEditor} from 'vs/editor/common/editorCommon'; +import {EditorContextKeys, Handler, ICommand, ICommonCodeEditor} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, HandlerEditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {CopyLinesCommand} from './copyLinesCommand'; import {DeleteLinesCommand} from './deleteLinesCommand'; @@ -48,7 +48,7 @@ class CopyLinesUpAction extends AbstractCopyLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow, linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.UpArrow } }; @@ -65,7 +65,7 @@ class CopyLinesDownAction extends AbstractCopyLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow, linux: { primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyMod.Shift | KeyCode.DownArrow } }; @@ -106,7 +106,7 @@ class MoveLinesUpAction extends AbstractMoveLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Alt | KeyCode.UpArrow, linux: { primary: KeyMod.Alt | KeyCode.UpArrow } }; @@ -123,7 +123,7 @@ class MoveLinesDownAction extends AbstractMoveLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Alt | KeyCode.DownArrow, linux: { primary: KeyMod.Alt | KeyCode.DownArrow } }; @@ -160,7 +160,7 @@ class SortLinesAscendingAction extends AbstractSortLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_2 }; } @@ -176,7 +176,7 @@ class SortLinesDescendingAction extends AbstractSortLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_3 }; } @@ -195,7 +195,7 @@ export class TrimTrailingWhitespaceAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.chord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_X) }; } @@ -274,7 +274,7 @@ class DeleteLinesAction extends AbstractRemoveLinesAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_K }; } @@ -303,7 +303,7 @@ class IndentLinesAction extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.US_CLOSE_SQUARE_BRACKET }; } @@ -320,7 +320,7 @@ class OutdentLinesAction extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.US_OPEN_SQUARE_BRACKET }; } @@ -337,7 +337,7 @@ class InsertLineBeforeAction extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter }; } @@ -354,7 +354,7 @@ class InsertLineAfterAction extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.Enter }; } diff --git a/src/vs/editor/contrib/multicursor/common/multicursor.ts b/src/vs/editor/contrib/multicursor/common/multicursor.ts index 9914182262e..2680c8fc14c 100644 --- a/src/vs/editor/contrib/multicursor/common/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/common/multicursor.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; -import {Handler, ICommonCodeEditor, EditorKbExpr, ISelection} from 'vs/editor/common/editorCommon'; +import {Handler, ICommonCodeEditor, EditorContextKeys, ISelection} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, HandlerEditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; class InsertCursorAbove extends HandlerEditorAction { @@ -20,7 +20,7 @@ class InsertCursorAbove extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow, linux: { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.UpArrow, @@ -41,7 +41,7 @@ class InsertCursorBelow extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow, linux: { primary: KeyMod.Shift | KeyMod.Alt | KeyCode.DownArrow, @@ -62,7 +62,7 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.KEY_I }; } diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts index 0988cd1450d..841b1cdcdcb 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts @@ -8,7 +8,7 @@ import * as nls from 'vs/nls'; import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { dispose } from 'vs/base/common/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; -import { ICommonCodeEditor, IEditorContribution, EditorKbExpr } from 'vs/editor/common/editorCommon'; +import { ICommonCodeEditor, IEditorContribution, EditorContextKeys } from 'vs/editor/common/editorCommon'; import { KbExpr } from 'vs/platform/keybinding/common/keybinding'; import { ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -69,7 +69,7 @@ export class TriggerParameterHintsAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Space }; } @@ -91,13 +91,13 @@ const weight = CommonEditorRegistry.commandWeight(75); const ParameterHintsCommand = EditorCommand.bindToContribution( ParameterHintsController.get, { weight: weight, - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, Context.Visible) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, Context.Visible) } ); const MultipleSignaturesParameterHintsCommand = EditorCommand.bindToContribution( ParameterHintsController.get, { weight: weight, - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, Context.Visible, Context.MultipleSignatures) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, Context.Visible, Context.MultipleSignatures) } ); diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts index 48839d53787..69d1d0fbba3 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFix.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFix.ts @@ -13,7 +13,7 @@ import {KbExpr, KbCtxKey, IKeybindingContextKey, IKeybindingService} from 'vs/pl import {IMarkerService} from 'vs/platform/markers/common/markers'; import {IMessageService} from 'vs/platform/message/common/message'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {ICommonCodeEditor, EditorKbExpr, IEditorContribution, IRange} from 'vs/editor/common/editorCommon'; +import {ICommonCodeEditor, EditorContextKeys, IEditorContribution, IRange} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {ICodeEditor} from 'vs/editor/browser/editorBrowser'; import {CodeActionProviderRegistry} from 'vs/editor/common/modes'; @@ -126,7 +126,7 @@ export class QuickFixAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.US_DOT }; } @@ -148,7 +148,7 @@ var CONTEXT_QUICK_FIX_WIDGET_VISIBLE = new KbCtxKey('quickFixWidgetVisi const QuickFixCommand = EditorCommand.bindToContribution( QuickFixController.getQuickFixController, { weight: CommonEditorRegistry.commandWeight(80), - kbExpr: KbExpr.and(EditorKbExpr.Focus, CONTEXT_QUICK_FIX_WIDGET_VISIBLE) + kbExpr: KbExpr.and(EditorContextKeys.Focus, CONTEXT_QUICK_FIX_WIDGET_VISIBLE) } ); diff --git a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts index 456816fa097..b26d9662993 100644 --- a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts +++ b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts @@ -15,7 +15,7 @@ import {BaseEditorQuickOpenAction, IDecorator} from './editorQuickOpen'; import {ServicesAccessor} from 'vs/editor/common/editorCommonExtensions'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; interface ParseResult { position: editorCommon.IPosition; @@ -160,7 +160,7 @@ export class GotoLineAction extends BaseEditorQuickOpenAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: KeyMod.CtrlCmd | KeyCode.KEY_G, mac: { primary: KeyMod.WinCtrl | KeyCode.KEY_G } }; diff --git a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts index f4bef454bb5..feee7aa8b63 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts @@ -11,7 +11,7 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding'; -import {IEditorAction, ICommonCodeEditor, IEditor, EditorKbExpr} from 'vs/editor/common/editorCommon'; +import {IEditorAction, ICommonCodeEditor, IEditor, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {BaseEditorQuickOpenAction} from './editorQuickOpen'; import {ServicesAccessor} from 'vs/editor/common/editorCommonExtensions'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; @@ -80,12 +80,12 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: (browser.isIE11orEarlier ? KeyMod.Alt | KeyCode.F1 : KeyCode.F1) }; this.menuOpts = { - kbExpr: EditorKbExpr.Focus + kbExpr: EditorContextKeys.Focus }; } diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts index 924c9922cdc..81d96df38fc 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts @@ -13,7 +13,7 @@ import * as strings from 'vs/base/common/strings'; import {TPromise} from 'vs/base/common/winjs.base'; import {IContext, IHighlight, QuickOpenEntryGroup, QuickOpenModel} from 'vs/base/parts/quickopen/browser/quickOpenModel'; import {IAutoFocus, Mode} from 'vs/base/parts/quickopen/common/quickOpen'; -import {ICommonCodeEditor, IRange, ModeContextKeys, EditorKbExpr} from 'vs/editor/common/editorCommon'; +import {ICommonCodeEditor, IRange, ModeContextKeys, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {SymbolInformation, SymbolKind, DocumentSymbolProviderRegistry} from 'vs/editor/common/modes'; import {BaseEditorQuickOpenAction, IDecorator} from './editorQuickOpen'; import {getDocumentSymbols, IOutline} from 'vs/editor/contrib/quickOpen/common/quickOpen'; @@ -118,7 +118,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.Focus, + kbExpr: EditorContextKeys.Focus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.KEY_O }; diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts index 80b4d102dc2..17705095e87 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts @@ -25,7 +25,7 @@ import {ReferencesController, RequestOptions, ctxReferenceSearchVisible} from '. import {ReferencesModel} from './referencesModel'; import ModeContextKeys = editorCommon.ModeContextKeys; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; const defaultReferenceSearchOptions: RequestOptions = { getMetaTitle(model) { @@ -66,7 +66,7 @@ export class ReferenceAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Shift | KeyCode.F12 }; diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts index 74d3ee870f9..7b39be6f4a9 100644 --- a/src/vs/editor/contrib/rename/browser/rename.ts +++ b/src/vs/editor/contrib/rename/browser/rename.ts @@ -17,7 +17,7 @@ import {IMessageService} from 'vs/platform/message/common/message'; import {IProgressService} from 'vs/platform/progress/common/progress'; import {ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; -import {IRange, ICommonCodeEditor, EditorKbExpr, ModeContextKeys, IEditorContribution} from 'vs/editor/common/editorCommon'; +import {IRange, ICommonCodeEditor, EditorContextKeys, ModeContextKeys, IEditorContribution} from 'vs/editor/common/editorCommon'; import {BulkEdit, createBulkEdit} from 'vs/editor/common/services/bulkEdit'; import {RenameProviderRegistry} from 'vs/editor/common/modes'; import {ICodeEditor} from 'vs/editor/browser/editorBrowser'; @@ -157,14 +157,14 @@ export class RenameAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyCode.F2 }; this.menuOpts = { group: '1_modification', order: 1.1, - kbExpr: KbExpr.and(ModeContextKeys.hasRenameProvider, EditorKbExpr.Writable) + kbExpr: KbExpr.and(ModeContextKeys.hasRenameProvider, EditorContextKeys.Writable) }; } @@ -192,7 +192,7 @@ EditorBrowserRegistry.registerEditorContribution(RenameController); const RenameCommand = EditorCommand.bindToContribution( RenameController.get, { weight: CommonEditorRegistry.commandWeight(99), - kbExpr: KbExpr.and(EditorKbExpr.Focus, CONTEXT_RENAME_INPUT_VISIBLE) + kbExpr: KbExpr.and(EditorContextKeys.Focus, CONTEXT_RENAME_INPUT_VISIBLE) } ); diff --git a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts index 72aa1afdd8a..e6fe7cd1e0f 100644 --- a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts +++ b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts @@ -6,7 +6,7 @@ import * as nls from 'vs/nls'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; -import {Handler, EditorKbExpr} from 'vs/editor/common/editorCommon'; +import {Handler, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {HandlerEditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; class SelectBracketAction extends HandlerEditorAction { @@ -23,7 +23,7 @@ class SelectBracketAction extends HandlerEditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.US_BACKSLASH }; } diff --git a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts index b64e972fc01..895e7ce340e 100644 --- a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts +++ b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts @@ -10,7 +10,7 @@ import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {TPromise} from 'vs/base/common/winjs.base'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; import {Range} from 'vs/editor/common/core/range'; -import {ICommonCodeEditor, ICursorPositionChangedEvent, EditorKbExpr, IEditorContribution} from 'vs/editor/common/editorCommon'; +import {ICommonCodeEditor, ICursorPositionChangedEvent, EditorContextKeys, IEditorContribution} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; import {TokenSelectionSupport, ILogicalSelectionEntry} from './tokenSelectionSupport'; @@ -166,7 +166,7 @@ class GrowSelectionAction extends AbstractSmartSelect { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.RightArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.RightArrow } }; @@ -183,7 +183,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.Shift | KeyMod.Alt | KeyCode.LeftArrow, mac: { primary: KeyMod.CtrlCmd | KeyMod.WinCtrl | KeyMod.Shift | KeyCode.LeftArrow } }; diff --git a/src/vs/editor/contrib/snippet/common/snippet.ts b/src/vs/editor/contrib/snippet/common/snippet.ts index 9b1d848b0ae..47db56bf29a 100644 --- a/src/vs/editor/contrib/snippet/common/snippet.ts +++ b/src/vs/editor/contrib/snippet/common/snippet.ts @@ -16,7 +16,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry, EditorCommand} from 'vs/editor/common/editorCommonExtensions'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; interface IParsedLinePlaceHolderInfo { id: string; @@ -940,7 +940,7 @@ export var CONTEXT_SNIPPET_MODE = new KbCtxKey('inSnippetMode', false); const SnippetCommand = EditorCommand.bindToContribution( getSnippetController, { weight: CommonEditorRegistry.commandWeight(30), - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, CONTEXT_SNIPPET_MODE) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, CONTEXT_SNIPPET_MODE) } ); diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts index 4d22a839ad9..687b6263675 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.ts +++ b/src/vs/editor/contrib/suggest/browser/suggest.ts @@ -9,7 +9,7 @@ import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { KbExpr } from 'vs/platform/keybinding/common/keybinding'; -import { ICommonCodeEditor, IEditorContribution, EditorKbExpr } from 'vs/editor/common/editorCommon'; +import { ICommonCodeEditor, IEditorContribution, EditorContextKeys } from 'vs/editor/common/editorCommon'; import { ServicesAccessor, EditorAction, EditorCommand, CommonEditorRegistry } from 'vs/editor/common/editorCommonExtensions'; import { ISuggestSupport, SuggestRegistry } from 'vs/editor/common/modes'; import { ICodeEditor } from 'vs/editor/browser/editorBrowser'; @@ -180,7 +180,7 @@ export class TriggerSuggestAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.CtrlCmd | KeyCode.Space, mac: { primary: KeyMod.WinCtrl | KeyCode.Space } }; @@ -205,19 +205,19 @@ const weight = CommonEditorRegistry.commandWeight(90); const SuggestCommand = EditorCommand.bindToContribution( SuggestController.getController, { weight: weight, - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, SuggestContext.Visible) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, SuggestContext.Visible) } ); const MultipleSuggestionsCommand = EditorCommand.bindToContribution( SuggestController.getController, { weight: weight, - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, SuggestContext.Visible, SuggestContext.MultipleSuggestions) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, SuggestContext.Visible, SuggestContext.MultipleSuggestions) } ); const AcceptSuggestionsOnEnterCommand = EditorCommand.bindToContribution( SuggestController.getController, { weight: weight, - kbExpr: KbExpr.and(EditorKbExpr.TextFocus, SuggestContext.Visible, KbExpr.has('config.editor.acceptSuggestionOnEnter')) + kbExpr: KbExpr.and(EditorContextKeys.TextFocus, SuggestContext.Visible, KbExpr.has('config.editor.acceptSuggestionOnEnter')) } ); diff --git a/src/vs/editor/contrib/suggest/browser/tabCompletion.ts b/src/vs/editor/contrib/suggest/browser/tabCompletion.ts index 062fceb06ca..79e26354527 100644 --- a/src/vs/editor/contrib/suggest/browser/tabCompletion.ts +++ b/src/vs/editor/contrib/suggest/browser/tabCompletion.ts @@ -15,7 +15,7 @@ import * as editorCommon from 'vs/editor/common/editorCommon'; import {CommonEditorRegistry, EditorCommand} from 'vs/editor/common/editorCommonExtensions'; import {CodeSnippet, ISnippetController, getSnippetController} from 'vs/editor/contrib/snippet/common/snippet'; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; let snippetsRegistry = Registry.as(Extensions.Snippets); @@ -80,8 +80,8 @@ const TabCompletionCommand = EditorCommand.bindToContribution _moveActiveEditor(args, accessor), description: { diff --git a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts index 5b7f1b213b2..9dd472dad08 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts @@ -13,7 +13,7 @@ import lifecycle = require('vs/base/common/lifecycle'); import dom = require('vs/base/browser/dom'); import {InputBox} from 'vs/base/browser/ui/inputbox/inputBox'; import {CommonEditorRegistry, ServicesAccessor, EditorCommand} from 'vs/editor/common/editorCommonExtensions'; -import {EditorKbExpr, ICommonCodeEditor} from 'vs/editor/common/editorCommon'; +import {EditorContextKeys, ICommonCodeEditor} from 'vs/editor/common/editorCommon'; import editorbrowser = require('vs/editor/browser/editorBrowser'); import {ZoneWidget} from 'vs/editor/contrib/zoneWidget/browser/zoneWidget'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; @@ -127,7 +127,7 @@ class CloseBreakpointWidgetCommand extends EditorCommand { this.kbOpts = { weight: CommonEditorRegistry.commandWeight(8), - kbExpr: KbExpr.and(EditorKbExpr.Focus, CONTEXT_BREAKPOINT_WIDGET_VISIBLE), + kbExpr: KbExpr.and(EditorContextKeys.Focus, CONTEXT_BREAKPOINT_WIDGET_VISIBLE), primary: KeyCode.Escape, secondary: [KeyMod.Shift | KeyCode.Escape] }; diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts index d23978b99c4..7dd5418e8e8 100644 --- a/src/vs/workbench/parts/debug/browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugActions.ts @@ -22,7 +22,7 @@ import {ServicesAccessor, EditorAction} from 'vs/editor/common/editorCommonExten import {KeyMod, KeyCode} from 'vs/base/common/keyCodes'; import IDebugService = debug.IDebugService; -import EditorKbExpr = editorCommon.EditorKbExpr; +import EditorContextKeys = editorCommon.EditorContextKeys; export class AbstractDebugAction extends actions.Action { @@ -528,7 +528,7 @@ export class ToggleBreakpointAction extends EditorAction { ); this.kbOpts = { - kbExpr: EditorKbExpr.TextFocus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyCode.F9 }; } @@ -673,7 +673,7 @@ export class SelectionToReplAction extends EditorAction { ); this.menuOpts = { - kbExpr: KbExpr.and(EditorKbExpr.HasNonEmptySelection, debug.CONTEXT_IN_DEBUG_MODE), + kbExpr: KbExpr.and(EditorContextKeys.HasNonEmptySelection, debug.CONTEXT_IN_DEBUG_MODE), group: 'debug' }; } @@ -711,7 +711,7 @@ export class ShowDebugHoverAction extends EditorAction { ); this.kbOpts = { - kbExpr: KbExpr.and(debug.CONTEXT_IN_DEBUG_MODE, EditorKbExpr.TextFocus), + kbExpr: KbExpr.and(debug.CONTEXT_IN_DEBUG_MODE, EditorContextKeys.TextFocus), primary: KeyMod.chord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_I) }; } diff --git a/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts b/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts index b2e85fe591b..a7421477017 100644 --- a/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts +++ b/src/vs/workbench/parts/emmet/node/actions/expandAbbreviation.ts @@ -9,7 +9,7 @@ import nls = require('vs/nls'); import {BasicEmmetEditorAction} from 'vs/workbench/parts/emmet/node/emmetActions'; import {CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; -import {Handler, ICommonCodeEditor, EditorKbExpr} from 'vs/editor/common/editorCommon'; +import {Handler, ICommonCodeEditor, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {KeyCode} from 'vs/base/common/keyCodes'; import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; @@ -27,10 +27,10 @@ class ExpandAbbreviationAction extends BasicEmmetEditorAction { this.kbOpts = { primary: KeyCode.Tab, kbExpr: KbExpr.and( - EditorKbExpr.TextFocus, - EditorKbExpr.HasOnlyEmptySelection, - EditorKbExpr.HasSingleSelection, - EditorKbExpr.TabDoesNotMoveFocus, + EditorContextKeys.TextFocus, + EditorContextKeys.HasOnlyEmptySelection, + EditorContextKeys.HasSingleSelection, + EditorContextKeys.TabDoesNotMoveFocus, KbExpr.has('config.emmet.triggerExpansionOnTab') ) }; diff --git a/src/vs/workbench/parts/output/browser/output.contribution.ts b/src/vs/workbench/parts/output/browser/output.contribution.ts index 831ccb238a7..595787aa69b 100644 --- a/src/vs/workbench/parts/output/browser/output.contribution.ts +++ b/src/vs/workbench/parts/output/browser/output.contribution.ts @@ -17,7 +17,7 @@ import {OutputService} from 'vs/workbench/parts/output/browser/outputServices'; import {ToggleOutputAction} from 'vs/workbench/parts/output/browser/outputActions'; import {OUTPUT_MIME, OUTPUT_MODE_ID, OUTPUT_PANEL_ID, IOutputService} from 'vs/workbench/parts/output/common/output'; import panel = require('vs/workbench/browser/panel'); -import {KEYBINDING_CONTEXT_EDITOR_LANGUAGE_ID} from 'vs/editor/common/editorCommon'; +import {EditorContextKeys} from 'vs/editor/common/editorCommon'; import {CommandsRegistry, ICommandHandler} from 'vs/platform/commands/common/commands'; import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; @@ -123,7 +123,7 @@ registerAction({ title: nls.localize('clearOutput.label', "Clear Output"), menu: { menuId: MenuId.EditorContext, - when: KEYBINDING_CONTEXT_EDITOR_LANGUAGE_ID.isEqualTo(OUTPUT_MODE_ID) + when: EditorContextKeys.LanguageId.isEqualTo(OUTPUT_MODE_ID) }, handler(accessor) { accessor.get(IOutputService).getActiveChannel().clear();