Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
c69d51ad
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,发现更多精彩内容 >>
提交
c69d51ad
编写于
10月 01, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#59346 Convert keyboard preferences editor actions to commands
上级
941c11cf
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
32 addition
and
26 deletion
+32
-26
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
.../workbench/parts/preferences/browser/keybindingsEditor.ts
+2
-25
src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
.../preferences/electron-browser/preferences.contribution.ts
+30
-1
未找到文件。
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
浏览文件 @
c69d51ad
...
...
@@ -25,8 +25,8 @@ import { IKeybindingService, IUserFriendlyKeybinding } from 'vs/platform/keybind
import
{
DefineKeybindingWidget
,
KeybindingsSearchWidget
,
KeybindingsSearchOptions
}
from
'
vs/workbench/parts/preferences/browser/keybindingWidgets
'
;
import
{
IKeybindingsEditor
,
CONTEXT_KEYBINDING_FOCUS
,
CONTEXT_KEYBINDINGS_EDITOR
,
CONTEXT_KEYBINDINGS_SEARCH_FOCUS
,
KEYBINDINGS_EDITOR_COMMAND_REMOVE
,
KEYBINDINGS_EDITOR_COMMAND_COPY
,
KEYBINDINGS_EDITOR_COMMAND_RESET
,
KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND
,
KEYBINDINGS_EDITOR_COMMAND_DEFINE
,
KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR
,
KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS
,
KEYBINDINGS_EDITOR_
SHOW_USER_KEYBINDINGS
,
KEYBINDINGS_EDITOR_
COMMAND_RECORD_SEARCH_KEYS
,
KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE
KEYBINDINGS_EDITOR_COMMAND_RESET
,
KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND
,
KEYBINDINGS_EDITOR_COMMAND_DEFINE
,
KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR
,
KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS
,
KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE
}
from
'
vs/workbench/parts/preferences/common/preferences
'
;
import
{
IContextMenuService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IKeybindingEditingService
}
from
'
vs/workbench/services/keybinding/common/keybindingEditing
'
;
...
...
@@ -151,29 +151,6 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
return
focusedElement
&&
focusedElement
.
templateId
===
KEYBINDING_ENTRY_TEMPLATE_ID
?
<
IKeybindingItemEntry
>
focusedElement
:
null
;
}
getSecondaryActions
():
IAction
[]
{
return
<
IAction
[]
>
[
<
IAction
>
{
label
:
localize
(
'
showDefaultKeybindings
'
,
"
Show Default Keybindings
"
),
enabled
:
true
,
id
:
KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS
,
run
:
():
TPromise
<
any
>
=>
{
this
.
searchWidget
.
setValue
(
'
@source:default
'
);
return
TPromise
.
as
(
null
);
}
},
<
IAction
>
{
label
:
localize
(
'
showUserKeybindings
'
,
"
Show User Keybindings
"
),
enabled
:
true
,
id
:
KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
,
run
:
():
TPromise
<
any
>
=>
{
this
.
searchWidget
.
setValue
(
'
@source:user
'
);
return
TPromise
.
as
(
null
);
}
}
];
}
defineKeybinding
(
keybindingEntry
:
IKeybindingItemEntry
):
TPromise
<
any
>
{
this
.
selectEntry
(
keybindingEntry
);
this
.
showOverlayContainer
();
...
...
src/vs/workbench/parts/preferences/electron-browser/preferences.contribution.ts
浏览文件 @
c69d51ad
...
...
@@ -22,7 +22,7 @@ import { KeybindingsEditor } from 'vs/workbench/parts/preferences/browser/keybin
import
{
OpenDefaultKeybindingsFileAction
,
OpenRawDefaultSettingsAction
,
OpenSettingsAction
,
OpenGlobalSettingsAction
,
OpenGlobalKeybindingsFileAction
,
OpenWorkspaceSettingsAction
,
OpenFolderSettingsAction
,
ConfigureLanguageBasedSettingsAction
,
OPEN_FOLDER_SETTINGS_COMMAND
,
OpenGlobalKeybindingsAction
,
OpenSettings2Action
,
OpenSettingsJsonAction
}
from
'
vs/workbench/parts/preferences/browser/preferencesActions
'
;
import
{
IKeybindingsEditor
,
IPreferencesSearchService
,
CONTEXT_KEYBINDING_FOCUS
,
CONTEXT_KEYBINDINGS_EDITOR
,
CONTEXT_KEYBINDINGS_SEARCH_FOCUS
,
KEYBINDINGS_EDITOR_COMMAND_DEFINE
,
KEYBINDINGS_EDITOR_COMMAND_REMOVE
,
KEYBINDINGS_EDITOR_COMMAND_SEARCH
,
KEYBINDINGS_EDITOR_COMMAND_RECORD_SEARCH_KEYS
,
KEYBINDINGS_EDITOR_COMMAND_SORTBY_PRECEDENCE
,
KEYBINDINGS_EDITOR_COMMAND_COPY
,
KEYBINDINGS_EDITOR_COMMAND_RESET
,
KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND
,
KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR
,
KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS
,
KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
,
SETTINGS_EDITOR_COMMAND_SEARCH
,
CONTEXT_SETTINGS_EDITOR
,
SETTINGS_EDITOR_COMMAND_FOCUS_FILE
,
CONTEXT_SETTINGS_SEARCH_FOCUS
,
SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
,
SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING
,
SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING
,
SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
,
SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH
,
CONTEXT_TOC_ROW_FOCUS
,
SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST
,
SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU
KEYBINDINGS_EDITOR_COMMAND_COPY
,
KEYBINDINGS_EDITOR_COMMAND_RESET
,
KEYBINDINGS_EDITOR_COMMAND_COPY_COMMAND
,
KEYBINDINGS_EDITOR_COMMAND_SHOW_SIMILAR
,
KEYBINDINGS_EDITOR_COMMAND_FOCUS_KEYBINDINGS
,
KEYBINDINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
,
SETTINGS_EDITOR_COMMAND_SEARCH
,
CONTEXT_SETTINGS_EDITOR
,
SETTINGS_EDITOR_COMMAND_FOCUS_FILE
,
CONTEXT_SETTINGS_SEARCH_FOCUS
,
SETTINGS_EDITOR_COMMAND_CLEAR_SEARCH_RESULTS
,
SETTINGS_EDITOR_COMMAND_FOCUS_NEXT_SETTING
,
SETTINGS_EDITOR_COMMAND_FOCUS_PREVIOUS_SETTING
,
SETTINGS_EDITOR_COMMAND_EDIT_FOCUSED_SETTING
,
SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_FROM_SEARCH
,
CONTEXT_TOC_ROW_FOCUS
,
SETTINGS_EDITOR_COMMAND_FOCUS_SETTINGS_LIST
,
SETTINGS_EDITOR_COMMAND_SHOW_CONTEXT_MENU
,
KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS
,
KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
}
from
'
vs/workbench/parts/preferences/common/preferences
'
;
import
{
IInstantiationService
,
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
IWorkbenchContributionsRegistry
,
Extensions
as
WorkbenchExtensions
}
from
'
vs/workbench/common/contributions
'
;
...
...
@@ -385,6 +385,35 @@ MenuRegistry.appendMenuItem(MenuId.CommandPalette, {
when
:
new
RawContextKey
<
string
>
(
'
workbenchState
'
,
''
).
notEqualsTo
(
'
empty
'
)
});
CommandsRegistry
.
registerCommand
(
KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS
,
serviceAccessor
=>
{
const
control
=
serviceAccessor
.
get
(
IEditorService
).
activeControl
as
IKeybindingsEditor
;
if
(
control
)
{
control
.
search
(
'
@source:default
'
);
}
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitleContext
,
{
command
:
{
id
:
KEYBINDINGS_EDITOR_SHOW_DEFAULT_KEYBINDINGS
,
title
:
nls
.
localize
(
'
showDefaultKeybindings
'
,
"
Show Default Keybindings
"
)
},
when
:
ContextKeyExpr
.
and
(
CONTEXT_KEYBINDINGS_EDITOR
)
});
CommandsRegistry
.
registerCommand
(
KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
,
serviceAccessor
=>
{
const
control
=
serviceAccessor
.
get
(
IEditorService
).
activeControl
as
IKeybindingsEditor
;
if
(
control
)
{
control
.
search
(
'
@source:user
'
);
}
});
MenuRegistry
.
appendMenuItem
(
MenuId
.
EditorTitleContext
,
{
command
:
{
id
:
KEYBINDINGS_EDITOR_SHOW_USER_KEYBINDINGS
,
title
:
nls
.
localize
(
'
showUserKeybindings
'
,
"
Show User Keybindings
"
)
},
when
:
ContextKeyExpr
.
and
(
CONTEXT_KEYBINDINGS_EDITOR
)
});
abstract
class
SettingsCommand
extends
Command
{
protected
getPreferencesEditor
(
accessor
:
ServicesAccessor
):
PreferencesEditor
|
SettingsEditor2
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录