Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
05ee54fc
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
05ee54fc
编写于
7月 06, 2016
作者:
J
João Moreno
提交者:
GitHub
7月 06, 2016
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #7316 from elemongw/master
On mac ctrl-n should behave exactly like DownArrow
上级
ce6cf7b1
3a52eb26
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
7 deletion
+31
-7
src/vs/base/common/keyCodes.ts
src/vs/base/common/keyCodes.ts
+2
-0
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
src/vs/base/parts/quickopen/browser/quickOpenWidget.ts
+19
-1
src/vs/editor/contrib/parameterHints/browser/parameterHints.ts
...s/editor/contrib/parameterHints/browser/parameterHints.ts
+4
-2
src/vs/editor/contrib/quickFix/browser/quickFix.ts
src/vs/editor/contrib/quickFix/browser/quickFix.ts
+2
-2
src/vs/editor/contrib/suggest/browser/suggest.ts
src/vs/editor/contrib/suggest/browser/suggest.ts
+4
-2
未找到文件。
src/vs/base/common/keyCodes.ts
浏览文件 @
05ee54fc
...
...
@@ -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
浏览文件 @
05ee54fc
...
...
@@ -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
浏览文件 @
05ee54fc
...
...
@@ -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
]
}
});
\ No newline at end of file
src/vs/editor/contrib/quickFix/browser/quickFix.ts
浏览文件 @
05ee54fc
...
...
@@ -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
浏览文件 @
05ee54fc
...
...
@@ -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
({
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录