Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2416f60c
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,发现更多精彩内容 >>
提交
2416f60c
编写于
3月 23, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue in resolveUserBinding
上级
a03a09b4
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
77 addition
and
7 deletion
+77
-7
src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
...ench/services/keybinding/common/macLinuxKeyboardMapper.ts
+10
-6
src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
...es/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
+23
-1
src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts
...h/services/keybinding/test/macLinuxKeyboardMapper.test.ts
+22
-0
src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
...ch/services/keybinding/test/windowsKeyboardMapper.test.ts
+22
-0
未找到文件。
src/vs/workbench/services/keybinding/common/macLinuxKeyboardMapper.ts
浏览文件 @
2416f60c
...
...
@@ -932,17 +932,21 @@ export class MacLinuxKeyboardMapper implements IKeyboardMapper {
return
this
.
simpleKeybindingToScanCodeBinding
(
binding
);
}
public
resolveUserBinding
(
firstPart
:
SimpleKeybinding
|
ScanCodeBinding
,
chordPart
:
SimpleKeybinding
|
ScanCodeBinding
):
ResolvedKeybinding
[]
{
const
firstParts
=
this
.
_resolveSimpleUserBinding
(
firstPart
);
const
chordParts
=
this
.
_resolveSimpleUserBinding
(
chordPart
);
public
resolveUserBinding
(
_firstPart
:
SimpleKeybinding
|
ScanCodeBinding
,
_
chordPart
:
SimpleKeybinding
|
ScanCodeBinding
):
ResolvedKeybinding
[]
{
const
firstParts
=
this
.
_resolveSimpleUserBinding
(
_
firstPart
);
const
chordParts
=
this
.
_resolveSimpleUserBinding
(
_
chordPart
);
let
result
:
NativeResolvedKeybinding
[]
=
[],
resultLen
=
0
;
for
(
let
i
=
0
,
len
=
firstParts
.
length
;
i
<
len
;
i
++
)
{
const
firstPart
=
firstParts
[
i
];
for
(
let
j
=
0
,
lenJ
=
chordParts
.
length
;
j
<
lenJ
;
j
++
)
{
const
chordPart
=
chordParts
[
j
];
if
(
_chordPart
)
{
for
(
let
j
=
0
,
lenJ
=
chordParts
.
length
;
j
<
lenJ
;
j
++
)
{
const
chordPart
=
chordParts
[
j
];
result
[
resultLen
++
]
=
new
NativeResolvedKeybinding
(
this
,
this
.
_OS
,
firstPart
,
chordPart
);
result
[
resultLen
++
]
=
new
NativeResolvedKeybinding
(
this
,
this
.
_OS
,
firstPart
,
chordPart
);
}
}
else
{
result
[
resultLen
++
]
=
new
NativeResolvedKeybinding
(
this
,
this
.
_OS
,
firstPart
,
null
);
}
}
return
result
;
...
...
src/vs/workbench/services/keybinding/test/macLinuxFallbackKeyboardMapper.test.ts
浏览文件 @
2416f60c
...
...
@@ -119,7 +119,7 @@ suite('keyboardMapper - MAC fallback', () => {
});
});
suite
(
'
keyboardMapper -
MAC
fallback
'
,
()
=>
{
suite
(
'
keyboardMapper -
LINUX
fallback
'
,
()
=>
{
let
mapper
=
new
MacLinuxFallbackKeyboardMapper
({},
OperatingSystem
.
Linux
);
...
...
@@ -224,4 +224,26 @@ suite('keyboardMapper - MAC fallback', () => {
}]
);
});
test
(
'
resolveUserBinding Ctrl+[Comma]
'
,
()
=>
{
assertResolveUserBinding
(
mapper
,
new
ScanCodeBinding
(
true
,
false
,
false
,
false
,
ScanCode
.
Comma
),
null
,
[{
label
:
'
Ctrl+,
'
,
ariaLabel
:
'
Control+,
'
,
HTMLLabel
:
[
_simpleHTMLLabel
([
'
Ctrl
'
,
'
,
'
])],
electronAccelerator
:
'
Ctrl+,
'
,
userSettingsLabel
:
'
ctrl+,
'
,
isWYSIWYG
:
true
,
isChord
:
false
,
hasCtrlModifier
:
true
,
hasShiftModifier
:
false
,
hasAltModifier
:
false
,
hasMetaModifier
:
false
,
dispatchParts
:
[
'
ctrl+,
'
,
null
],
}]
);
});
});
src/vs/workbench/services/keybinding/test/macLinuxKeyboardMapper.test.ts
浏览文件 @
2416f60c
...
...
@@ -1232,6 +1232,28 @@ suite('keyboardMapper - LINUX en_us', () => {
}]
);
});
test
(
'
resolveUserBinding Ctrl+[Comma]
'
,
()
=>
{
assertResolveUserBinding
(
mapper
,
new
ScanCodeBinding
(
true
,
false
,
false
,
false
,
ScanCode
.
Comma
),
null
,
[{
label
:
'
Ctrl+,
'
,
ariaLabel
:
'
Control+,
'
,
HTMLLabel
:
[
_simpleHTMLLabel
([
'
Ctrl
'
,
'
,
'
])],
electronAccelerator
:
'
Ctrl+,
'
,
userSettingsLabel
:
'
ctrl+,
'
,
isWYSIWYG
:
true
,
isChord
:
false
,
hasCtrlModifier
:
true
,
hasShiftModifier
:
false
,
hasAltModifier
:
false
,
hasMetaModifier
:
false
,
dispatchParts
:
[
'
ctrl+[Comma]
'
,
null
],
}]
);
});
});
function
_assertKeybindingTranslation
(
mapper
:
MacLinuxKeyboardMapper
,
OS
:
OperatingSystem
,
kb
:
number
,
_expected
:
string
|
string
[]):
void
{
...
...
src/vs/workbench/services/keybinding/test/windowsKeyboardMapper.test.ts
浏览文件 @
2416f60c
...
...
@@ -430,4 +430,26 @@ suite('keyboardMapper - WINDOWS en_us', () => {
}]
);
});
test
(
'
resolveUserBinding Ctrl+[Comma]
'
,
()
=>
{
assertResolveUserBinding
(
mapper
,
new
ScanCodeBinding
(
true
,
false
,
false
,
false
,
ScanCode
.
Comma
),
null
,
[{
label
:
'
Ctrl+,
'
,
ariaLabel
:
'
Control+,
'
,
HTMLLabel
:
[
_simpleHTMLLabel
([
'
Ctrl
'
,
'
,
'
])],
electronAccelerator
:
'
Ctrl+,
'
,
userSettingsLabel
:
'
ctrl+,
'
,
isWYSIWYG
:
true
,
isChord
:
false
,
hasCtrlModifier
:
true
,
hasShiftModifier
:
false
,
hasAltModifier
:
false
,
hasMetaModifier
:
false
,
dispatchParts
:
[
'
ctrl+,
'
,
null
],
}]
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录