Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
172991e2
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
172991e2
编写于
8月 30, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #32993
上级
5e27e57a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
3 deletion
+14
-3
src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
...kbench/parts/preferences/common/keybindingsEditorModel.ts
+1
-1
src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
...ts/preferences/test/common/keybindingsEditorModel.test.ts
+13
-2
未找到文件。
src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
浏览文件 @
172991e2
...
...
@@ -385,7 +385,7 @@ class KeybindingItemMatches {
return
false
;
}
const
ariaLabel
=
keybinding
.
keyAriaLabel
;
if
(
ariaLabel
.
length
===
1
||
word
.
length
===
1
)
{
if
(
this
.
completeMatch
||
ariaLabel
.
length
===
1
||
word
.
length
===
1
)
{
if
(
strings
.
compareIgnoreCase
(
ariaLabel
,
word
)
===
0
)
{
return
true
;
}
...
...
src/vs/workbench/parts/preferences/test/common/keybindingsEditorModel.test.ts
浏览文件 @
172991e2
...
...
@@ -520,7 +520,7 @@ suite('Keybindings Editor Model test', () => {
prepareKeybindingService
(
expected
,
aResolvedKeybindingItem
({
command
,
firstPart
:
{
keyCode
:
KeyCode
.
KEY_C
,
modifiers
:
{
ctrlKey
:
true
}
},
when
:
'
whenContext1 && whenContext2
'
,
isDefault
:
false
}));
return
testObject
.
resolve
().
then
(()
=>
{
const
actual
=
testObject
.
fetch
(
'
"shift meta esc ctrl c"
'
).
filter
(
element
=>
element
.
keybindingItem
.
command
===
command
);
const
actual
=
testObject
.
fetch
(
'
"shift meta esc
ape
ctrl c"
'
).
filter
(
element
=>
element
.
keybindingItem
.
command
===
command
);
assert
.
equal
(
1
,
actual
.
length
);
assert
.
deepEqual
(
actual
[
0
].
keybindingMatches
.
firstPart
,
{
shiftKey
:
true
,
metaKey
:
true
,
keyCode
:
true
});
assert
.
deepEqual
(
actual
[
0
].
keybindingMatches
.
chordPart
,
{
ctrlKey
:
true
,
keyCode
:
true
});
...
...
@@ -558,13 +558,24 @@ suite('Keybindings Editor Model test', () => {
prepareKeybindingService
(
expected
,
aResolvedKeybindingItem
({
command
,
firstPart
:
{
keyCode
:
KeyCode
.
KEY_C
,
modifiers
:
{
ctrlKey
:
true
}
},
when
:
'
whenContext1 && whenContext2
'
,
isDefault
:
false
}));
return
testObject
.
resolve
().
then
(()
=>
{
const
actual
=
testObject
.
fetch
(
'
"shift+meta+esc ctrl+c"
'
).
filter
(
element
=>
element
.
keybindingItem
.
command
===
command
);
const
actual
=
testObject
.
fetch
(
'
"shift+meta+esc
ape
ctrl+c"
'
).
filter
(
element
=>
element
.
keybindingItem
.
command
===
command
);
assert
.
equal
(
1
,
actual
.
length
);
assert
.
deepEqual
(
actual
[
0
].
keybindingMatches
.
firstPart
,
{
shiftKey
:
true
,
metaKey
:
true
,
keyCode
:
true
});
assert
.
deepEqual
(
actual
[
0
].
keybindingMatches
.
chordPart
,
{
keyCode
:
true
,
ctrlKey
:
true
});
});
});
test
(
'
filter exact matches with space #32993
'
,
()
=>
{
const
command
=
'
a
'
+
uuid
.
generateUuid
();
const
expected
=
aResolvedKeybindingItem
({
command
,
firstPart
:
{
keyCode
:
KeyCode
.
Space
,
modifiers
:
{
ctrlKey
:
true
}
},
when
:
'
whenContext1 && whenContext2
'
,
isDefault
:
false
});
prepareKeybindingService
(
expected
,
aResolvedKeybindingItem
({
command
,
firstPart
:
{
keyCode
:
KeyCode
.
Backspace
,
modifiers
:
{
ctrlKey
:
true
}
},
when
:
'
whenContext1 && whenContext2
'
,
isDefault
:
false
}));
return
testObject
.
resolve
().
then
(()
=>
{
const
actual
=
testObject
.
fetch
(
'
"ctrl+space"
'
).
filter
(
element
=>
element
.
keybindingItem
.
command
===
command
);
assert
.
equal
(
1
,
actual
.
length
);
});
});
function
prepareKeybindingService
(...
keybindingItems
:
ResolvedKeybindingItem
[]):
ResolvedKeybindingItem
[]
{
instantiationService
.
stub
(
IKeybindingService
,
'
getKeybindings
'
,
()
=>
keybindingItems
);
instantiationService
.
stub
(
IKeybindingService
,
'
getDefaultKeybindings
'
,
()
=>
keybindingItems
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录