Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
705fe98d
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,发现更多精彩内容 >>
提交
705fe98d
编写于
4月 12, 2017
作者:
A
Alex Dima
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #24022
上级
75811f21
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
3 addition
and
9 deletion
+3
-9
src/vs/platform/keybinding/common/keybindingResolver.ts
src/vs/platform/keybinding/common/keybindingResolver.ts
+1
-7
src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
.../keybinding/test/common/abstractKeybindingService.test.ts
+1
-1
src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
...latform/keybinding/test/common/keybindingResolver.test.ts
+1
-1
未找到文件。
src/vs/platform/keybinding/common/keybindingResolver.ts
浏览文件 @
705fe98d
...
@@ -19,14 +19,12 @@ export interface IResolveResult {
...
@@ -19,14 +19,12 @@ export interface IResolveResult {
export
class
KeybindingResolver
{
export
class
KeybindingResolver
{
private
readonly
_defaultKeybindings
:
ResolvedKeybindingItem
[];
private
readonly
_defaultKeybindings
:
ResolvedKeybindingItem
[];
private
readonly
_keybindings
:
ResolvedKeybindingItem
[];
private
readonly
_keybindings
:
ResolvedKeybindingItem
[];
private
readonly
_shouldWarnOnConflict
:
boolean
;
private
readonly
_defaultBoundCommands
:
Map
<
string
,
boolean
>
;
private
readonly
_defaultBoundCommands
:
Map
<
string
,
boolean
>
;
private
readonly
_map
:
Map
<
string
,
ResolvedKeybindingItem
[]
>
;
private
readonly
_map
:
Map
<
string
,
ResolvedKeybindingItem
[]
>
;
private
readonly
_lookupMap
:
Map
<
string
,
ResolvedKeybindingItem
[]
>
;
private
readonly
_lookupMap
:
Map
<
string
,
ResolvedKeybindingItem
[]
>
;
constructor
(
defaultKeybindings
:
ResolvedKeybindingItem
[],
overrides
:
ResolvedKeybindingItem
[]
,
shouldWarnOnConflict
:
boolean
=
true
)
{
constructor
(
defaultKeybindings
:
ResolvedKeybindingItem
[],
overrides
:
ResolvedKeybindingItem
[])
{
this
.
_defaultKeybindings
=
defaultKeybindings
;
this
.
_defaultKeybindings
=
defaultKeybindings
;
this
.
_shouldWarnOnConflict
=
shouldWarnOnConflict
;
this
.
_defaultBoundCommands
=
new
Map
<
string
,
boolean
>
();
this
.
_defaultBoundCommands
=
new
Map
<
string
,
boolean
>
();
for
(
let
i
=
0
,
len
=
defaultKeybindings
.
length
;
i
<
len
;
i
++
)
{
for
(
let
i
=
0
,
len
=
defaultKeybindings
.
length
;
i
<
len
;
i
++
)
{
...
@@ -125,10 +123,6 @@ export class KeybindingResolver {
...
@@ -125,10 +123,6 @@ export class KeybindingResolver {
if
(
KeybindingResolver
.
whenIsEntirelyIncluded
(
true
,
conflict
.
when
,
item
.
when
))
{
if
(
KeybindingResolver
.
whenIsEntirelyIncluded
(
true
,
conflict
.
when
,
item
.
when
))
{
// `item` completely overwrites `conflict`
// `item` completely overwrites `conflict`
if
(
this
.
_shouldWarnOnConflict
&&
item
.
isDefault
)
{
console
.
warn
(
'
Conflict detected, command `
'
+
conflict
.
command
+
'
` cannot be triggered due to
'
+
item
.
command
);
}
// Remove conflict from the lookupMap
// Remove conflict from the lookupMap
this
.
_removeFromLookupMap
(
conflict
);
this
.
_removeFromLookupMap
(
conflict
);
}
}
...
...
src/vs/platform/keybinding/test/common/abstractKeybindingService.test.ts
浏览文件 @
705fe98d
...
@@ -140,7 +140,7 @@ suite('AbstractKeybindingService', () => {
...
@@ -140,7 +140,7 @@ suite('AbstractKeybindingService', () => {
}
}
};
};
let
resolver
=
new
KeybindingResolver
(
items
,
[]
,
false
);
let
resolver
=
new
KeybindingResolver
(
items
,
[]);
return
new
TestKeybindingService
(
resolver
,
contextKeyService
,
commandService
,
messageService
,
statusbarService
);
return
new
TestKeybindingService
(
resolver
,
contextKeyService
,
commandService
,
messageService
,
statusbarService
);
};
};
...
...
src/vs/platform/keybinding/test/common/keybindingResolver.test.ts
浏览文件 @
705fe98d
...
@@ -322,7 +322,7 @@ suite('KeybindingResolver', () => {
...
@@ -322,7 +322,7 @@ suite('KeybindingResolver', () => {
)
)
];
];
let
resolver
=
new
KeybindingResolver
(
items
,
[]
,
false
);
let
resolver
=
new
KeybindingResolver
(
items
,
[]);
let
testKey
=
(
commandId
:
string
,
expectedKeys
:
number
[])
=>
{
let
testKey
=
(
commandId
:
string
,
expectedKeys
:
number
[])
=>
{
// Test lookup
// Test lookup
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录