Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
23bee232
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
23bee232
编写于
12月 06, 2017
作者:
B
Benjamin Pasero
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix #39780
上级
9ec7172f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
7 addition
and
7 deletion
+7
-7
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
.../workbench/parts/preferences/browser/keybindingsEditor.ts
+7
-7
未找到文件。
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
浏览文件 @
23bee232
...
...
@@ -16,7 +16,7 @@ import { KeybindingLabel } from 'vs/base/browser/ui/keybindingLabel/keybindingLa
import
{
IAction
}
from
'
vs/base/common/actions
'
;
import
{
ActionBar
,
Separator
}
from
'
vs/base/browser/ui/actionbar/actionbar
'
;
import
{
BaseEditor
}
from
'
vs/workbench/browser/parts/editor/baseEditor
'
;
import
{
EditorInput
}
from
'
vs/workbench/common/editor
'
;
import
{
EditorInput
,
EditorOptions
}
from
'
vs/workbench/common/editor
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IClipboardService
}
from
'
vs/platform/clipboard/common/clipboardService
'
;
import
{
KeybindingsEditorModel
,
IKeybindingItemEntry
,
IListEntry
,
KEYBINDING_ENTRY_TEMPLATE_ID
,
KEYBINDING_HEADER_TEMPLATE_ID
}
from
'
vs/workbench/parts/preferences/common/keybindingsEditorModel
'
;
...
...
@@ -135,12 +135,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
this
.
_register
(
focusTracker
.
onDidBlur
(()
=>
this
.
keybindingsEditorContextKey
.
reset
()));
}
setInput
(
input
:
KeybindingsEditorInput
):
TPromise
<
void
>
{
setInput
(
input
:
KeybindingsEditorInput
,
options
:
EditorOptions
):
TPromise
<
void
>
{
const
oldInput
=
this
.
input
;
return
super
.
setInput
(
input
)
.
then
(()
=>
{
if
(
!
input
.
matches
(
oldInput
))
{
this
.
render
();
this
.
render
(
options
&&
options
.
preserveFocus
);
}
});
}
...
...
@@ -349,7 +349,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
}));
}
private
render
():
TPromise
<
any
>
{
private
render
(
preserveFocus
?:
boolean
):
TPromise
<
any
>
{
if
(
this
.
input
)
{
return
this
.
input
.
resolve
()
.
then
((
keybindingsModel
:
KeybindingsEditorModel
)
=>
this
.
keybindingsEditorModel
=
keybindingsModel
)
...
...
@@ -360,7 +360,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
},
{});
return
this
.
keybindingsEditorModel
.
resolve
(
editorActionsLabels
);
})
.
then
(()
=>
this
.
renderKeybindingsEntries
(
false
));
.
then
(()
=>
this
.
renderKeybindingsEntries
(
false
,
preserveFocus
));
}
return
TPromise
.
as
(
null
);
}
...
...
@@ -370,7 +370,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
this
.
delayedFilterLogging
.
trigger
(()
=>
this
.
reportFilteringUsed
(
this
.
searchWidget
.
getValue
()));
}
private
renderKeybindingsEntries
(
reset
:
boolean
):
void
{
private
renderKeybindingsEntries
(
reset
:
boolean
,
preserveFocus
?:
boolean
):
void
{
if
(
this
.
keybindingsEditorModel
)
{
const
filter
=
this
.
searchWidget
.
getValue
();
const
keybindingsEntries
:
IKeybindingItemEntry
[]
=
this
.
keybindingsEditorModel
.
fetch
(
filter
,
this
.
sortByPrecedence
.
checked
);
...
...
@@ -395,7 +395,7 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
this
.
unAssignedKeybindingItemToRevealAndFocus
=
null
;
}
else
if
(
currentSelectedIndex
!==
-
1
&&
currentSelectedIndex
<
this
.
listEntries
.
length
)
{
this
.
selectEntry
(
currentSelectedIndex
);
}
else
if
(
this
.
editorService
.
getActiveEditor
()
===
this
)
{
}
else
if
(
this
.
editorService
.
getActiveEditor
()
===
this
&&
!
preserveFocus
)
{
this
.
focus
();
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录