Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a3493c75
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,发现更多精彩内容 >>
提交
a3493c75
编写于
8月 15, 2016
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Validate user-written keybindings (#10452)
上级
15816349
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
5 deletion
+43
-5
src/vs/platform/keybinding/common/keybindingResolver.ts
src/vs/platform/keybinding/common/keybindingResolver.ts
+16
-3
src/vs/platform/keybinding/test/common/keybindingIO.test.ts
src/vs/platform/keybinding/test/common/keybindingIO.test.ts
+27
-2
未找到文件。
src/vs/platform/keybinding/common/keybindingResolver.ts
浏览文件 @
a3493c75
...
...
@@ -408,11 +408,24 @@ export class IOSupport {
}
public
static
readKeybindingItem
(
input
:
IUserFriendlyKeybinding
,
index
:
number
):
IKeybindingItem
{
let
key
=
IOSupport
.
readKeybinding
(
input
.
key
);
let
when
=
IOSupport
.
readKeybindingWhen
(
input
.
when
);
let
key
:
number
=
0
;
if
(
typeof
input
.
key
===
'
string
'
)
{
key
=
IOSupport
.
readKeybinding
(
input
.
key
);
}
let
when
:
ContextKeyExpr
=
null
;
if
(
typeof
input
.
when
===
'
string
'
)
{
when
=
IOSupport
.
readKeybindingWhen
(
input
.
when
);
}
let
command
:
string
=
null
;
if
(
typeof
input
.
command
===
'
string
'
)
{
command
=
input
.
command
;
}
return
{
keybinding
:
key
,
command
:
input
.
command
,
command
:
command
,
when
:
when
,
weight1
:
1000
,
weight2
:
index
...
...
src/vs/platform/keybinding/test/common/keybindingIO.test.ts
浏览文件 @
a3493c75
...
...
@@ -6,7 +6,8 @@
import
*
as
assert
from
'
assert
'
;
import
{
ISimplifiedPlatform
,
KeyCode
,
KeyMod
}
from
'
vs/base/common/keyCodes
'
;
import
{
IOSupport
}
from
'
vs/platform/keybinding/common/keybindingResolver
'
;
import
{
NormalizedKeybindingItem
,
IOSupport
}
from
'
vs/platform/keybinding/common/keybindingResolver
'
;
import
{
IUserFriendlyKeybinding
}
from
'
vs/platform/keybinding/common/keybinding
'
;
suite
(
'
Keybinding IO
'
,
()
=>
{
...
...
@@ -110,4 +111,28 @@ suite('Keybinding IO', () => {
testDeserialization
(
'
ctrl-shift-alt-win-A
'
,
'
shift-alt-cmd-Ctrl-A
'
,
'
ctrl-shift-alt-META-A
'
,
KeyMod
.
CtrlCmd
|
KeyMod
.
Shift
|
KeyMod
.
Alt
|
KeyMod
.
WinCtrl
|
KeyCode
.
KEY_A
);
});
});
\ No newline at end of file
test
(
'
issue #10452 - invalid command
'
,
()
=>
{
let
strJSON
=
`[{ "key": "ctrl+k ctrl+f", "command": ["firstcommand", "seccondcommand"] }]`
;
let
userKeybinding
=
<
IUserFriendlyKeybinding
>
JSON
.
parse
(
strJSON
)[
0
];
let
keybindingItem
=
IOSupport
.
readKeybindingItem
(
userKeybinding
,
0
);
let
normalizedKeybindingItem
=
NormalizedKeybindingItem
.
fromKeybindingItem
(
keybindingItem
,
false
);
assert
.
equal
(
normalizedKeybindingItem
.
command
,
null
);
});
test
(
'
issue #10452 - invalid when
'
,
()
=>
{
let
strJSON
=
`[{ "key": "ctrl+k ctrl+f", "command": "firstcommand", "when": [] }]`
;
let
userKeybinding
=
<
IUserFriendlyKeybinding
>
JSON
.
parse
(
strJSON
)[
0
];
let
keybindingItem
=
IOSupport
.
readKeybindingItem
(
userKeybinding
,
0
);
let
normalizedKeybindingItem
=
NormalizedKeybindingItem
.
fromKeybindingItem
(
keybindingItem
,
false
);
assert
.
equal
(
normalizedKeybindingItem
.
when
,
null
);
});
test
(
'
issue #10452 - invalid key
'
,
()
=>
{
let
strJSON
=
`[{ "key": [], "command": "firstcommand" }]`
;
let
userKeybinding
=
<
IUserFriendlyKeybinding
>
JSON
.
parse
(
strJSON
)[
0
];
let
keybindingItem
=
IOSupport
.
readKeybindingItem
(
userKeybinding
,
0
);
let
normalizedKeybindingItem
=
NormalizedKeybindingItem
.
fromKeybindingItem
(
keybindingItem
,
false
);
assert
.
equal
(
normalizedKeybindingItem
.
keybinding
,
0
);
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录