Skip to content

Commit 59fb847

Browse files
elemongwelemongw
committed
On mac ctrl-n should behave exactly like DownArrow
The same is true for ctrl-p and UpArrow. This fixes that
1 parent befd696 commit 59fb847

3 files changed

Lines changed: 10 additions & 6 deletions

File tree

‎src/vs/editor/contrib/parameterHints/browser/parameterHints.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ KeybindingsRegistry.registerCommandDesc({
113113
weight,
114114
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(Context.Visible), KbExpr.has(Context.MultipleSignatures)),
115115
primary: KeyCode.UpArrow,
116-
secondary: [KeyMod.Alt | KeyCode.UpArrow]
116+
secondary: [KeyMod.Alt | KeyCode.UpArrow],
117+
mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.Alt | KeyCode.UpArrow, KeyMod.WinCtrl | KeyCode.KEY_P] }
117118
});
118119

119120
KeybindingsRegistry.registerCommandDesc({
@@ -122,5 +123,6 @@ KeybindingsRegistry.registerCommandDesc({
122123
weight,
123124
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(Context.Visible), KbExpr.has(Context.MultipleSignatures)),
124125
primary: KeyCode.DownArrow,
125-
secondary: [KeyMod.Alt | KeyCode.DownArrow]
126+
secondary: [KeyMod.Alt | KeyCode.DownArrow],
127+
mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.Alt | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KEY_N] }
126128
});

‎src/vs/editor/contrib/quickFix/browser/quickFix.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,15 +153,15 @@ CommonEditorRegistry.registerEditorCommand('closeQuickFixWidget', weight, { prim
153153
var controller = QuickFixController.getQuickFixController(editor);
154154
controller.closeWidget();
155155
});
156-
CommonEditorRegistry.registerEditorCommand('selectNextQuickFix', weight, { primary: KeyCode.DownArrow }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
156+
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) => {
157157
var controller = QuickFixController.getQuickFixController(editor);
158158
controller.selectNextSuggestion();
159159
});
160160
CommonEditorRegistry.registerEditorCommand('selectNextPageQuickFix', weight, { primary: KeyCode.PageDown }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
161161
var controller = QuickFixController.getQuickFixController(editor);
162162
controller.selectNextPageSuggestion();
163163
});
164-
CommonEditorRegistry.registerEditorCommand('selectPrevQuickFix', weight, { primary: KeyCode.UpArrow }, false, CONTEXT_QUICK_FIX_WIDGET_VISIBLE,(ctx, editor, args) => {
164+
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) => {
165165
var controller = QuickFixController.getQuickFixController(editor);
166166
controller.selectPrevSuggestion();
167167
});

‎src/vs/editor/contrib/suggest/browser/suggest.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,8 @@ KeybindingsRegistry.registerCommandDesc({
252252
weight,
253253
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(SuggestContext.Visible), KbExpr.has(SuggestContext.MultipleSuggestions)),
254254
primary: KeyCode.DownArrow,
255-
secondary: [KeyMod.Alt | KeyCode.DownArrow]
255+
secondary: [KeyMod.Alt | KeyCode.DownArrow],
256+
mac: { primary: KeyCode.DownArrow, secondary: [KeyMod.Alt | KeyCode.DownArrow, KeyMod.WinCtrl | KeyCode.KEY_N] }
256257
});
257258

258259
KeybindingsRegistry.registerCommandDesc({
@@ -270,7 +271,8 @@ KeybindingsRegistry.registerCommandDesc({
270271
weight,
271272
when: KbExpr.and(KbExpr.has(KEYBINDING_CONTEXT_EDITOR_TEXT_FOCUS), KbExpr.has(SuggestContext.Visible), KbExpr.has(SuggestContext.MultipleSuggestions)),
272273
primary: KeyCode.UpArrow,
273-
secondary: [KeyMod.Alt | KeyCode.UpArrow]
274+
secondary: [KeyMod.Alt | KeyCode.UpArrow],
275+
mac: { primary: KeyCode.UpArrow, secondary: [KeyMod.Alt | KeyCode.UpArrow, KeyMod.WinCtrl | KeyCode.KEY_P] }
274276
});
275277

276278
KeybindingsRegistry.registerCommandDesc({

0 commit comments

Comments
 (0)