From da22b140fbb5fefbc87f40c9b266a40de69c14c5 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Fri, 25 May 2018 16:12:36 +0200 Subject: [PATCH] grid - some cleanup --- src/vs/base/browser/ui/list/listView.ts | 2 +- src/vs/base/common/map.ts | 2 +- src/vs/code/electron-main/menus.ts | 8 ++++---- src/vs/workbench/browser/parts/editor/editorCommands.ts | 8 ++++---- .../terminal/electron-browser/terminal.contribution.ts | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/vs/base/browser/ui/list/listView.ts b/src/vs/base/browser/ui/list/listView.ts index 192b209d658..808cccb229c 100644 --- a/src/vs/base/browser/ui/list/listView.ts +++ b/src/vs/base/browser/ui/list/listView.ts @@ -346,7 +346,7 @@ export class ListView implements ISpliceable, IDisposable { @memoize get onMouseMove(): Event> { return filterEvent(mapEvent(domEvent(this.domNode, 'mousemove'), e => this.toMouseEvent(e)), e => e.index >= 0); } @memoize get onMouseOut(): Event> { return filterEvent(mapEvent(domEvent(this.domNode, 'mouseout'), e => this.toMouseEvent(e)), e => e.index >= 0); } @memoize get onContextMenu(): Event> { return filterEvent(mapEvent(domEvent(this.domNode, 'contextmenu'), e => this.toMouseEvent(e)), e => e.index >= 0); } - @memoize get onTouchStart(): Event> { return filterEvent(mapEvent(domEvent(this.domNode, 'touchstart'), e => this.toTouchEvent(e as any)), e => e.index >= 0); } + @memoize get onTouchStart(): Event> { return filterEvent(mapEvent(domEvent(this.domNode, 'touchstart'), e => this.toTouchEvent(e)), e => e.index >= 0); } @memoize get onTap(): Event> { return filterEvent(mapEvent(domEvent(this.rowsContainer, TouchEventType.Tap), e => this.toGestureEvent(e)), e => e.index >= 0); } private toMouseEvent(browserEvent: MouseEvent): IListMouseEvent { diff --git a/src/vs/base/common/map.ts b/src/vs/base/common/map.ts index db0b57d77dc..e234c796330 100644 --- a/src/vs/base/common/map.ts +++ b/src/vs/base/common/map.ts @@ -440,7 +440,7 @@ export class ResourceMap { public clone(): ResourceMap { const resourceMap = new ResourceMap(); - resourceMap.map.forEach((value, key) => resourceMap.map.set(key, value)); + this.map.forEach((value, key) => resourceMap.map.set(key, value)); return resourceMap; } diff --git a/src/vs/code/electron-main/menus.ts b/src/vs/code/electron-main/menus.ts index 073d2f896c5..a23b42e9f61 100644 --- a/src/vs/code/electron-main/menus.ts +++ b/src/vs/code/electron-main/menus.ts @@ -664,10 +664,10 @@ export class CodeMenu { const editorLayoutMenu = new Menu(); - const splitEditorUp = this.createMenuItem(nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up"), 'splitEditor.up'); - const splitEditorDown = this.createMenuItem(nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down"), 'splitEditor.down'); - const splitEditorLeft = this.createMenuItem(nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left"), 'splitEditor.left'); - const splitEditorRight = this.createMenuItem(nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right"), 'splitEditor.right'); + const splitEditorUp = this.createMenuItem(nls.localize({ key: 'miSplitEditorUp', comment: ['&& denotes a mnemonic'] }, "Split &&Up"), 'workbench.action.splitEditorUp'); + const splitEditorDown = this.createMenuItem(nls.localize({ key: 'miSplitEditorDown', comment: ['&& denotes a mnemonic'] }, "Split &&Down"), 'workbench.action.splitEditorDown'); + const splitEditorLeft = this.createMenuItem(nls.localize({ key: 'miSplitEditorLeft', comment: ['&& denotes a mnemonic'] }, "Split &&Left"), 'workbench.action.splitEditorLeft'); + const splitEditorRight = this.createMenuItem(nls.localize({ key: 'miSplitEditorRight', comment: ['&& denotes a mnemonic'] }, "Split &&Right"), 'workbench.action.splitEditorRight'); const singleColumnEditorLayout = this.createMenuItem(nls.localize({ key: 'miSingleColumnEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Single"), 'workbench.action.editorLayoutSingle'); const centeredEditorLayout = this.createMenuItem(nls.localize({ key: 'miCenteredEditorLayout', comment: ['&& denotes a mnemonic'] }, "&&Centered"), 'workbench.action.editorLayoutCentered'); diff --git a/src/vs/workbench/browser/parts/editor/editorCommands.ts b/src/vs/workbench/browser/parts/editor/editorCommands.ts index 4d4f4a20ad3..5e3adf1db62 100644 --- a/src/vs/workbench/browser/parts/editor/editorCommands.ts +++ b/src/vs/workbench/browser/parts/editor/editorCommands.ts @@ -37,10 +37,10 @@ export const KEEP_EDITOR_COMMAND_ID = 'workbench.action.keepEditor'; export const SHOW_EDITORS_IN_GROUP = 'workbench.action.showEditorsInGroup'; export const TOGGLE_DIFF_INLINE_MODE = 'toggle.diff.editorMode'; -export const SPLIT_EDITOR_UP = 'splitEditor.up'; -export const SPLIT_EDITOR_DOWN = 'splitEditor.down'; -export const SPLIT_EDITOR_LEFT = 'splitEditor.left'; -export const SPLIT_EDITOR_RIGHT = 'splitEditor.right'; +export const SPLIT_EDITOR_UP = 'workbench.action.splitEditorUp'; +export const SPLIT_EDITOR_DOWN = 'workbench.action.splitEditorDown'; +export const SPLIT_EDITOR_LEFT = 'workbench.action.splitEditorLeft'; +export const SPLIT_EDITOR_RIGHT = 'workbench.action.splitEditorRight'; export const NAVIGATE_ALL_EDITORS_GROUP_PREFIX = 'edt '; export const NAVIGATE_IN_ACTIVE_GROUP_PREFIX = 'edt active '; diff --git a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts index c1b8fd886ba..c2a50a00cf4 100644 --- a/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts +++ b/src/vs/workbench/parts/terminal/electron-browser/terminal.contribution.ts @@ -217,7 +217,6 @@ configurationRegistry.registerConfiguration({ }, 'default': [ ToggleTabFocusModeAction.ID, - FocusActiveGroupAction.ID, QUICKOPEN_ACTION_ID, QUICKOPEN_FOCUS_SECONDARY_ACTION_ID, ShowAllCommandsAction.ID, @@ -274,6 +273,7 @@ configurationRegistry.registerConfiguration({ debugActions.StepOverAction.ID, OpenNextRecentlyUsedEditorInGroupAction.ID, OpenPreviousRecentlyUsedEditorInGroupAction.ID, + FocusActiveGroupAction.ID, FocusFirstGroupAction.ID, FocusLastGroupAction.ID, OpenFirstEditorInGroup.ID,