Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
f98c884c
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,发现更多精彩内容 >>
提交
f98c884c
编写于
3月 17, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#18095 Reveal and focus keybinding item after define action
上级
43129f4f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
49 addition
and
11 deletion
+49
-11
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
.../workbench/parts/preferences/browser/keybindingsEditor.ts
+48
-6
src/vs/workbench/services/keybinding/common/keybindingEditing.ts
...workbench/services/keybinding/common/keybindingEditing.ts
+1
-5
未找到文件。
src/vs/workbench/parts/preferences/browser/keybindingsEditor.ts
浏览文件 @
f98c884c
...
...
@@ -70,6 +70,8 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
private
defineKeybindingWidget
:
DefineKeybindingWidget
;
private
keybindingsListContainer
:
HTMLElement
;
private
keybindingItemToReveal
:
IKeybindingItemEntry
;
private
listEntries
:
IListEntry
[];
private
keybindingsList
:
List
<
IListEntry
>
;
private
dimension
:
Dimension
;
...
...
@@ -142,7 +144,12 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
}
focus
():
void
{
this
.
searchWidget
.
focus
();
const
activeKeybindingEntry
=
this
.
activeKeybindingEntry
;
if
(
activeKeybindingEntry
)
{
this
.
focusEntry
(
activeKeybindingEntry
,
false
);
}
else
{
this
.
searchWidget
.
focus
();
}
}
get
activeKeybindingEntry
():
IKeybindingItemEntry
{
...
...
@@ -154,12 +161,17 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
this
.
overlayContainer
.
style
.
display
=
'
block
'
;
return
this
.
defineKeybindingWidget
.
define
().
then
(
key
=>
{
if
(
key
)
{
return
this
.
keybindingEditingService
.
editKeybinding
(
key
,
keybindingEntry
.
keybindingItem
);
return
this
.
keybindingEditingService
.
editKeybinding
(
key
,
keybindingEntry
.
keybindingItem
)
.
then
(()
=>
{
if
(
!
keybindingEntry
.
keybindingItem
.
keybinding
)
{
// reveal only if keybinding was added because the entry will be placed in different position after rendering
this
.
keybindingItemToReveal
=
keybindingEntry
;
}
});
}
return
null
;
}).
then
(()
=>
{
this
.
overlayContainer
.
style
.
display
=
'
none
'
;
this
.
focus
(
);
this
.
focus
Entry
(
keybindingEntry
,
false
);
});
}
...
...
@@ -227,14 +239,44 @@ export class KeybindingsEditor extends BaseEditor implements IKeybindingsEditor
if
(
this
.
input
)
{
return
this
.
input
.
resolve
()
.
then
((
keybindingsModel
:
KeybindingsEditorModel
)
=>
keybindingsModel
.
resolve
()
.
then
(()
=>
this
.
renderKeybindings
Data
(
keybindingsModel
.
fetch
(
this
.
searchWidget
.
value
()))));
.
then
(()
=>
this
.
renderKeybindings
Entries
(
keybindingsModel
.
fetch
(
this
.
searchWidget
.
value
()))));
}
return
TPromise
.
as
(
null
);
}
private
renderKeybindingsData
(
keybindingsData
:
IKeybindingItemEntry
[]):
void
{
this
.
keybindingsList
.
splice
(
0
,
this
.
keybindingsList
.
length
,
[{
id
:
'
keybinding-header-entry
'
,
templateId
:
KEYBINDING_HEADER_TEMPLATE_ID
},
...
keybindingsData
]);
private
renderKeybindingsEntries
(
keybindingsEntries
:
IKeybindingItemEntry
[]):
void
{
this
.
listEntries
=
[{
id
:
'
keybinding-header-entry
'
,
templateId
:
KEYBINDING_HEADER_TEMPLATE_ID
},
...
keybindingsEntries
];
this
.
keybindingsList
.
splice
(
0
,
this
.
keybindingsList
.
length
,
this
.
listEntries
);
this
.
keybindingsList
.
layout
(
this
.
dimension
.
height
-
DOM
.
getDomNodePagePosition
(
this
.
headerContainer
).
height
);
if
(
this
.
keybindingItemToReveal
)
{
this
.
focusEntry
(
this
.
keybindingItemToReveal
,
true
);
this
.
keybindingItemToReveal
=
null
;
}
}
private
focusEntry
(
keybindingItemEntry
:
IKeybindingItemEntry
,
reveal
:
boolean
):
void
{
let
index
=
-
1
;
for
(
let
i
=
0
;
i
<
this
.
listEntries
.
length
;
i
++
)
{
const
entry
=
this
.
listEntries
[
i
];
if
(
entry
.
id
===
keybindingItemEntry
.
id
)
{
index
=
i
;
break
;
}
if
(
entry
.
templateId
===
KEYBINDING_ENTRY_TEMPLATE_ID
)
{
if
((
<
IKeybindingItemEntry
>
entry
).
keybindingItem
.
command
===
keybindingItemEntry
.
keybindingItem
.
command
)
{
index
=
i
;
break
;
}
}
}
if
(
index
!==
-
1
)
{
this
.
keybindingsList
.
getHTMLElement
().
focus
();
if
(
reveal
)
{
this
.
keybindingsList
.
reveal
(
index
,
0.2
);
}
this
.
keybindingsList
.
setFocus
([
index
]);
}
}
private
_onNavigate
(
back
:
boolean
):
void
{
...
...
src/vs/workbench/services/keybinding/common/keybindingEditing.ts
浏览文件 @
f98c884c
...
...
@@ -12,7 +12,6 @@ import { IReference, Disposable } from 'vs/base/common/lifecycle';
import
*
as
json
from
'
vs/base/common/json
'
;
import
{
Edit
}
from
'
vs/base/common/jsonFormatter
'
;
import
{
setProperty
}
from
'
vs/base/common/jsonEdit
'
;
import
Event
,
{
Emitter
}
from
'
vs/base/common/event
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
import
*
as
editorCommon
from
'
vs/editor/common/editorCommon
'
;
import
{
EditOperation
}
from
'
vs/editor/common/core/editOperation
'
;
...
...
@@ -43,9 +42,6 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
private
resource
:
URI
=
URI
.
file
(
this
.
environmentService
.
appKeybindingsPath
);
private
_onUpdate
=
this
.
_register
(
new
Emitter
<
void
>
());
public
readonly
onUpdate
:
Event
<
void
>
=
this
.
_onUpdate
.
event
;
constructor
(
@
ITextModelResolverService
private
textModelResolverService
:
ITextModelResolverService
,
@
ITextFileService
private
textFileService
:
ITextFileService
,
...
...
@@ -92,7 +88,7 @@ export class KeybindingsEditingService extends Disposable implements IKeybinding
}
private
save
():
TPromise
<
any
>
{
return
this
.
textFileService
.
save
(
this
.
resource
)
.
then
(()
=>
this
.
_onUpdate
.
fire
())
;
return
this
.
textFileService
.
save
(
this
.
resource
);
}
private
updateUserKeybinding
(
newKey
:
string
,
keybindingItem
:
IKeybindingItem2
,
model
:
editorCommon
.
IModel
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录