From 55bf5acb2e84f692b8d25e5a7d16edc9ceca7f6f Mon Sep 17 00:00:00 2001 From: Alexandru Dima Date: Tue, 13 Sep 2016 16:42:42 +0200 Subject: [PATCH] Remove CommonKeybindings --- src/vs/base/browser/ui/actionbar/actionbar.ts | 14 +++--- src/vs/base/browser/ui/button/button.ts | 6 +-- src/vs/base/browser/ui/findinput/findInput.ts | 10 ++-- src/vs/base/browser/ui/splitview/splitview.ts | 12 ++--- src/vs/base/common/keyCodes.ts | 46 ------------------- .../base/parts/tree/browser/treeDefaults.ts | 22 ++++----- .../common/controller/textAreaHandler.ts | 4 +- .../browser/defineKeybinding.ts | 6 +-- .../editor/contrib/find/browser/findWidget.ts | 28 +++++------ .../contrib/gotoError/browser/gotoError.ts | 10 ++-- .../contrib/hover/browser/hoverWidgets.ts | 4 +- .../browser/parts/editor/tabsTitleControl.ts | 12 ++--- .../parts/debug/browser/breakpointWidget.ts | 6 +-- .../debug/electron-browser/debugHover.ts | 4 +- .../debug/electron-browser/debugViewer.ts | 22 ++++----- .../files/browser/views/explorerViewer.ts | 28 +++++------ .../git/browser/views/changes/changesView.ts | 6 +-- .../browser/views/changes/changesViewer.ts | 10 ++-- .../markers/browser/markersPanelActions.ts | 10 ++-- .../parts/search/browser/searchActions.ts | 4 +- .../parts/search/browser/searchResultsView.ts | 12 ++--- .../parts/search/browser/searchViewlet.ts | 4 +- .../browser/messagelist/messageList.ts | 4 +- 23 files changed, 119 insertions(+), 165 deletions(-) diff --git a/src/vs/base/browser/ui/actionbar/actionbar.ts b/src/vs/base/browser/ui/actionbar/actionbar.ts index 271b3223bed..b23736c80fb 100644 --- a/src/vs/base/browser/ui/actionbar/actionbar.ts +++ b/src/vs/base/browser/ui/actionbar/actionbar.ts @@ -18,7 +18,7 @@ import types = require('vs/base/common/types'); import {IEventEmitter, EventEmitter} from 'vs/base/common/eventEmitter'; import {Gesture, EventType} from 'vs/base/browser/touch'; import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; export interface IActionItem extends IEventEmitter { actionRunner: IActionRunner; @@ -388,13 +388,13 @@ export class ActionBar extends EventEmitter implements IActionRunner { let event = new StandardKeyboardEvent(e); let eventHandled = true; - if (event.equals(isVertical ? CommonKeybindings.UP_ARROW : CommonKeybindings.LEFT_ARROW)) { + if (event.equals(isVertical ? KeyCode.UpArrow : KeyCode.LeftArrow)) { this.focusPrevious(); - } else if (event.equals(isVertical ? CommonKeybindings.DOWN_ARROW : CommonKeybindings.RIGHT_ARROW)) { + } else if (event.equals(isVertical ? KeyCode.DownArrow : KeyCode.RightArrow)) { this.focusNext(); - } else if (event.equals(CommonKeybindings.ESCAPE)) { + } else if (event.equals(KeyCode.Escape)) { this.cancel(); - } else if (event.equals(CommonKeybindings.ENTER) || event.equals(CommonKeybindings.SPACE)) { + } else if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) { // Nothing, just staying out of the else branch } else { eventHandled = false; @@ -416,14 +416,14 @@ export class ActionBar extends EventEmitter implements IActionRunner { let event = new StandardKeyboardEvent(e); // Run action on Enter/Space - if (event.equals(CommonKeybindings.ENTER) || event.equals(CommonKeybindings.SPACE)) { + if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) { this.doTrigger(event); event.preventDefault(); event.stopPropagation(); } // Recompute focused item - else if (event.equals(CommonKeybindings.TAB) || event.equals(CommonKeybindings.SHIFT_TAB)) { + else if (event.equals(KeyCode.Tab) || event.equals(KeyMod.Shift | KeyCode.Tab)) { this.updateFocusedItem(); } }); diff --git a/src/vs/base/browser/ui/button/button.ts b/src/vs/base/browser/ui/button/button.ts index 2cd7282a5e4..b4838947b27 100644 --- a/src/vs/base/browser/ui/button/button.ts +++ b/src/vs/base/browser/ui/button/button.ts @@ -10,7 +10,7 @@ import {EventEmitter} from 'vs/base/common/eventEmitter'; import DOM = require('vs/base/browser/dom'); import {Builder, $} from 'vs/base/browser/builder'; import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; export class Button extends EventEmitter { @@ -38,10 +38,10 @@ export class Button extends EventEmitter { this.$el.on(DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => { let event = new StandardKeyboardEvent(e); let eventHandled = false; - if (this.enabled && event.equals(CommonKeybindings.ENTER) || event.equals(CommonKeybindings.SPACE)) { + if (this.enabled && event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) { this.emit(DOM.EventType.CLICK, e); eventHandled = true; - } else if (event.equals(CommonKeybindings.ESCAPE)) { + } else if (event.equals(KeyCode.Escape)) { this.$el.domBlur(); eventHandled = true; } diff --git a/src/vs/base/browser/ui/findinput/findInput.ts b/src/vs/base/browser/ui/findinput/findInput.ts index ca62ca9035a..eccf8eb86df 100644 --- a/src/vs/base/browser/ui/findinput/findInput.ts +++ b/src/vs/base/browser/ui/findinput/findInput.ts @@ -14,7 +14,7 @@ import {IContextViewProvider} from 'vs/base/browser/ui/contextview/contextview'; import {Widget} from 'vs/base/browser/ui/widget'; import Event, {Emitter} from 'vs/base/common/event'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; export interface IFindInputOptions { placeholder?:string; @@ -239,13 +239,13 @@ export class FindInput extends Widget { // Arrow-Key support to navigate between options let indexes = [this.caseSensitive.domNode, this.wholeWords.domNode, this.regex.domNode]; this.onkeydown(this.domNode, (event: IKeyboardEvent) => { - if (event.equals(CommonKeybindings.LEFT_ARROW) || event.equals(CommonKeybindings.RIGHT_ARROW) || event.equals(CommonKeybindings.ESCAPE)) { + if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.RightArrow) || event.equals(KeyCode.Escape)) { let index = indexes.indexOf(document.activeElement); if (index >= 0) { let newIndex: number; - if (event.equals(CommonKeybindings.RIGHT_ARROW)) { + if (event.equals(KeyCode.RightArrow)) { newIndex = (index + 1) % indexes.length; - } else if (event.equals(CommonKeybindings.LEFT_ARROW)) { + } else if (event.equals(KeyCode.LeftArrow)) { if (index === 0) { newIndex = indexes.length - 1; } else { @@ -253,7 +253,7 @@ export class FindInput extends Widget { } } - if (event.equals(CommonKeybindings.ESCAPE)) { + if (event.equals(KeyCode.Escape)) { indexes[index].blur(); } else if (newIndex >= 0) { indexes[newIndex].focus(); diff --git a/src/vs/base/browser/ui/splitview/splitview.ts b/src/vs/base/browser/ui/splitview/splitview.ts index 1f0f1a362c7..13e72e8cdb9 100644 --- a/src/vs/base/browser/ui/splitview/splitview.ts +++ b/src/vs/base/browser/ui/splitview/splitview.ts @@ -14,7 +14,7 @@ import dom = require('vs/base/browser/dom'); import numbers = require('vs/base/common/numbers'); import sash = require('vs/base/browser/ui/sash/sash'); import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import Event, {Emitter} from 'vs/base/common/event'; export enum Orientation { @@ -113,7 +113,7 @@ export abstract class HeaderView extends View { constructor(opts: IHeaderViewOptions) { super(opts); - + this.headerSize = types.isUndefined(opts.headerSize) ? 22 : opts.headerSize; } @@ -214,16 +214,16 @@ export abstract class AbstractCollapsibleView extends HeaderView { this.headerKeyListener = dom.addDisposableListener(this.header, dom.EventType.KEY_DOWN, (e) => { let event = new StandardKeyboardEvent(e); let eventHandled = false; - if (event.equals(CommonKeybindings.ENTER) || event.equals(CommonKeybindings.SPACE) || (event.equals(CommonKeybindings.LEFT_ARROW) && this.state === CollapsibleState.EXPANDED) || (event.equals(CommonKeybindings.RIGHT_ARROW) && this.state === CollapsibleState.COLLAPSED)) { + if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space) || (event.equals(KeyCode.LeftArrow) && this.state === CollapsibleState.EXPANDED) || (event.equals(KeyCode.RightArrow) && this.state === CollapsibleState.COLLAPSED)) { this.toggleExpansion(); eventHandled = true; - } else if (event.equals(CommonKeybindings.ESCAPE)) { + } else if (event.equals(KeyCode.Escape)) { this.header.blur(); eventHandled = true; - } else if (event.equals(CommonKeybindings.UP_ARROW)) { + } else if (event.equals(KeyCode.UpArrow)) { this.emit('focusPrevious'); eventHandled = true; - } else if (event.equals(CommonKeybindings.DOWN_ARROW)) { + } else if (event.equals(KeyCode.DownArrow)) { this.emit('focusNext'); eventHandled = true; } diff --git a/src/vs/base/common/keyCodes.ts b/src/vs/base/common/keyCodes.ts index a9d90ae2bb7..732af413bd3 100644 --- a/src/vs/base/common/keyCodes.ts +++ b/src/vs/base/common/keyCodes.ts @@ -473,52 +473,6 @@ export class BinaryKeybindings { } } -/** - * A set of usual keybindings that can be reused in code - */ -export class CommonKeybindings { - - public static ENTER: number = KeyCode.Enter; - public static SHIFT_ENTER: number = KeyMod.Shift | KeyCode.Enter; - public static CTRLCMD_ENTER: number = KeyMod.CtrlCmd | KeyCode.Enter; - public static WINCTRL_ENTER: number = KeyMod.WinCtrl | KeyCode.Enter; - - public static TAB: number = KeyCode.Tab; - public static SHIFT_TAB: number = KeyMod.Shift | KeyCode.Tab; - public static ESCAPE: number = KeyCode.Escape; - public static SPACE: number = KeyCode.Space; - public static DELETE: number = KeyCode.Delete; - public static SHIFT_DELETE: number = KeyMod.Shift | KeyCode.Delete; - public static CTRLCMD_BACKSPACE: number = KeyMod.CtrlCmd | KeyCode.Backspace; - - public static UP_ARROW: number = KeyCode.UpArrow; - public static SHIFT_UP_ARROW: number = KeyMod.Shift | KeyCode.UpArrow; - public static CTRLCMD_UP_ARROW: number = KeyMod.CtrlCmd | KeyCode.UpArrow; - - public static DOWN_ARROW: number = KeyCode.DownArrow; - public static SHIFT_DOWN_ARROW: number = KeyMod.Shift | KeyCode.DownArrow; - public static CTRLCMD_DOWN_ARROW: number = KeyMod.CtrlCmd | KeyCode.DownArrow; - - public static LEFT_ARROW: number = KeyCode.LeftArrow; - - public static RIGHT_ARROW: number = KeyCode.RightArrow; - - public static HOME: number = KeyCode.Home; - public static END: number = KeyCode.End; - - public static PAGE_UP: number = KeyCode.PageUp; - public static SHIFT_PAGE_UP: number = KeyMod.Shift | KeyCode.PageUp; - - public static PAGE_DOWN: number = KeyCode.PageDown; - public static SHIFT_PAGE_DOWN: number = KeyMod.Shift | KeyCode.PageDown; - - public static F2: number = KeyCode.F2; - - public static CTRLCMD_S: number = KeyMod.CtrlCmd | KeyCode.KEY_S; - public static CTRLCMD_C: number = KeyMod.CtrlCmd | KeyCode.KEY_C; - public static CTRLCMD_V: number = KeyMod.CtrlCmd | KeyCode.KEY_V; -} - export class Keybinding { /** diff --git a/src/vs/base/parts/tree/browser/treeDefaults.ts b/src/vs/base/parts/tree/browser/treeDefaults.ts index 012d54da931..3f2550e407b 100644 --- a/src/vs/base/parts/tree/browser/treeDefaults.ts +++ b/src/vs/base/parts/tree/browser/treeDefaults.ts @@ -14,7 +14,7 @@ import dom = require('vs/base/browser/dom'); import mouse = require('vs/base/browser/mouseEvent'); import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import _ = require('vs/base/parts/tree/browser/tree'); -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; export interface ILegacyTemplateData { root: HTMLElement; @@ -138,18 +138,18 @@ export class DefaultController implements _.IController { this.options = options; this.downKeyBindingDispatcher = new KeybindingDispatcher(); - this.downKeyBindingDispatcher.set(CommonKeybindings.SPACE, (t, e) => this.onSpace(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.UP_ARROW, (t, e) => this.onUp(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.PAGE_UP, (t, e) => this.onPageUp(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.DOWN_ARROW, (t, e) => this.onDown(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.PAGE_DOWN, (t, e) => this.onPageDown(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.LEFT_ARROW, (t, e) => this.onLeft(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.RIGHT_ARROW, (t, e) => this.onRight(t, e)); - this.downKeyBindingDispatcher.set(CommonKeybindings.ESCAPE, (t, e) => this.onEscape(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.Space, (t, e) => this.onSpace(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.UpArrow, (t, e) => this.onUp(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.PageUp, (t, e) => this.onPageUp(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.DownArrow, (t, e) => this.onDown(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.PageDown, (t, e) => this.onPageDown(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.LeftArrow, (t, e) => this.onLeft(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.RightArrow, (t, e) => this.onRight(t, e)); + this.downKeyBindingDispatcher.set(KeyCode.Escape, (t, e) => this.onEscape(t, e)); this.upKeyBindingDispatcher = new KeybindingDispatcher(); - this.upKeyBindingDispatcher.set(CommonKeybindings.ENTER, this.onEnter.bind(this)); - this.upKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_ENTER, this.onEnter.bind(this)); + this.upKeyBindingDispatcher.set(KeyCode.Enter, this.onEnter.bind(this)); + this.upKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Enter, this.onEnter.bind(this)); } public onMouseDown(tree:_.ITree, element: any, event:mouse.IMouseEvent, origin: string = 'mouse'):boolean { diff --git a/src/vs/editor/common/controller/textAreaHandler.ts b/src/vs/editor/common/controller/textAreaHandler.ts index a09ba337c16..002bf91ca50 100644 --- a/src/vs/editor/common/controller/textAreaHandler.ts +++ b/src/vs/editor/common/controller/textAreaHandler.ts @@ -6,7 +6,7 @@ import {RunOnceScheduler} from 'vs/base/common/async'; import Event, {Emitter} from 'vs/base/common/event'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import {Disposable} from 'vs/base/common/lifecycle'; import {IClipboardEvent, ICompositionEvent, IKeyboardEventWrapper, ISimpleModel, ITextAreaWrapper, ITypeData, TextAreaState, TextAreaStrategy, createTextAreaState} from 'vs/editor/common/controller/textAreaState'; import {Range} from 'vs/editor/common/core/range'; @@ -252,7 +252,7 @@ export class TextAreaHandler extends Disposable { } private _onKeyDownHandler(e:IKeyboardEventWrapper): void { - if (e.equals(CommonKeybindings.ESCAPE)) { + if (e.equals(KeyCode.Escape)) { // Prevent default always for `Esc`, otherwise it will generate a keypress // See https://msdn.microsoft.com/en-us/library/ie/ms536939(v=vs.85).aspx e.preventDefault(); diff --git a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts index 984f39aa78d..df1cf8526dc 100644 --- a/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts +++ b/src/vs/editor/contrib/defineKeybinding/browser/defineKeybinding.ts @@ -9,7 +9,7 @@ import 'vs/css!./defineKeybinding'; import * as nls from 'vs/nls'; import {RunOnceScheduler} from 'vs/base/common/async'; import {MarkedString} from 'vs/base/common/htmlContent'; -import {CommonKeybindings, KeyCode, KeyMod, KeyChord, Keybinding} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod, KeyChord, Keybinding} from 'vs/base/common/keyCodes'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import * as dom from 'vs/base/browser/dom'; import {renderHtml} from 'vs/base/browser/htmlContentRenderer'; @@ -353,14 +353,14 @@ class DefineKeybindingWidget implements IOverlayWidget { let kb = new Keybinding(keyEvent.asKeybinding()); switch (kb.value) { - case CommonKeybindings.ENTER: + case KeyCode.Enter: if (this._lastKeybinding) { this._onAccepted(this._lastKeybinding.toUserSettingsLabel()); } this._stop(); return; - case CommonKeybindings.ESCAPE: + case KeyCode.Escape: this._stop(); return; } diff --git a/src/vs/editor/contrib/find/browser/findWidget.ts b/src/vs/editor/contrib/find/browser/findWidget.ts index 74044d8acc5..ed0825ff8d9 100644 --- a/src/vs/editor/contrib/find/browser/findWidget.ts +++ b/src/vs/editor/contrib/find/browser/findWidget.ts @@ -8,7 +8,7 @@ import 'vs/css!./findWidget'; import * as nls from 'vs/nls'; import {onUnexpectedError} from 'vs/base/common/errors'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import * as strings from 'vs/base/common/strings'; import * as dom from 'vs/base/browser/dom'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; @@ -318,17 +318,17 @@ export class FindWidget extends Widget implements IOverlayWidget { private _onFindInputKeyDown(e:IKeyboardEvent): void { switch (e.asKeybinding()) { - case CommonKeybindings.ENTER: + case KeyCode.Enter: this._codeEditor.getAction(FIND_IDS.NextMatchFindAction).run().done(null, onUnexpectedError); e.preventDefault(); return; - case CommonKeybindings.SHIFT_ENTER: + case KeyMod.Shift | KeyCode.Enter: this._codeEditor.getAction(FIND_IDS.PreviousMatchFindAction).run().done(null, onUnexpectedError); e.preventDefault(); return; - case CommonKeybindings.TAB: + case KeyCode.Tab: if (this._isReplaceVisible) { this._replaceInputBox.focus(); } else { @@ -337,7 +337,7 @@ export class FindWidget extends Widget implements IOverlayWidget { e.preventDefault(); return; - case CommonKeybindings.CTRLCMD_DOWN_ARROW: + case KeyMod.CtrlCmd | KeyCode.DownArrow: this._codeEditor.focus(); e.preventDefault(); return; @@ -347,27 +347,27 @@ export class FindWidget extends Widget implements IOverlayWidget { private _onReplaceInputKeyDown(e:IKeyboardEvent): void { switch (e.asKeybinding()) { - case CommonKeybindings.ENTER: + case KeyCode.Enter: this._controller.replace(); e.preventDefault(); return; - case CommonKeybindings.CTRLCMD_ENTER: + case KeyMod.CtrlCmd | KeyCode.Enter: this._controller.replaceAll(); e.preventDefault(); return; - case CommonKeybindings.TAB: + case KeyCode.Tab: this._findInput.focusOnCaseSensitive(); e.preventDefault(); return; - case CommonKeybindings.SHIFT_TAB: + case KeyMod.Shift | KeyCode.Tab: this._findInput.focus(); e.preventDefault(); return; - case CommonKeybindings.CTRLCMD_DOWN_ARROW: + case KeyMod.CtrlCmd | KeyCode.DownArrow: this._codeEditor.focus(); e.preventDefault(); return; @@ -422,7 +422,7 @@ export class FindWidget extends Widget implements IOverlayWidget { }, true); })); this._register(this._findInput.onCaseSensitiveKeyDown((e) => { - if (e.equals(CommonKeybindings.SHIFT_TAB)) { + if (e.equals(KeyMod.Shift | KeyCode.Tab)) { if (this._isReplaceVisible) { this._replaceInputBox.focus(); e.preventDefault(); @@ -485,7 +485,7 @@ export class FindWidget extends Widget implements IOverlayWidget { this._state.change({ isRevealed: false }, false); }, onKeyDown: (e) => { - if (e.equals(CommonKeybindings.TAB)) { + if (e.equals(KeyCode.Tab)) { if (this._isReplaceVisible) { if (this._replaceBtn.isEnabled()) { this._replaceBtn.focus(); @@ -526,7 +526,7 @@ export class FindWidget extends Widget implements IOverlayWidget { this._controller.replace(); }, onKeyDown: (e) => { - if (e.equals(CommonKeybindings.SHIFT_TAB)) { + if (e.equals(KeyMod.Shift | KeyCode.Tab)) { this._closeBtn.focus(); e.preventDefault(); } @@ -687,7 +687,7 @@ class SimpleButton extends Widget { e.preventDefault(); }); this.onkeydown(this._domNode, (e) => { - if (e.equals(CommonKeybindings.SPACE) || e.equals(CommonKeybindings.ENTER)) { + if (e.equals(KeyCode.Space) || e.equals(KeyCode.Enter)) { this._opts.onTrigger(); e.preventDefault(); return; diff --git a/src/vs/editor/contrib/gotoError/browser/gotoError.ts b/src/vs/editor/contrib/gotoError/browser/gotoError.ts index 5d808c6b507..e20d9a0e088 100644 --- a/src/vs/editor/contrib/gotoError/browser/gotoError.ts +++ b/src/vs/editor/contrib/gotoError/browser/gotoError.ts @@ -9,7 +9,7 @@ import 'vs/css!./gotoError'; import * as nls from 'vs/nls'; import {onUnexpectedError} from 'vs/base/common/errors'; import {Emitter} from 'vs/base/common/event'; -import {CommonKeybindings, KeyCode, KeyMod} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IDisposable, dispose} from 'vs/base/common/lifecycle'; import Severity from 'vs/base/common/severity'; import URI from 'vs/base/common/uri'; @@ -207,13 +207,13 @@ class FixesWidget { this._listener = dom.addStandardDisposableListener(container, 'keydown', (e) => { switch (e.asKeybinding()) { - case CommonKeybindings.LEFT_ARROW: + case KeyCode.LeftArrow: this._move(true); // this._goLeft(); e.preventDefault(); e.stopPropagation(); break; - case CommonKeybindings.RIGHT_ARROW: + case KeyCode.RightArrow: this._move(false); // this._goRight(); e.preventDefault(); @@ -275,8 +275,8 @@ class FixesWidget { })); this._disposeOnUpdate.push(dom.addStandardDisposableListener(entry, 'keydown', (e) => { switch (e.asKeybinding()) { - case CommonKeybindings.ENTER: - case CommonKeybindings.SPACE: + case KeyCode.Enter: + case KeyCode.Space: this._commandService.executeCommand(fix.command.id, ...fix.command.arguments); e.preventDefault(); e.stopPropagation(); diff --git a/src/vs/editor/contrib/hover/browser/hoverWidgets.ts b/src/vs/editor/contrib/hover/browser/hoverWidgets.ts index 06a3bab592f..21efa92f366 100644 --- a/src/vs/editor/contrib/hover/browser/hoverWidgets.ts +++ b/src/vs/editor/contrib/hover/browser/hoverWidgets.ts @@ -4,7 +4,7 @@ *--------------------------------------------------------------------------------------------*/ 'use strict'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {toggleClass} from 'vs/base/browser/dom'; import {Position} from 'vs/editor/common/core/position'; @@ -56,7 +56,7 @@ export class ContentHoverWidget extends Widget implements editorBrowser.IContent this._containerDomNode.appendChild(this.scrollbar.getDomNode()); this.onkeydown(this._containerDomNode, (e: IKeyboardEvent) => { - if (e.equals(CommonKeybindings.ESCAPE)) { + if (e.equals(KeyCode.Escape)) { this.hide(); } }); diff --git a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts index 6758abc5696..a5f51f47d4d 100644 --- a/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts +++ b/src/vs/workbench/browser/parts/editor/tabsTitleControl.ts @@ -14,7 +14,7 @@ import {MIME_BINARY} from 'vs/base/common/mime'; import {Position, IEditorInput} from 'vs/platform/editor/common/editor'; import {IEditorGroup, IEditorIdentifier, asFileEditorInput} from 'vs/workbench/common/editor'; import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings as Kb, KeyCode} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import {ActionBar} from 'vs/base/browser/ui/actionbar/actionbar'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; import {IWorkbenchEditorService} from 'vs/workbench/services/editor/common/editorService'; @@ -453,21 +453,21 @@ export class TabsTitleControl extends TitleControl { let handled = false; // Run action on Enter/Space - if (event.equals(Kb.ENTER) || event.equals(Kb.SPACE)) { + if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) { handled = true; this.editorService.openEditor(editor, null, position).done(null, errors.onUnexpectedError); } // Navigate in editors - else if ([Kb.LEFT_ARROW, Kb.RIGHT_ARROW, Kb.UP_ARROW, Kb.DOWN_ARROW, Kb.HOME, Kb.END].some(kb => event.equals(kb))) { + else if ([KeyCode.LeftArrow, KeyCode.RightArrow, KeyCode.UpArrow, KeyCode.DownArrow, KeyCode.Home, KeyCode.End].some(kb => event.equals(kb))) { const index = group.indexOf(editor); let targetIndex: number; - if (event.equals(Kb.LEFT_ARROW) || event.equals(Kb.UP_ARROW)) { + if (event.equals(KeyCode.LeftArrow) || event.equals(KeyCode.UpArrow)) { targetIndex = index - 1; - } else if (event.equals(Kb.RIGHT_ARROW) || event.equals(Kb.DOWN_ARROW)) { + } else if (event.equals(KeyCode.RightArrow) || event.equals(KeyCode.DownArrow)) { targetIndex = index + 1; - } else if (event.equals(Kb.HOME)) { + } else if (event.equals(KeyCode.Home)) { targetIndex = 0; } else { targetIndex = group.count - 1; diff --git a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts index 57b2453c398..9aa57c5576f 100644 --- a/src/vs/workbench/parts/debug/browser/breakpointWidget.ts +++ b/src/vs/workbench/parts/debug/browser/breakpointWidget.ts @@ -7,7 +7,7 @@ import nls = require('vs/nls'); import 'vs/css!../browser/media/breakpointWidget'; import async = require('vs/base/common/async'); import errors = require('vs/base/common/errors'); -import {CommonKeybindings, KeyCode, KeyMod} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import platform = require('vs/base/common/platform'); import lifecycle = require('vs/base/common/lifecycle'); import dom = require('vs/base/browser/dom'); @@ -102,8 +102,8 @@ export class BreakpointWidget extends ZoneWidget { }); this.toDispose.push(dom.addStandardDisposableListener(this.inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => { - const isEscape = e.equals(CommonKeybindings.ESCAPE); - const isEnter = e.equals(CommonKeybindings.ENTER); + const isEscape = e.equals(KeyCode.Escape); + const isEnter = e.equals(KeyCode.Enter); if (isEscape || isEnter) { e.stopPropagation(); wrapUp(isEnter); diff --git a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts index d9fa0dc5f4d..fb3074a129c 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugHover.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugHover.ts @@ -5,7 +5,7 @@ import lifecycle = require('vs/base/common/lifecycle'); import {TPromise} from 'vs/base/common/winjs.base'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import dom = require('vs/base/browser/dom'); import * as nls from 'vs/nls'; import {ITree} from 'vs/base/parts/tree/browser/tree'; @@ -84,7 +84,7 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget { })); this.toDispose.push(dom.addStandardDisposableListener(this.domNode, 'keydown', (e: IKeyboardEvent) => { - if (e.equals(CommonKeybindings.ESCAPE)) { + if (e.equals(KeyCode.Escape)) { this.hide(); } })); diff --git a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts index 2853f911b5c..0c264eab9f8 100644 --- a/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts +++ b/src/vs/workbench/parts/debug/electron-browser/debugViewer.ts @@ -6,7 +6,7 @@ import nls = require('vs/nls'); import {TPromise} from 'vs/base/common/winjs.base'; import lifecycle = require('vs/base/common/lifecycle'); -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import paths = require('vs/base/common/paths'); import async = require('vs/base/common/async'); import errors = require('vs/base/common/errors'); @@ -137,8 +137,8 @@ function renderRenameBox(debugService: debug.IDebugService, contextViewService: }); toDispose.push(dom.addStandardDisposableListener(inputBox.inputElement, 'keydown', (e: IKeyboardEvent) => { - const isEscape = e.equals(CommonKeybindings.ESCAPE); - const isEnter = e.equals(CommonKeybindings.ENTER); + const isEscape = e.equals(KeyCode.Escape); + const isEnter = e.equals(KeyCode.Enter); if (isEscape || isEnter) { wrapUp(isEnter); } @@ -167,10 +167,10 @@ export class BaseDebugController extends treedefaults.DefaultController { super(); if (isMacintosh) { - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_BACKSPACE, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Backspace, this.onDelete.bind(this)); } else { - this.downKeyBindingDispatcher.set(CommonKeybindings.DELETE, this.onDelete.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_DELETE, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Delete, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.Delete, this.onDelete.bind(this)); } } @@ -699,7 +699,7 @@ export class VariablesController extends BaseDebugController { constructor(debugService: debug.IDebugService, contextMenuService: IContextMenuService, actionProvider: renderer.IActionProvider) { super(debugService, contextMenuService, actionProvider); - this.downKeyBindingDispatcher.set(CommonKeybindings.ENTER, this.setSelectedExpression.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Enter, this.setSelectedExpression.bind(this)); } protected onLeftClick(tree: tree.ITree, element: any, event: IMouseEvent): boolean { @@ -924,9 +924,9 @@ export class WatchExpressionsController extends BaseDebugController { super(debugService, contextMenuService, actionProvider); if (isMacintosh) { - this.downKeyBindingDispatcher.set(CommonKeybindings.ENTER, this.onRename.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Enter, this.onRename.bind(this)); } else { - this.downKeyBindingDispatcher.set(CommonKeybindings.F2, this.onRename.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.F2, this.onRename.bind(this)); } } @@ -1230,9 +1230,9 @@ export class BreakpointsController extends BaseDebugController { constructor(debugService: debug.IDebugService, contextMenuService: IContextMenuService, actionProvider: renderer.IActionProvider) { super(debugService, contextMenuService, actionProvider); if (isMacintosh) { - this.downKeyBindingDispatcher.set(CommonKeybindings.ENTER, this.onRename.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Enter, this.onRename.bind(this)); } else { - this.downKeyBindingDispatcher.set(CommonKeybindings.F2, this.onRename.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.F2, this.onRename.bind(this)); } } diff --git a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts index 068bad9c23a..70e41699ed8 100644 --- a/src/vs/workbench/parts/files/browser/views/explorerViewer.ts +++ b/src/vs/workbench/parts/files/browser/views/explorerViewer.ts @@ -46,7 +46,7 @@ import {IInstantiationService} from 'vs/platform/instantiation/common/instantiat import {IMessageService, IConfirmation, Severity} from 'vs/platform/message/common/message'; import {IProgressService} from 'vs/platform/progress/common/progress'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {Keybinding, CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod, Keybinding} from 'vs/base/common/keyCodes'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {IMenuService, IMenu, MenuId} from 'vs/platform/actions/common/actions'; import {fillInActions} from 'vs/platform/actions/browser/menuItemActionItem'; @@ -374,11 +374,11 @@ export class FileRenderer extends ActionsRenderer implements IRenderer { const toDispose = [ inputBox, DOM.addStandardDisposableListener(inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: IKeyboardEvent) => { - if (e.equals(CommonKeybindings.ENTER)) { + if (e.equals(KeyCode.Enter)) { if (inputBox.validate()) { done(true); } - } else if (e.equals(CommonKeybindings.ESCAPE)) { + } else if (e.equals(KeyCode.Escape)) { done(false); } }), @@ -465,23 +465,23 @@ export class FileController extends DefaultController { this.didCatchEnterDown = false; - this.downKeyBindingDispatcher.set(platform.isMacintosh ? CommonKeybindings.CTRLCMD_DOWN_ARROW : CommonKeybindings.ENTER, this.onEnterDown.bind(this)); - this.upKeyBindingDispatcher.set(platform.isMacintosh ? CommonKeybindings.CTRLCMD_DOWN_ARROW : CommonKeybindings.ENTER, this.onEnterUp.bind(this)); + this.downKeyBindingDispatcher.set(platform.isMacintosh ? KeyMod.CtrlCmd | KeyCode.DownArrow : KeyCode.Enter, this.onEnterDown.bind(this)); + this.upKeyBindingDispatcher.set(platform.isMacintosh ? KeyMod.CtrlCmd | KeyCode.DownArrow : KeyCode.Enter, this.onEnterUp.bind(this)); if (platform.isMacintosh) { - this.upKeyBindingDispatcher.set(CommonKeybindings.WINCTRL_ENTER, this.onModifierEnterUp.bind(this)); // Mac: somehow Cmd+Enter does not work + this.upKeyBindingDispatcher.set(KeyMod.WinCtrl | KeyCode.Enter, this.onModifierEnterUp.bind(this)); // Mac: somehow Cmd+Enter does not work } else { - this.upKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_ENTER, this.onModifierEnterUp.bind(this)); // Mac: somehow Cmd+Enter does not work + this.upKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Enter, this.onModifierEnterUp.bind(this)); // Mac: somehow Cmd+Enter does not work } - this.downKeyBindingDispatcher.set(platform.isMacintosh ? CommonKeybindings.ENTER : CommonKeybindings.F2, this.onF2.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_C, this.onCopy.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_V, this.onPaste.bind(this)); + this.downKeyBindingDispatcher.set(platform.isMacintosh ? KeyCode.Enter : KeyCode.F2, this.onF2.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.KEY_C, this.onCopy.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.KEY_V, this.onPaste.bind(this)); if (platform.isMacintosh) { - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_UP_ARROW, this.onLeft.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_BACKSPACE, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.UpArrow, this.onLeft.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Backspace, this.onDelete.bind(this)); } else { - this.downKeyBindingDispatcher.set(CommonKeybindings.DELETE, this.onDelete.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_DELETE, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Delete, this.onDelete.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.Delete, this.onDelete.bind(this)); } this.state = state; diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts index 61a215fc59d..c208b75c5da 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesView.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesView.ts @@ -38,7 +38,7 @@ import {IInstantiationService} from 'vs/platform/instantiation/common/instantiat import {IMessageService} from 'vs/platform/message/common/message'; import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IEventService} from 'vs/platform/event/common/event'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode, KeyMod} from 'vs/base/common/keyCodes'; import {IEditorGroupService} from 'vs/workbench/services/group/common/groupService'; import {IConfigurationService} from 'vs/platform/configuration/common/configuration'; @@ -162,7 +162,7 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV $(this.commitInputBox.inputElement).on('keydown', (e:KeyboardEvent) => { var keyboardEvent = new StandardKeyboardEvent(e); - if (keyboardEvent.equals(CommonKeybindings.CTRLCMD_ENTER) || keyboardEvent.equals(CommonKeybindings.CTRLCMD_S)) { + if (keyboardEvent.equals(KeyMod.CtrlCmd | KeyCode.Enter) || keyboardEvent.equals(KeyMod.CtrlCmd | KeyCode.KEY_S)) { if (this.smartCommitAction.enabled) { this.actionRunner.run(this.smartCommitAction).done(); } else { @@ -363,7 +363,7 @@ export class ChangesView extends EventEmitter.EventEmitter implements GitView.IV return; } - if (e.payload && e.payload.origin === 'keyboard' && !(e.payload.originalEvent).equals(CommonKeybindings.ENTER)) { + if (e.payload && e.payload.origin === 'keyboard' && !(e.payload.originalEvent).equals(KeyCode.Enter)) { return; } diff --git a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts index 0cc43836d18..0a21e6357f9 100644 --- a/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts +++ b/src/vs/workbench/parts/git/browser/views/changes/changesViewer.ts @@ -27,7 +27,7 @@ import gitactions = require('vs/workbench/parts/git/browser/gitActions'); import { IContextMenuService } from 'vs/platform/contextview/browser/contextView'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; import { IMessageService } from 'vs/platform/message/common/message'; -import { CommonKeybindings } from 'vs/base/common/keyCodes'; +import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import URI from 'vs/base/common/uri'; @@ -680,10 +680,10 @@ export class Controller extends treedefaults.DefaultController { this.actionProvider = actionProvider; this.contextMenuService = contextMenuService; - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_UP_ARROW, this.onUp.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_DOWN_ARROW, this.onDown.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_PAGE_UP, this.onPageUp.bind(this)); - this.downKeyBindingDispatcher.set(CommonKeybindings.SHIFT_PAGE_DOWN, this.onPageDown.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.UpArrow, this.onUp.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.DownArrow, this.onDown.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.PageUp, this.onPageUp.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.Shift | KeyCode.PageDown, this.onPageDown.bind(this)); } protected onLeftClick(tree: tree.ITree, element: any, event: mouse.IMouseEvent): boolean { diff --git a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts index d5172a21c37..fa2ba4416e0 100644 --- a/src/vs/workbench/parts/markers/browser/markersPanelActions.ts +++ b/src/vs/workbench/parts/markers/browser/markersPanelActions.ts @@ -10,7 +10,7 @@ import { TPromise } from 'vs/base/common/winjs.base'; import { IAction, Action } from 'vs/base/common/actions'; import { BaseActionItem } from 'vs/base/browser/ui/actionbar/actionbar'; import { InputBox } from 'vs/base/browser/ui/inputbox/inputBox'; -import { CommonKeybindings, KeyCode } from 'vs/base/common/keyCodes'; +import { KeyCode } from 'vs/base/common/keyCodes'; import {IKeyboardEvent} from 'vs/base/browser/keyboardEvent'; import {IContextViewService} from 'vs/platform/contextview/browser/contextView'; import { TogglePanelAction } from 'vs/workbench/browser/panel'; @@ -140,10 +140,10 @@ export class FilterInputBoxActionItem extends BaseActionItem { // Action toolbar is swallowing some keys for action items which should not be for an input box private handleKeyboardEvent(e: IKeyboardEvent) { switch (e.keyCode) { - case CommonKeybindings.SPACE: - case CommonKeybindings.LEFT_ARROW: - case CommonKeybindings.RIGHT_ARROW: - case CommonKeybindings.ESCAPE: + case KeyCode.Space: + case KeyCode.LeftArrow: + case KeyCode.RightArrow: + case KeyCode.Escape: e.stopPropagation(); break; } diff --git a/src/vs/workbench/parts/search/browser/searchActions.ts b/src/vs/workbench/parts/search/browser/searchActions.ts index f98effd1121..02d8135fa9a 100644 --- a/src/vs/workbench/parts/search/browser/searchActions.ts +++ b/src/vs/workbench/parts/search/browser/searchActions.ts @@ -22,7 +22,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti import { OpenGlobalSettingsAction } from 'vs/workbench/browser/actions/openSettings'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry'; -import { Keybinding, KeyCode, KeyMod, CommonKeybindings } from 'vs/base/common/keyCodes'; +import { Keybinding, KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; import { asFileEditorInput } from 'vs/workbench/common/editor'; @@ -263,7 +263,7 @@ export class RemoveAction extends AbstractSearchAndReplaceAction { export class ReplaceAllAction extends AbstractSearchAndReplaceAction { public static get KEY_BINDING(): number { - return KeyMod.Shift | CommonKeybindings.CTRLCMD_ENTER; + return KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.Enter; } constructor(private viewer: ITree, private fileMatch: FileMatch, private viewlet: SearchViewlet, diff --git a/src/vs/workbench/parts/search/browser/searchResultsView.ts b/src/vs/workbench/parts/search/browser/searchResultsView.ts index 8db9d4fffa9..a6c1c6facd6 100644 --- a/src/vs/workbench/parts/search/browser/searchResultsView.ts +++ b/src/vs/workbench/parts/search/browser/searchResultsView.ts @@ -23,7 +23,7 @@ import { Match, SearchResult, FileMatch, FileMatchOrMatch, SearchModel } from 'v import { IWorkspaceContextService } from 'vs/platform/workspace/common/workspace'; import { Range } from 'vs/editor/common/core/range'; import { IKeyboardEvent } from 'vs/base/browser/keyboardEvent'; -import { CommonKeybindings } from 'vs/base/common/keyCodes'; +import { KeyCode, KeyMod } from 'vs/base/common/keyCodes'; import { SearchViewlet } from 'vs/workbench/parts/search/browser/searchViewlet'; import { RemoveAction, ReplaceAllAction, ReplaceAction } from 'vs/workbench/parts/search/browser/searchActions'; import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation'; @@ -220,16 +220,16 @@ export class SearchController extends DefaultController { super({ clickBehavior: ClickBehavior.ON_MOUSE_DOWN }); if (platform.isMacintosh) { - this.downKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_BACKSPACE, (tree: ITree, event: any) => { this.onDelete(tree, event); }); - this.upKeyBindingDispatcher.set(CommonKeybindings.WINCTRL_ENTER, this.onEnter.bind(this)); + this.downKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Backspace, (tree: ITree, event: any) => { this.onDelete(tree, event); }); + this.upKeyBindingDispatcher.set(KeyMod.WinCtrl | KeyCode.Enter, this.onEnter.bind(this)); } else { - this.downKeyBindingDispatcher.set(CommonKeybindings.DELETE, (tree: ITree, event: any) => { this.onDelete(tree, event); }); - this.upKeyBindingDispatcher.set(CommonKeybindings.CTRLCMD_ENTER, this.onEnter.bind(this)); + this.downKeyBindingDispatcher.set(KeyCode.Delete, (tree: ITree, event: any) => { this.onDelete(tree, event); }); + this.upKeyBindingDispatcher.set(KeyMod.CtrlCmd | KeyCode.Enter, this.onEnter.bind(this)); } this.downKeyBindingDispatcher.set(ReplaceAllAction.KEY_BINDING, (tree: ITree, event: any) => { this.onReplaceAll(tree, event); }); this.downKeyBindingDispatcher.set(ReplaceAction.KEY_BINDING, (tree: ITree, event: any) => { this.onReplace(tree, event); }); - this.downKeyBindingDispatcher.set(CommonKeybindings.ESCAPE, (tree: ITree, event: any) => { this.onEscape(tree, event); }); + this.downKeyBindingDispatcher.set(KeyCode.Escape, (tree: ITree, event: any) => { this.onEscape(tree, event); }); } protected onEscape(tree: ITree, event: IKeyboardEvent): boolean { diff --git a/src/vs/workbench/parts/search/browser/searchViewlet.ts b/src/vs/workbench/parts/search/browser/searchViewlet.ts index b7647e3412e..d33bd665e66 100644 --- a/src/vs/workbench/parts/search/browser/searchViewlet.ts +++ b/src/vs/workbench/parts/search/browser/searchViewlet.ts @@ -46,7 +46,7 @@ import {IWorkspaceContextService} from 'vs/platform/workspace/common/workspace'; import {IKeybindingService} from 'vs/platform/keybinding/common/keybinding'; import {IContextKeyService, IContextKey} from 'vs/platform/contextkey/common/contextkey'; import {ITelemetryService} from 'vs/platform/telemetry/common/telemetry'; -import {KeyCode, CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; import { PatternInputWidget } from 'vs/workbench/parts/search/browser/patternInputWidget'; import { SearchRenderer, SearchDataSource, SearchSorter, SearchController, SearchAccessibilityProvider, SearchFilter } from 'vs/workbench/parts/search/browser/searchResultsView'; import { SearchWidget } from 'vs/workbench/parts/search/browser/searchWidget'; @@ -156,7 +156,7 @@ export class SearchViewlet extends Viewlet { }).on(dom.EventType.KEY_UP, (e: KeyboardEvent) => { let event = new StandardKeyboardEvent(e); - if (event.equals(CommonKeybindings.ENTER) || event.equals(CommonKeybindings.SPACE)) { + if (event.equals(KeyCode.Enter) || event.equals(KeyCode.Space)) { dom.EventHelper.stop(e); this.toggleFileTypes(); } diff --git a/src/vs/workbench/services/message/browser/messagelist/messageList.ts b/src/vs/workbench/services/message/browser/messagelist/messageList.ts index 2ec9067bd48..c58329b2a1d 100644 --- a/src/vs/workbench/services/message/browser/messagelist/messageList.ts +++ b/src/vs/workbench/services/message/browser/messagelist/messageList.ts @@ -17,7 +17,7 @@ import Event, {Emitter} from 'vs/base/common/event'; import {Action} from 'vs/base/common/actions'; import htmlRenderer = require('vs/base/browser/htmlContentRenderer'); import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent'; -import {CommonKeybindings} from 'vs/base/common/keyCodes'; +import {KeyCode} from 'vs/base/common/keyCodes'; export enum Severity { Info, @@ -212,7 +212,7 @@ export class MessageList { div.a({ class: 'action-button', tabindex: '0', role: 'button' }).text(action.label).on([DOM.EventType.CLICK, DOM.EventType.KEY_DOWN], (e) => { if (e instanceof KeyboardEvent) { const event = new StandardKeyboardEvent(e); - if (!event.equals(CommonKeybindings.ENTER) && !event.equals(CommonKeybindings.SPACE)) { + if (!event.equals(KeyCode.Enter) && !event.equals(KeyCode.Space)) { return; // Only handle Enter/Escape for keyboard access } }