From 85e4ab959f6824a9fa9e8644ad2cd4679a6ac9bc Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Mon, 8 Aug 2016 10:10:36 +0200 Subject: [PATCH] Focus is not in _precondition --- .../accessibility/browser/accessibility.ts | 2 +- .../common/carretOperations.ts | 2 +- .../contrib/clipboard/browser/clipboard.ts | 6 ++--- .../editor/contrib/comment/common/comment.ts | 8 +++--- .../contextmenu/browser/contextmenu.ts | 2 +- .../browser/defineKeybinding.ts | 4 +-- .../contrib/find/common/findController.ts | 20 +++++++-------- .../editor/contrib/folding/browser/folding.ts | 4 +-- .../contrib/format/common/formatActions.ts | 2 +- .../browser/goToDeclaration.ts | 6 ++--- .../contrib/gotoError/browser/gotoError.ts | 4 +-- src/vs/editor/contrib/hover/browser/hover.ts | 2 +- .../inPlaceReplace/common/inPlaceReplace.ts | 5 ++-- .../contrib/indentation/common/indentation.ts | 15 ++++++----- .../linesOperations/common/linesOperations.ts | 25 +++++++++---------- src/vs/editor/contrib/links/browser/links.ts | 4 +-- .../contrib/multicursor/common/multicursor.ts | 6 ++--- .../parameterHints/browser/parameterHints.ts | 2 +- .../contrib/quickFix/browser/quickFix.ts | 2 +- .../contrib/quickOpen/browser/gotoLine.ts | 2 +- .../contrib/quickOpen/browser/quickCommand.ts | 2 +- .../contrib/quickOpen/browser/quickOutline.ts | 3 +-- .../browser/referenceSearch.ts | 2 +- .../editor/contrib/rename/browser/rename.ts | 2 +- .../smartSelect/common/jumpToBracket.ts | 2 +- .../contrib/smartSelect/common/smartSelect.ts | 4 +-- .../editor/contrib/suggest/browser/suggest.ts | 2 +- .../electron-browser/snippetCompletion.ts | 3 +-- .../toggleWordWrap/common/toggleWordWrap.ts | 2 +- .../parts/debug/browser/debugActions.ts | 10 ++++---- .../parts/emmet/node/emmetActions.ts | 3 +-- 31 files changed, 75 insertions(+), 83 deletions(-) diff --git a/src/vs/editor/contrib/accessibility/browser/accessibility.ts b/src/vs/editor/contrib/accessibility/browser/accessibility.ts index 8996eed9397..83a6e6c0622 100644 --- a/src/vs/editor/contrib/accessibility/browser/accessibility.ts +++ b/src/vs/editor/contrib/accessibility/browser/accessibility.ts @@ -199,7 +199,7 @@ class ShowAccessibilityHelpAction extends EditorAction { false ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, diff --git a/src/vs/editor/contrib/carretOperations/common/carretOperations.ts b/src/vs/editor/contrib/carretOperations/common/carretOperations.ts index c6d953839b2..0eb477821c4 100644 --- a/src/vs/editor/contrib/carretOperations/common/carretOperations.ts +++ b/src/vs/editor/contrib/carretOperations/common/carretOperations.ts @@ -17,7 +17,7 @@ class MoveCarretAction extends EditorAction { constructor(id:string, label:string, alias:string, left:boolean) { super(id, label, alias, true); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = KbExpr.and(EditorContextKeys.Writable); this.left = left; } diff --git a/src/vs/editor/contrib/clipboard/browser/clipboard.ts b/src/vs/editor/contrib/clipboard/browser/clipboard.ts index 543bb944f63..0ca0969c3d8 100644 --- a/src/vs/editor/contrib/clipboard/browser/clipboard.ts +++ b/src/vs/editor/contrib/clipboard/browser/clipboard.ts @@ -72,7 +72,7 @@ class ExecCommandCutAction extends ClipboardWritingAction { 'cut' ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = KbExpr.and(EditorContextKeys.Writable); this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), @@ -100,7 +100,7 @@ class ExecCommandCopyAction extends ClipboardWritingAction { 'copy' ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -128,7 +128,7 @@ class ExecCommandPasteAction extends ExecCommandAction { 'paste' ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), diff --git a/src/vs/editor/contrib/comment/common/comment.ts b/src/vs/editor/contrib/comment/common/comment.ts index 6bb87e1a7a8..03adf301b25 100644 --- a/src/vs/editor/contrib/comment/common/comment.ts +++ b/src/vs/editor/contrib/comment/common/comment.ts @@ -50,7 +50,7 @@ class ToggleCommentLineAction extends CommentLineAction { Type.Toggle ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), @@ -69,7 +69,7 @@ class AddLineCommentAction extends CommentLineAction { Type.ForceAdd ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), @@ -88,7 +88,7 @@ class RemoveLineCommentAction extends CommentLineAction { Type.ForceRemove ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), @@ -107,7 +107,7 @@ class BlockCommentAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), diff --git a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts index ec6ab48a239..aff9fbf68e5 100644 --- a/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts +++ b/src/vs/editor/contrib/contextmenu/browser/contextmenu.ts @@ -232,7 +232,7 @@ class ShowContextMenu extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts index 2210e49c256..0a5c1706ca6 100644 --- a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts +++ b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts @@ -457,10 +457,10 @@ export class DefineKeybindingAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable, EditorContextKeys.LanguageId.isEqualTo('json')); + this._precondition = KbExpr.and(EditorContextKeys.Writable, EditorContextKeys.LanguageId.isEqualTo('json')); this.kbOpts = { - kbExpr: EditorContextKeys.Focus, + kbExpr: EditorContextKeys.TextFocus, primary: KeyMod.chord(KeyMod.CtrlCmd | KeyCode.KEY_K, KeyMod.CtrlCmd | KeyCode.KEY_K) }; } diff --git a/src/vs/editor/contrib/find/common/findController.ts b/src/vs/editor/contrib/find/common/findController.ts index a6d67fe28d2..afa2a840fd0 100644 --- a/src/vs/editor/contrib/find/common/findController.ts +++ b/src/vs/editor/contrib/find/common/findController.ts @@ -292,7 +292,7 @@ export class NextMatchFindAction extends MatchFindAction { 'Find Next' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -315,7 +315,7 @@ export class PreviousMatchFindAction extends MatchFindAction { 'Find Previous' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -364,7 +364,7 @@ export class NextSelectionMatchFindAction extends SelectionMatchFindAction { 'Find Next Selection' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -386,7 +386,7 @@ export class PreviousSelectionMatchFindAction extends SelectionMatchFindAction { 'Find Previous Selection' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -552,7 +552,7 @@ export class AddSelectionToNextFindMatchAction extends SelectNextFindMatchAction 'Add Selection To Next Find Match' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -582,7 +582,7 @@ export class AddSelectionToPreviousFindMatchAction extends SelectPreviousFindMat 'Add Selection To Previous Find Match' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:editorCommon.ICommonCodeEditor): void { @@ -607,7 +607,7 @@ export class MoveSelectionToNextFindMatchAction extends SelectNextFindMatchActio 'Move Last Selection To Next Find Match' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -637,7 +637,7 @@ export class MoveSelectionToPreviousFindMatchAction extends SelectPreviousFindMa 'Move Last Selection To Previous Find Match' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:editorCommon.ICommonCodeEditor): void { @@ -692,7 +692,7 @@ export class SelectHighlightsAction extends AbstractSelectHighlightsAction { 'Select All Occurences of Find Match' ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -709,7 +709,7 @@ export class CompatChangeAll extends AbstractSelectHighlightsAction { 'Change All Occurrences' ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/folding/browser/folding.ts b/src/vs/editor/contrib/folding/browser/folding.ts index 2aae1ce1374..40d1b20a84f 100644 --- a/src/vs/editor/contrib/folding/browser/folding.ts +++ b/src/vs/editor/contrib/folding/browser/folding.ts @@ -653,10 +653,10 @@ abstract class FoldingAction2 extends EditorAction { constructor(id:string, label:string, alias:string, keybinding:number) { super(id, label, alias, false); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { - kbExpr: EditorContextKeys.Focus, + kbExpr: EditorContextKeys.TextFocus, primary: keybinding }; } diff --git a/src/vs/editor/contrib/format/common/formatActions.ts b/src/vs/editor/contrib/format/common/formatActions.ts index 97cd3905cab..4b9a00fb5a1 100644 --- a/src/vs/editor/contrib/format/common/formatActions.ts +++ b/src/vs/editor/contrib/format/common/formatActions.ts @@ -145,7 +145,7 @@ export class FormatAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable, ModeContextKeys.hasFormattingProvider); + this._precondition = KbExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasFormattingProvider); this.kbOpts = { kbExpr: KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable), diff --git a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts index 4c516b44675..816826c939b 100644 --- a/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts +++ b/src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts @@ -158,7 +158,7 @@ export class GoToDefinitionAction extends DefinitionAction { new DefinitionActionConfig() ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, ModeContextKeys.hasDefinitionProvider); + this._precondition = ModeContextKeys.hasDefinitionProvider; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -185,7 +185,7 @@ export class OpenDefinitionToSideAction extends DefinitionAction { new DefinitionActionConfig(true) ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, ModeContextKeys.hasDefinitionProvider); + this._precondition = ModeContextKeys.hasDefinitionProvider; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -203,7 +203,7 @@ export class PeekDefinitionAction extends DefinitionAction { new DefinitionActionConfig(void 0, true, false) ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, ModeContextKeys.hasDefinitionProvider, PeekContext.notInPeekEditor); + this._precondition = KbExpr.and(ModeContextKeys.hasDefinitionProvider, PeekContext.notInPeekEditor); this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts index 9973a6670d2..3c7fe78e009 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts @@ -521,7 +521,7 @@ class NextMarkerAction extends MarkerNavigationAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.Focus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.Focus, @@ -539,7 +539,7 @@ class PrevMarkerAction extends MarkerNavigationAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.Focus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.Focus, diff --git a/src/vs/editor/contrib/hover/browser/hover.ts b/src/vs/editor/contrib/hover/browser/hover.ts index 4d4cde0c003..42197afdab1 100644 --- a/src/vs/editor/contrib/hover/browser/hover.ts +++ b/src/vs/editor/contrib/hover/browser/hover.ts @@ -153,7 +153,7 @@ class ShowHoverAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts index b97a5fc4d11..11d676e8b6f 100644 --- a/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts +++ b/src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts @@ -10,7 +10,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {Range} from 'vs/editor/common/core/range'; import {EditorContextKeys, IEditorContribution, CodeEditorStateFlag, ICommonCodeEditor, IModelDecorationsChangeAccessor} from 'vs/editor/common/editorCommon'; import {ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/common/editorCommonExtensions'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; import {IInplaceReplaceSupportResult} from 'vs/editor/common/modes'; import {IEditorWorkerService} from 'vs/editor/common/services/editorWorkerService'; import {InPlaceReplaceCommand} from './inPlaceReplaceCommand'; @@ -136,7 +135,7 @@ class InPlaceReplaceUp extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -159,7 +158,7 @@ class InPlaceReplaceDown extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/indentation/common/indentation.ts b/src/vs/editor/contrib/indentation/common/indentation.ts index 8dd50790f11..1bff794d86a 100644 --- a/src/vs/editor/contrib/indentation/common/indentation.ts +++ b/src/vs/editor/contrib/indentation/common/indentation.ts @@ -10,7 +10,6 @@ import {ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/co import {IndentationToSpacesCommand, IndentationToTabsCommand} from 'vs/editor/contrib/indentation/common/indentationCommands'; import {IQuickOpenService} from 'vs/workbench/services/quickopen/common/quickOpenService'; import {IModelService} from 'vs/editor/common/services/modelService'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; export class IndentationToSpacesAction extends EditorAction { public static ID = 'editor.action.indentationToSpaces'; @@ -23,7 +22,7 @@ export class IndentationToSpacesAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): void { @@ -51,7 +50,7 @@ export class IndentationToTabsAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): void { @@ -121,7 +120,7 @@ export class IndentUsingTabs extends ChangeIndentationSizeAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } } @@ -137,7 +136,7 @@ export class IndentUsingSpaces extends ChangeIndentationSizeAction { true ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } } @@ -153,7 +152,7 @@ export class DetectIndentation extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): void { @@ -179,7 +178,7 @@ export class ToggleRenderWhitespaceAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): void { @@ -199,7 +198,7 @@ export class ToggleRenderControlCharacterAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): void { diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts index fce6c11ebaf..86b365d6153 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts @@ -13,7 +13,6 @@ import {ServicesAccessor, EditorAction, HandlerEditorAction, CommonEditorRegistr import {CopyLinesCommand} from './copyLinesCommand'; import {DeleteLinesCommand} from './deleteLinesCommand'; import {MoveLinesCommand} from './moveLinesCommand'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; // copy lines @@ -48,7 +47,7 @@ class CopyLinesUpAction extends AbstractCopyLinesAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -67,7 +66,7 @@ class CopyLinesDownAction extends AbstractCopyLinesAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -110,7 +109,7 @@ class MoveLinesUpAction extends AbstractMoveLinesAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -129,7 +128,7 @@ class MoveLinesDownAction extends AbstractMoveLinesAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -168,7 +167,7 @@ class SortLinesAscendingAction extends AbstractSortLinesAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -186,7 +185,7 @@ class SortLinesDescendingAction extends AbstractSortLinesAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -207,7 +206,7 @@ export class TrimTrailingWhitespaceAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -288,7 +287,7 @@ class DeleteLinesAction extends AbstractRemoveLinesAction { 'Delete Line' ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -319,7 +318,7 @@ class IndentLinesAction extends HandlerEditorAction { Handler.Indent ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -338,7 +337,7 @@ class OutdentLinesAction extends HandlerEditorAction { Handler.Outdent ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -357,7 +356,7 @@ class InsertLineBeforeAction extends HandlerEditorAction { Handler.LineInsertBefore ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -376,7 +375,7 @@ class InsertLineAfterAction extends HandlerEditorAction { Handler.LineInsertAfter ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/links/browser/links.ts b/src/vs/editor/contrib/links/browser/links.ts index b98373cffbe..dd207613ccf 100644 --- a/src/vs/editor/contrib/links/browser/links.ts +++ b/src/vs/editor/contrib/links/browser/links.ts @@ -24,8 +24,6 @@ import {getLinks, Link} from 'vs/editor/contrib/links/common/links'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import {EditorBrowserRegistry} from 'vs/editor/browser/editorBrowserExtensions'; -import EditorContextKeys = editorCommon.EditorContextKeys; - class LinkOccurence { public static decoration(link: Link): editorCommon.IModelDeltaDecoration { @@ -327,7 +325,7 @@ class OpenLinkAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } public enabled(accessor:ServicesAccessor, editor:editorCommon.ICommonCodeEditor): boolean { diff --git a/src/vs/editor/contrib/multicursor/common/multicursor.ts b/src/vs/editor/contrib/multicursor/common/multicursor.ts index 190e03931e7..5762b64f41c 100644 --- a/src/vs/editor/contrib/multicursor/common/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/common/multicursor.ts @@ -19,7 +19,7 @@ class InsertCursorAbove extends HandlerEditorAction { Handler.AddCursorUp ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -42,7 +42,7 @@ class InsertCursorBelow extends HandlerEditorAction { Handler.AddCursorDown ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -65,7 +65,7 @@ class InsertCursorAtEndOfEachLineSelected extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts index 6ff0ee239f0..e45da381f25 100644 --- a/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts +++ b/src/vs/editor/contrib/parameterHints/browser/parameterHints.ts @@ -67,7 +67,7 @@ export class TriggerParameterHintsAction extends EditorAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, ModeContextKeys.hasSignatureHelpProvider); + this._precondition = ModeContextKeys.hasSignatureHelpProvider; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/quickFix/browser/quickFix.ts b/src/vs/editor/contrib/quickFix/browser/quickFix.ts index 8421e64c9e1..3a5531e2d17 100644 --- a/src/vs/editor/contrib/quickFix/browser/quickFix.ts +++ b/src/vs/editor/contrib/quickFix/browser/quickFix.ts @@ -124,7 +124,7 @@ export class QuickFixAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable, ModeContextKeys.hasCodeActionsProvider); + this._precondition = KbExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasCodeActionsProvider); this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts index d6dbf2cb69b..a717333b9e7 100644 --- a/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts +++ b/src/vs/editor/contrib/quickOpen/browser/gotoLine.ts @@ -159,7 +159,7 @@ export class GotoLineAction extends BaseEditorQuickOpenAction { nls.localize('gotoLineActionInput', "Type a line number, followed by an optional colon and a column number to navigate to") ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, diff --git a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts index 0381b4ec73a..26b89631759 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickCommand.ts @@ -79,7 +79,7 @@ export class QuickCommandAction extends BaseEditorQuickOpenAction { nls.localize('quickCommandActionInput', "Type the name of an action you want to execute") ); - this._precondition = EditorContextKeys.Focus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.Focus, diff --git a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts index 595bcb7a3ef..5ebe6156dd9 100644 --- a/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts +++ b/src/vs/editor/contrib/quickOpen/browser/quickOutline.ts @@ -19,7 +19,6 @@ import {BaseEditorQuickOpenAction, IDecorator} from './editorQuickOpen'; import {getDocumentSymbols, IOutline} from 'vs/editor/contrib/quickOpen/common/quickOpen'; import {ServicesAccessor} from 'vs/editor/common/editorCommonExtensions'; import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; let SCOPE_PREFIX = ':'; @@ -118,7 +117,7 @@ export class QuickOutlineAction extends BaseEditorQuickOpenAction { nls.localize('quickOutlineActionInput', "Type the name of an identifier you wish to navigate to") ); - this._precondition = KbExpr.and(EditorContextKeys.Focus, ModeContextKeys.hasDocumentSymbolProvider); + this._precondition = ModeContextKeys.hasDocumentSymbolProvider; this.kbOpts = { kbExpr: EditorContextKeys.Focus, diff --git a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts index 8a9e704fd71..ad85d8f3640 100644 --- a/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts +++ b/src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts @@ -64,7 +64,7 @@ export class ReferenceAction extends EditorAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, ModeContextKeys.hasReferenceProvider, PeekContext.notInPeekEditor); + this._precondition = KbExpr.and(ModeContextKeys.hasReferenceProvider, PeekContext.notInPeekEditor); this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/rename/browser/rename.ts b/src/vs/editor/contrib/rename/browser/rename.ts index 7826ed8617e..6c2eb2fcdf4 100644 --- a/src/vs/editor/contrib/rename/browser/rename.ts +++ b/src/vs/editor/contrib/rename/browser/rename.ts @@ -155,7 +155,7 @@ export class RenameAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable, ModeContextKeys.hasRenameProvider); + this._precondition = KbExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasRenameProvider); this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts index a11428cd217..16c05d45b10 100644 --- a/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts +++ b/src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts @@ -20,7 +20,7 @@ class SelectBracketAction extends HandlerEditorAction { Handler.JumpToBracket ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts index 722bb78e51a..74f0fd0cf06 100644 --- a/src/vs/editor/contrib/smartSelect/common/smartSelect.ts +++ b/src/vs/editor/contrib/smartSelect/common/smartSelect.ts @@ -165,7 +165,7 @@ class GrowSelectionAction extends AbstractSmartSelect { true ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -184,7 +184,7 @@ class ShrinkSelectionAction extends AbstractSmartSelect { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/suggest/browser/suggest.ts b/src/vs/editor/contrib/suggest/browser/suggest.ts index b8013fa2619..5a7aeb3d061 100644 --- a/src/vs/editor/contrib/suggest/browser/suggest.ts +++ b/src/vs/editor/contrib/suggest/browser/suggest.ts @@ -177,7 +177,7 @@ export class TriggerSuggestAction extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable, ModeContextKeys.hasCompletionItemProvider); + this._precondition = KbExpr.and(EditorContextKeys.Writable, ModeContextKeys.hasCompletionItemProvider); this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts b/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts index e586fcbb59a..6800c4a798e 100644 --- a/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts +++ b/src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts @@ -12,7 +12,6 @@ import {ServicesAccessor, EditorAction, CommonEditorRegistry} from 'vs/editor/co import {getSnippetController, CodeSnippet} from 'vs/editor/contrib/snippet/common/snippet'; import {IQuickOpenService, IPickOpenEntry} from 'vs/workbench/services/quickopen/common/quickOpenService'; import {ISnippetsRegistry, Extensions, ISnippet} from 'vs/editor/common/modes/snippetsRegistry'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; interface ISnippetPick extends IPickOpenEntry { snippet: ISnippet; @@ -28,7 +27,7 @@ class ShowSnippetsActions extends EditorAction { true ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; } public run(accessor:ServicesAccessor, editor:ICommonCodeEditor): TPromise { diff --git a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts index 8b09a85c58d..53a690f4c39 100644 --- a/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts +++ b/src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts @@ -19,7 +19,7 @@ class ToggleWordWrapAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, diff --git a/src/vs/workbench/parts/debug/browser/debugActions.ts b/src/vs/workbench/parts/debug/browser/debugActions.ts index e1267e2adcf..65102c13368 100644 --- a/src/vs/workbench/parts/debug/browser/debugActions.ts +++ b/src/vs/workbench/parts/debug/browser/debugActions.ts @@ -527,7 +527,7 @@ export class ToggleBreakpointAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; this.kbOpts = { kbExpr: EditorContextKeys.TextFocus, @@ -560,7 +560,7 @@ export class EditorConditionalBreakpointAction extends EditorAction { false ); - this._precondition = EditorContextKeys.TextFocus; + this._precondition = null; } public run(accessor:ServicesAccessor, editor:editorCommon.ICommonCodeEditor): void { @@ -606,7 +606,7 @@ export class RunToCursorAction extends EditorAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, debug.CONTEXT_IN_DEBUG_MODE); + this._precondition = debug.CONTEXT_IN_DEBUG_MODE; this.menuOpts = { kbExpr: debug.CONTEXT_IN_DEBUG_MODE, @@ -669,7 +669,7 @@ export class SelectionToReplAction extends EditorAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, debug.CONTEXT_IN_DEBUG_MODE); + this._precondition = debug.CONTEXT_IN_DEBUG_MODE; this.menuOpts = { kbExpr: KbExpr.and(EditorContextKeys.HasNonEmptySelection, debug.CONTEXT_IN_DEBUG_MODE), @@ -699,7 +699,7 @@ export class ShowDebugHoverAction extends EditorAction { false ); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, debug.CONTEXT_IN_DEBUG_MODE); + this._precondition = debug.CONTEXT_IN_DEBUG_MODE; this.kbOpts = { kbExpr: KbExpr.and(debug.CONTEXT_IN_DEBUG_MODE, EditorContextKeys.TextFocus), diff --git a/src/vs/workbench/parts/emmet/node/emmetActions.ts b/src/vs/workbench/parts/emmet/node/emmetActions.ts index e873d937e18..e526771ddf6 100644 --- a/src/vs/workbench/parts/emmet/node/emmetActions.ts +++ b/src/vs/workbench/parts/emmet/node/emmetActions.ts @@ -9,7 +9,6 @@ import {TPromise} from 'vs/base/common/winjs.base'; import {ICommonCodeEditor, EditorContextKeys} from 'vs/editor/common/editorCommon'; import {EditorAction, ServicesAccessor} from 'vs/editor/common/editorCommonExtensions'; import {IInstantiationService} from 'vs/platform/instantiation/common/instantiation'; -import {KbExpr} from 'vs/platform/keybinding/common/keybinding'; import {EditorAccessor} from 'vs/workbench/parts/emmet/node/editorAccessor'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; @@ -103,7 +102,7 @@ export abstract class EmmetEditorAction extends EditorAction { constructor(id:string, label:string, alias:string) { super(id, label, alias, true); - this._precondition = KbExpr.and(EditorContextKeys.TextFocus, EditorContextKeys.Writable); + this._precondition = EditorContextKeys.Writable; }