Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
7749f542
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,发现更多精彩内容 >>
提交
7749f542
编写于
3月 17, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #22793
上级
f98c884c
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
36 addition
and
34 deletion
+36
-34
src/vs/platform/keybinding/common/keybindingResolver.ts
src/vs/platform/keybinding/common/keybindingResolver.ts
+23
-0
src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
...kbench/parts/preferences/common/keybindingsEditorModel.ts
+11
-14
src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
...services/keybinding/electron-browser/keybindingService.ts
+2
-20
未找到文件。
src/vs/platform/keybinding/common/keybindingResolver.ts
浏览文件 @
7749f542
...
...
@@ -4,8 +4,10 @@
*--------------------------------------------------------------------------------------------*/
'
use strict
'
;
import
{
isFalsyOrEmpty
}
from
'
vs/base/common/arrays
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
ResolvedKeybindingItem
}
from
'
vs/platform/keybinding/common/resolvedKeybindingItem
'
;
import
{
CommandsRegistry
,
ICommandHandlerDescription
}
from
'
vs/platform/commands/common/commands
'
;
export
interface
IResolveResult
{
enterChord
:
boolean
;
...
...
@@ -303,4 +305,25 @@ export class KeybindingResolver {
}
return
rules
.
evaluate
(
context
);
}
public
static
getAllUnboundCommands
(
boundCommands
:
Map
<
string
,
boolean
>
):
string
[]
{
const
commands
=
CommandsRegistry
.
getCommands
();
const
unboundCommands
:
string
[]
=
[];
for
(
let
id
in
commands
)
{
if
(
id
[
0
]
===
'
_
'
||
id
.
indexOf
(
'
vscode.
'
)
===
0
)
{
// private command
continue
;
}
if
(
typeof
commands
[
id
].
description
===
'
object
'
&&
!
isFalsyOrEmpty
((
<
ICommandHandlerDescription
>
commands
[
id
].
description
).
args
))
{
// command with args
continue
;
}
if
(
boundCommands
.
get
(
id
)
===
true
)
{
continue
;
}
unboundCommands
.
push
(
id
);
}
return
unboundCommands
;
}
}
src/vs/workbench/parts/preferences/common/keybindingsEditorModel.ts
浏览文件 @
7749f542
...
...
@@ -7,12 +7,12 @@ import { localize } from 'vs/nls';
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
IMatch
,
IFilter
,
or
,
matchesContiguousSubString
,
matchesPrefix
,
matchesCamelCase
,
matchesWords
}
from
'
vs/base/common/filters
'
;
import
{
Registry
}
from
'
vs/platform/platform
'
;
import
{
CommandsRegistry
}
from
'
vs/platform/commands/common/commands
'
;
import
{
CommonEditorRegistry
,
EditorAction
}
from
'
vs/editor/common/editorCommonExtensions
'
;
import
{
IWorkbenchActionRegistry
,
Extensions
as
ActionExtensions
}
from
'
vs/workbench/common/actionRegistry
'
;
import
{
EditorModel
}
from
'
vs/workbench/common/editor
'
;
import
{
IExtensionService
}
from
'
vs/platform/extensions/common/extensions
'
;
import
{
IKeybindingService
,
IKeybindingItem2
,
KeybindingSource
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
KeybindingResolver
}
from
'
vs/platform/keybinding/common/keybindingResolver
'
;
export
const
KEYBINDING_ENTRY_TEMPLATE_ID
=
'
keybinding.entry.template
'
;
export
const
KEYBINDING_HEADER_TEMPLATE_ID
=
'
keybinding.header.template
'
;
...
...
@@ -81,20 +81,17 @@ export class KeybindingsEditorModel extends EditorModel {
return
editorActions
;
},
{});
this
.
_keybindingItems
=
this
.
keybindingsService
.
getKeybindings
().
map
(
keybinding
=>
KeybindingsEditorModel
.
toKeybindingEntry
(
keybinding
,
workbenchActionsRegistry
,
editorActions
));
const
boundCommands
=
this
.
_keybindingItems
.
reduce
((
boundCommands
,
keybinding
)
=>
{
boundCommands
[
keybinding
.
command
]
=
true
;
const
boundCommands
:
Map
<
string
,
boolean
>
=
this
.
_keybindingItems
.
reduce
((
boundCommands
,
keybinding
)
=>
{
boundCommands
.
set
(
keybinding
.
command
,
true
)
;
return
boundCommands
;
},
{});
const
commandsMap
=
CommandsRegistry
.
getCommands
();
for
(
const
command
in
commandsMap
)
{
if
(
!
boundCommands
[
command
])
{
this
.
_keybindingItems
.
push
(
KeybindingsEditorModel
.
toKeybindingEntry
({
keybinding
:
null
,
command
,
when
:
null
,
source
:
KeybindingSource
.
Default
},
workbenchActionsRegistry
,
editorActions
));
}
},
new
Map
<
string
,
boolean
>
());
for
(
const
command
of
KeybindingResolver
.
getAllUnboundCommands
(
boundCommands
))
{
this
.
_keybindingItems
.
push
(
KeybindingsEditorModel
.
toKeybindingEntry
({
keybinding
:
null
,
command
,
when
:
null
,
source
:
KeybindingSource
.
Default
},
workbenchActionsRegistry
,
editorActions
));
}
this
.
_keybindingItems
=
this
.
_keybindingItems
.
sort
((
a
,
b
)
=>
KeybindingsEditorModel
.
compareKeybindingData
(
a
,
b
));
return
this
;
...
...
src/vs/workbench/services/keybinding/electron-browser/keybindingService.ts
浏览文件 @
7749f542
...
...
@@ -17,8 +17,7 @@ import { AbstractKeybindingService } from 'vs/platform/keybinding/common/abstrac
import
{
USLayoutResolvedKeybinding
}
from
'
vs/platform/keybinding/common/usLayoutResolvedKeybinding
'
;
import
{
IStatusbarService
}
from
'
vs/platform/statusbar/common/statusbar
'
;
import
{
KeybindingResolver
}
from
'
vs/platform/keybinding/common/keybindingResolver
'
;
import
{
isFalsyOrEmpty
}
from
'
vs/base/common/arrays
'
;
import
{
ICommandService
,
CommandsRegistry
,
ICommandHandlerDescription
}
from
'
vs/platform/commands/common/commands
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IKeybindingEvent
,
IKeybindingItem
,
IUserFriendlyKeybinding
,
KeybindingSource
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
ContextKeyExpr
,
IContextKeyService
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
{
IKeybindingRule
,
KeybindingsRegistry
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
...
...
@@ -447,25 +446,8 @@ export class WorkbenchKeybindingService extends AbstractKeybindingService {
}
private
static
_getAllCommandsAsComment
(
boundCommands
:
Map
<
string
,
boolean
>
):
string
{
const
commands
=
CommandsRegistry
.
getCommands
();
const
unboundCommands
:
string
[]
=
[];
for
(
let
id
in
commands
)
{
if
(
id
[
0
]
===
'
_
'
||
id
.
indexOf
(
'
vscode.
'
)
===
0
)
{
// private command
continue
;
}
if
(
typeof
commands
[
id
].
description
===
'
object
'
&&
!
isFalsyOrEmpty
((
<
ICommandHandlerDescription
>
commands
[
id
].
description
).
args
))
{
// command with args
continue
;
}
if
(
boundCommands
.
get
(
id
)
===
true
)
{
continue
;
}
unboundCommands
.
push
(
id
);
}
const
unboundCommands
=
KeybindingResolver
.
getAllUnboundCommands
(
boundCommands
);
let
pretty
=
unboundCommands
.
sort
().
join
(
'
\n
// -
'
);
return
'
//
'
+
nls
.
localize
(
'
unboundCommands
'
,
"
Here are other available commands:
"
)
+
'
\n
// -
'
+
pretty
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录