maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Focus is not in _precondition

Browse source
This commit is contained in:
Alex Dima 2016-08-08 10:10:36 +02:00
parent 0172356a73
commit 85e4ab959f
31 changed files with 75 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/vs/editor/contrib/accessibility/browser/accessibility.ts
View file

@ -199,7 +199,7 @@ class ShowAccessibilityHelpAction extends EditorAction {
false
);
this._precondition = EditorContextKeys.Focus;
this._precondition = null;
this.kbOpts = {
kbExpr: EditorContextKeys.Focus,

2
src/vs/editor/contrib/carretOperations/common/carretOperations.ts
View file

@ -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;
}

6
src/vs/editor/contrib/clipboard/browser/clipboard.ts
View file

@ -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),

8
src/vs/editor/contrib/comment/common/comment.ts
View file

@ -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),

2
src/vs/editor/contrib/contextmenu/browser/contextmenu.ts
View file

@ -232,7 +232,7 @@ class ShowContextMenu extends EditorAction {
false
);
this._precondition = EditorContextKeys.TextFocus;
this._precondition = null;
this.kbOpts = {
kbExpr: EditorContextKeys.TextFocus,

4
src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts
View file

@ -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)
};
}

20
src/vs/editor/contrib/find/common/findController.ts
View file

@ -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,

4
src/vs/editor/contrib/folding/browser/folding.ts
View file

@ -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
};
}

2
src/vs/editor/contrib/format/common/formatActions.ts
View file

@ -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),

6
src/vs/editor/contrib/goToDeclaration/browser/goToDeclaration.ts
View file

@ -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,

4
src/vs/editor/contrib/gotoError/browser/gotoError.ts
View file

@ -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,

2
src/vs/editor/contrib/hover/browser/hover.ts
View file

@ -153,7 +153,7 @@ class ShowHoverAction extends EditorAction {
false
);
this._precondition = EditorContextKeys.TextFocus;
this._precondition = null;
this.kbOpts = {
kbExpr: EditorContextKeys.TextFocus,

5
src/vs/editor/contrib/inPlaceReplace/common/inPlaceReplace.ts
View file

@ -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,

15
src/vs/editor/contrib/indentation/common/indentation.ts
View file

@ -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 {

25
src/vs/editor/contrib/linesOperations/common/linesOperations.ts
View file

@ -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,

4
src/vs/editor/contrib/links/browser/links.ts
View file

@ -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 {

6
src/vs/editor/contrib/multicursor/common/multicursor.ts
View file

@ -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,

2
src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
View file

@ -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,

2
src/vs/editor/contrib/quickFix/browser/quickFix.ts
View file

@ -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,

2
src/vs/editor/contrib/quickOpen/browser/gotoLine.ts
View file

@ -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,

2
src/vs/editor/contrib/quickOpen/browser/quickCommand.ts
View file

@ -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,

3
src/vs/editor/contrib/quickOpen/browser/quickOutline.ts
View file

@ -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,

2
src/vs/editor/contrib/referenceSearch/browser/referenceSearch.ts
View file

@ -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,

2
src/vs/editor/contrib/rename/browser/rename.ts
View file

@ -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,

2
src/vs/editor/contrib/smartSelect/common/jumpToBracket.ts
View file

@ -20,7 +20,7 @@ class SelectBracketAction extends HandlerEditorAction {
Handler.JumpToBracket
);
this._precondition = EditorContextKeys.TextFocus;
this._precondition = null;
this.kbOpts = {
kbExpr: EditorContextKeys.TextFocus,

4
src/vs/editor/contrib/smartSelect/common/smartSelect.ts
View file

@ -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,

2
src/vs/editor/contrib/suggest/browser/suggest.ts
View file

@ -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,

3
src/vs/editor/contrib/suggest/electron-browser/snippetCompletion.ts
View file

@ -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<void> {

2
src/vs/editor/contrib/toggleWordWrap/common/toggleWordWrap.ts
View file

@ -19,7 +19,7 @@ class ToggleWordWrapAction extends EditorAction {
false
);
this._precondition = EditorContextKeys.TextFocus;
this._precondition = null;
this.kbOpts = {
kbExpr: EditorContextKeys.TextFocus,

10
src/vs/workbench/parts/debug/browser/debugActions.ts
View file

@ -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),

3
src/vs/workbench/parts/emmet/node/emmetActions.ts
View file

@ -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;
}