Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-09-13 22:12:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7316 from elemongw/master

Browse Source 
On mac ctrl-n should behave exactly like DownArrow
This commit is contained in:
João Moreno
2016-07-06 15:54:05 +02:00
committed by GitHub
parent ce6cf7b1e8 3a52eb2614
commit 05ee54fc52
5 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/base/common/keyCodes.ts
+2
View File
@@ -492,10 +492,12 @@ export class CommonKeybindings {
public static CTRLCMD_BACKSPACE: number = KeyMod.CtrlCmd | KeyCode.Backspace;
public static UP_ARROW: number = KeyCode.UpArrow;
public static WINCTRL_P: number = KeyMod.WinCtrl | KeyCode.KEY_P;
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 WINCTRL_N: number = KeyMod.WinCtrl | KeyCode.KEY_N;
public static SHIFT_DOWN_ARROW: number = KeyMod.Shift | KeyCode.DownArrow;
public static CTRLCMD_DOWN_ARROW: number = KeyMod.CtrlCmd | KeyCode.DownArrow;
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+19 -1
View File
@@ -25,7 +25,7 @@ import {StandardKeyboardEvent} from 'vs/base/browser/keyboardEvent';
import {DefaultController, ClickBehavior} from 'vs/base/parts/tree/browser/treeDefaults';
import DOM = require('vs/base/browser/dom');
import {IActionProvider} from 'vs/base/parts/tree/browser/actionsRenderer';
import {KeyCode, KeyMod} from 'vs/base/common/keyCodes';
import {KeyCode, KeyMod, CommonKeybindings} from 'vs/base/common/keyCodes';
import {IDisposable, dispose} from 'vs/base/common/lifecycle';
import {ScrollbarVisibility} from 'vs/base/browser/ui/scrollbar/scrollableElementOptions';
@@ -155,6 +155,15 @@ export class QuickOpenWidget implements IModelProvider {
DOM.addDisposableListener(this.inputBox.inputElement, DOM.EventType.KEY_DOWN, (e: KeyboardEvent) => {
let keyboardEvent: StandardKeyboardEvent = new StandardKeyboardEvent(e);
if (platform.isMacintosh) {
if (keyboardEvent.equals(CommonKeybindings.WINCTRL_N)) {
keyboardEvent.keyCode = KeyCode.DownArrow;
}
else if (keyboardEvent.equals(CommonKeybindings.WINCTRL_P)) {
keyboardEvent.keyCode = KeyCode.UpArrow;
}
}
// Do not handle Tab: It is used to navigate between elements without mouse
if (keyboardEvent.keyCode === KeyCode.Tab) {
return;
@@ -227,6 +236,15 @@ export class QuickOpenWidget implements IModelProvider {
return;
}
if (platform.isMacintosh) {
if (keyboardEvent.equals(CommonKeybindings.WINCTRL_N)) {
keyboardEvent.keyCode = KeyCode.DownArrow;
}
else if (keyboardEvent.equals(CommonKeybindings.WINCTRL_P)) {
keyboardEvent.keyCode = KeyCode.UpArrow;
}
}
// Support keyboard navigation in quick navigation mode
if (keyboardEvent.keyCode === KeyCode.DownArrow || keyboardEvent.keyCode === KeyCode.UpArrow || keyboardEvent.keyCode === KeyCode.PageDown || keyboardEvent.keyCode === KeyCode.PageUp) {
DOM.EventHelper.stop(e, true);
src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
+4 -2
View File
@@ -113,7 +113,8 @@ KeybindingsRegistry.registerCommandDesc({
weight,
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(Context.Visible), KbExpr.has(Context.MultipleSignatures)),
primary: KeyCode.UpArrow,
secondary: [KeyMod.Alt | KeyCode.UpArrow]
secondary: [KeyMod.Alt | KeyCode.UpArrow],
mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.Alt | KeyCode.UpArrow, KeyMod.WinCtrl | KeyCode.KEY_P] }
});
KeybindingsRegistry.registerCommandDesc({
@@ -122,5 +123,6 @@ KeybindingsRegistry.registerCommandDesc({
weight,
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(Context.Visible), KbExpr.has(Context.MultipleSignatures)),
primary: KeyCode.DownArrow,
secondary: [KeyMod.Alt | KeyCode.DownArrow]
secondary: [KeyMod.Alt | KeyCode.DownArrow],
mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.Alt | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KEY_N] }
});
src/vs/editor/contrib/quickFix/browser/quickFix.ts
+2 -2
View File
@@ -151,7 +151,7 @@ CommonEditorRegistry.registerEditorCommand('closeQuickFixWidget', weight, { prim
var controller = QuickFixController.getQuickFixController(editor);
controller.closeWidget();
});
CommonEditorRegistry.registerEditorCommand('selectNextQuickFix', weight, { primary: KeyCode.DownArrow }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
CommonEditorRegistry.registerEditorCommand('selectNextQuickFix', weight, { primary: KeyCode.DownArrow , mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.WinCtrl | KeyCode.KEY_N] } }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
var controller = QuickFixController.getQuickFixController(editor);
controller.selectNextSuggestion();
});
@@ -159,7 +159,7 @@ CommonEditorRegistry.registerEditorCommand('selectNextPageQuickFix', weight, { p
var controller = QuickFixController.getQuickFixController(editor);
controller.selectNextPageSuggestion();
});
CommonEditorRegistry.registerEditorCommand('selectPrevQuickFix', weight, { primary: KeyCode.UpArrow }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
CommonEditorRegistry.registerEditorCommand('selectPrevQuickFix', weight, { primary: KeyCode.UpArrow , mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.WinCtrl | KeyCode.KEY_P] }}, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
var controller = QuickFixController.getQuickFixController(editor);
controller.selectPrevSuggestion();
});
src/vs/editor/contrib/suggest/browser/suggest.ts
+4 -2
View File
@@ -252,7 +252,8 @@ KeybindingsRegistry.registerCommandDesc({
weight,
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(SuggestContext.Visible), KbExpr.has(SuggestContext.MultipleSuggestions)),
primary: KeyCode.DownArrow,
secondary: [KeyMod.Alt | KeyCode.DownArrow]
secondary: [KeyMod.Alt | KeyCode.DownArrow],
mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.Alt | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KEY_N] }
});
KeybindingsRegistry.registerCommandDesc({
@@ -270,7 +271,8 @@ KeybindingsRegistry.registerCommandDesc({
weight,
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(SuggestContext.Visible), KbExpr.has(SuggestContext.MultipleSuggestions)),
primary: KeyCode.UpArrow,
secondary: [KeyMod.Alt | KeyCode.UpArrow]
secondary: [KeyMod.Alt | KeyCode.UpArrow],
mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.Alt | KeyCode.UpArrow, KeyMod.WinCtrl | KeyCode.KEY_P] }
});
KeybindingsRegistry.registerCommandDesc({