Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
772cd466
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,发现更多精彩内容 >>
提交
772cd466
编写于
8月 07, 2018
作者:
C
Christof Marti
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add quickNavigate (#29096)
上级
06595436
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
60 addition
and
51 deletion
+60
-51
src/vs/platform/quickinput/common/quickInput.ts
src/vs/platform/quickinput/common/quickInput.ts
+7
-0
src/vs/workbench/browser/parts/quickinput/quickInput.ts
src/vs/workbench/browser/parts/quickinput/quickInput.ts
+53
-51
未找到文件。
src/vs/platform/quickinput/common/quickInput.ts
浏览文件 @
772cd466
...
...
@@ -51,6 +51,11 @@ export interface IPickOptions<T extends IQuickPickItem> {
*/
canPickMany
?:
boolean
;
/**
* enables quick navigate in the picker to open an element without typing
*/
quickNavigate
?:
IQuickNavigateConfiguration
;
/**
* a context key to set when this picker is active
*/
...
...
@@ -146,6 +151,8 @@ export interface IQuickPick<T extends IQuickPickItem> extends IQuickInput {
matchOnDetail
:
boolean
;
quickNavigate
:
IQuickNavigateConfiguration
|
undefined
;
activeItems
:
ReadonlyArray
<
T
>
;
readonly
onDidChangeActive
:
Event
<
T
[]
>
;
...
...
src/vs/workbench/browser/parts/quickinput/quickInput.ts
浏览文件 @
772cd466
...
...
@@ -311,7 +311,8 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
private
selectedItemsUpdated
=
false
;
private
selectedItemsToConfirm
:
T
[]
=
[];
private
onDidChangeSelectionEmitter
=
new
Emitter
<
T
[]
>
();
private
quickNavigate
=
false
;
quickNavigate
:
IQuickNavigateConfiguration
;
constructor
(
ui
:
QuickInputUI
)
{
super
(
ui
);
...
...
@@ -498,11 +499,60 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
this
.
_selectedItems
=
checkedItems
as
T
[];
this
.
onDidChangeSelectionEmitter
.
fire
(
checkedItems
as
T
[]);
}),
this
.
registerQuickNavigation
()
);
}
super
.
show
();
}
private
registerQuickNavigation
()
{
return
dom
.
addDisposableListener
(
this
.
ui
.
container
,
dom
.
EventType
.
KEY_UP
,
(
e
:
KeyboardEvent
)
=>
{
if
(
this
.
canSelectMany
||
!
this
.
quickNavigate
)
{
return
;
}
const
keyboardEvent
:
StandardKeyboardEvent
=
new
StandardKeyboardEvent
(
e
as
KeyboardEvent
);
const
keyCode
=
keyboardEvent
.
keyCode
;
// Select element when keys are pressed that signal it
const
quickNavKeys
=
this
.
quickNavigate
.
keybindings
;
const
wasTriggerKeyPressed
=
keyCode
===
KeyCode
.
Enter
||
quickNavKeys
.
some
(
k
=>
{
const
[
firstPart
,
chordPart
]
=
k
.
getParts
();
if
(
chordPart
)
{
return
false
;
}
if
(
firstPart
.
shiftKey
&&
keyCode
===
KeyCode
.
Shift
)
{
if
(
keyboardEvent
.
ctrlKey
||
keyboardEvent
.
altKey
||
keyboardEvent
.
metaKey
)
{
return
false
;
// this is an optimistic check for the shift key being used to navigate back in quick open
}
return
true
;
}
if
(
firstPart
.
altKey
&&
keyCode
===
KeyCode
.
Alt
)
{
return
true
;
}
if
(
firstPart
.
ctrlKey
&&
keyCode
===
KeyCode
.
Ctrl
)
{
return
true
;
}
if
(
firstPart
.
metaKey
&&
keyCode
===
KeyCode
.
Meta
)
{
return
true
;
}
return
false
;
});
if
(
wasTriggerKeyPressed
&&
this
.
activeItems
[
0
])
{
this
.
_selectedItems
=
[
this
.
activeItems
[
0
]];
this
.
onDidChangeSelectionEmitter
.
fire
(
this
.
selectedItems
);
this
.
onDidAcceptEmitter
.
fire
();
}
});
}
protected
update
()
{
super
.
update
();
if
(
!
this
.
visible
)
{
...
...
@@ -556,55 +606,6 @@ class QuickPick<T extends IQuickPickItem> extends QuickInput implements IQuickPi
this
.
ui
.
list
.
matchOnDetail
=
this
.
matchOnDetail
;
this
.
ui
.
setVisibilities
(
this
.
canSelectMany
?
{
title
:
!!
this
.
title
||
!!
this
.
step
,
checkAll
:
true
,
inputBox
:
true
,
visibleCount
:
true
,
count
:
true
,
ok
:
true
,
list
:
true
}
:
{
title
:
!!
this
.
title
||
!!
this
.
step
,
inputBox
:
true
,
visibleCount
:
true
,
list
:
true
});
}
configureQuickNavigate
(
quickNavigate
:
IQuickNavigateConfiguration
)
{
if
(
this
.
canSelectMany
||
this
.
quickNavigate
)
{
return
;
}
this
.
quickNavigate
=
true
;
this
.
disposables
.
push
(
dom
.
addDisposableListener
(
this
.
ui
.
container
,
dom
.
EventType
.
KEY_UP
,
(
e
:
KeyboardEvent
)
=>
{
const
keyboardEvent
:
StandardKeyboardEvent
=
new
StandardKeyboardEvent
(
e
as
KeyboardEvent
);
const
keyCode
=
keyboardEvent
.
keyCode
;
// Select element when keys are pressed that signal it
const
quickNavKeys
=
quickNavigate
.
keybindings
;
const
wasTriggerKeyPressed
=
keyCode
===
KeyCode
.
Enter
||
quickNavKeys
.
some
(
k
=>
{
const
[
firstPart
,
chordPart
]
=
k
.
getParts
();
if
(
chordPart
)
{
return
false
;
}
if
(
firstPart
.
shiftKey
&&
keyCode
===
KeyCode
.
Shift
)
{
if
(
keyboardEvent
.
ctrlKey
||
keyboardEvent
.
altKey
||
keyboardEvent
.
metaKey
)
{
return
false
;
// this is an optimistic check for the shift key being used to navigate back in quick open
}
return
true
;
}
if
(
firstPart
.
altKey
&&
keyCode
===
KeyCode
.
Alt
)
{
return
true
;
}
if
(
firstPart
.
ctrlKey
&&
keyCode
===
KeyCode
.
Ctrl
)
{
return
true
;
}
if
(
firstPart
.
metaKey
&&
keyCode
===
KeyCode
.
Meta
)
{
return
true
;
}
return
false
;
});
if
(
wasTriggerKeyPressed
&&
this
.
activeItems
[
0
])
{
this
.
_selectedItems
=
[
this
.
activeItems
[
0
]];
this
.
onDidChangeSelectionEmitter
.
fire
(
this
.
selectedItems
);
this
.
onDidAcceptEmitter
.
fire
();
}
}));
}
}
class
InputBox
extends
QuickInput
implements
IInputBox
{
...
...
@@ -1020,6 +1021,7 @@ export class QuickInputService extends Component implements IQuickInputService {
input
.
ignoreFocusOut
=
options
.
ignoreFocusLost
;
input
.
matchOnDescription
=
options
.
matchOnDescription
;
input
.
matchOnDetail
=
options
.
matchOnDetail
;
input
.
quickNavigate
=
options
.
quickNavigate
;
input
.
contextKey
=
options
.
contextKey
;
input
.
busy
=
true
;
TPromise
.
join
([
picks
,
options
.
activeItem
])
...
...
@@ -1207,7 +1209,7 @@ export class QuickInputService extends Component implements IQuickInputService {
if
(
this
.
isDisplayed
()
&&
this
.
ui
.
list
.
isDisplayed
())
{
this
.
ui
.
list
.
focus
(
next
?
'
Next
'
:
'
Previous
'
);
if
(
quickNavigate
&&
this
.
controller
instanceof
QuickPick
)
{
this
.
controller
.
configureQuickNavigate
(
quickNavigate
)
;
this
.
controller
.
quickNavigate
=
quickNavigate
;
}
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录