From c96af39bfbc9369b3cfc1d26873f45007eb0d0bc Mon Sep 17 00:00:00 2001 From: Alex Dima Date: Fri, 27 Nov 2015 12:04:31 +0100 Subject: [PATCH] Improve default linux keybindings for move lines and add cursors --- src/vs/editor/common/config/config.ts | 6 ++++-- .../contrib/linesOperations/common/linesOperations.ts | 4 ++-- .../editor/contrib/multicursor/common/multicursor.ts | 10 ++++++++-- .../platform/keybinding/common/keybindingsRegistry.ts | 5 ----- 4 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/vs/editor/common/config/config.ts b/src/vs/editor/common/config/config.ts index 1f8133a8907..0d9e02fe0dd 100644 --- a/src/vs/editor/common/config/config.ts +++ b/src/vs/editor/common/config/config.ts @@ -155,7 +155,8 @@ registerCoreCommand(H.CursorUp, { registerCoreCommand(H.CursorUpSelect, { primary: KeyMod.Shift | KeyCode.UpArrow, secondary: [getWordNavigationKB(true, KeyCode.UpArrow)], - mac: { primary: KeyMod.Shift | KeyCode.UpArrow } + mac: { primary: KeyMod.Shift | KeyCode.UpArrow }, + linux: { primary: KeyMod.Shift | KeyCode.UpArrow } }); registerCoreCommand(H.CursorDown, { primary: KeyCode.DownArrow, @@ -164,7 +165,8 @@ registerCoreCommand(H.CursorDown, { registerCoreCommand(H.CursorDownSelect, { primary: KeyMod.Shift | KeyCode.DownArrow, secondary: [getWordNavigationKB(true, KeyCode.DownArrow)], - mac: { primary: KeyMod.Shift | KeyCode.DownArrow } + mac: { primary: KeyMod.Shift | KeyCode.DownArrow }, + linux: { primary: KeyMod.Shift | KeyCode.DownArrow } }); registerCoreCommand(H.CursorPageUp, { primary: KeyCode.PageUp diff --git a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts index e68ea47b55d..a451fd9df4c 100644 --- a/src/vs/editor/contrib/linesOperations/common/linesOperations.ts +++ b/src/vs/editor/contrib/linesOperations/common/linesOperations.ts @@ -242,12 +242,12 @@ CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(TrimTrailin CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(MoveLinesDownAction, MoveLinesDownAction.ID, nls.localize('lines.moveDown', "Move Line Down"), { context: ContextKey.EditorTextFocus, primary: KeyMod.Alt | KeyCode.DownArrow, - linux: { primary: KeyMod.CtrlCmd | KeyCode.DownArrow } + linux: { primary: KeyMod.Alt | KeyCode.DownArrow } })); CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(MoveLinesUpAction, MoveLinesUpAction.ID, nls.localize('lines.moveUp', "Move Line Up"), { context: ContextKey.EditorTextFocus, primary: KeyMod.Alt | KeyCode.UpArrow, - linux: { primary: KeyMod.CtrlCmd | KeyCode.UpArrow } + linux: { primary: KeyMod.Alt | KeyCode.UpArrow } })); CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(CopyLinesDownAction, CopyLinesDownAction.ID, nls.localize('lines.copyDown', "Copy Line Down"), { context: ContextKey.EditorTextFocus, diff --git a/src/vs/editor/contrib/multicursor/common/multicursor.ts b/src/vs/editor/contrib/multicursor/common/multicursor.ts index e9e173fd690..0efb91e4821 100644 --- a/src/vs/editor/contrib/multicursor/common/multicursor.ts +++ b/src/vs/editor/contrib/multicursor/common/multicursor.ts @@ -32,10 +32,16 @@ class InsertCursorBelow extends HandlerEditorAction { CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(InsertCursorAbove, InsertCursorAbove.ID, nls.localize('mutlicursor.insertAbove', "Insert Cursor Above"), { context: ContextKey.EditorTextFocus, primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.UpArrow, - linux: { primary: KeyMod.CtrlCmd| KeyMod.WinCtrl | KeyCode.UpArrow } + linux: { + primary: KeyMod.Shift | KeyMod.Alt | KeyCode.UpArrow, + secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.UpArrow] + } })); CommonEditorRegistry.registerEditorAction(new EditorActionDescriptor(InsertCursorBelow, InsertCursorBelow.ID, nls.localize('mutlicursor.insertBelow', "Insert Cursor Below"), { context: ContextKey.EditorTextFocus, primary: KeyMod.CtrlCmd | KeyMod.Alt | KeyCode.DownArrow, - linux: { primary: KeyMod.CtrlCmd| KeyMod.WinCtrl | KeyCode.DownArrow } + linux: { + primary: KeyMod.Shift | KeyMod.Alt | KeyCode.DownArrow, + secondary: [KeyMod.CtrlCmd | KeyMod.Shift | KeyCode.DownArrow] + } })); diff --git a/src/vs/platform/keybinding/common/keybindingsRegistry.ts b/src/vs/platform/keybinding/common/keybindingsRegistry.ts index b391a7daea9..65ac634a595 100644 --- a/src/vs/platform/keybinding/common/keybindingsRegistry.ts +++ b/src/vs/platform/keybinding/common/keybindingsRegistry.ts @@ -103,11 +103,6 @@ class KeybindingsRegistryImpl implements IKeybindingsRegistry { } } } - if (Platform.isLinux) { - if (!BinaryKeybindings.hasCtrlCmd(keybinding) && !BinaryKeybindings.hasShift(keybinding) && BinaryKeybindings.hasAlt(keybinding) && !BinaryKeybindings.hasWinCtrl(keybinding)) { - console.warn('Alt+ keybindings should not be used by default under Linux. Offender: ', keybinding, ' for ', commandId); - } - } this._keybindings.push({ keybinding: keybinding, command: commandId, -- GitLab