Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
44e4a980
V
vscode
项目概览
xxadev
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
44e4a980
编写于
2月 07, 2019
作者:
R
Rob Lourens
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #68018 - the list.select command should open the element with preserveFocus=false
上级
1cb2f550
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
3 deletion
+17
-3
src/vs/platform/list/browser/listService.ts
src/vs/platform/list/browser/listService.ts
+15
-1
src/vs/workbench/browser/actions/listCommands.ts
src/vs/workbench/browser/actions/listCommands.ts
+2
-2
未找到文件。
src/vs/platform/list/browser/listService.ts
浏览文件 @
44e4a980
...
...
@@ -655,6 +655,17 @@ export interface IResourceResultsNavigationOptions {
openOnFocus
:
boolean
;
}
export
interface
SelectionKeyboardEvent
extends
KeyboardEvent
{
preserveFocus
?:
boolean
;
}
export
function
getSelectionKeyboardEvent
(
typeArg
:
string
,
preserveFocus
?:
boolean
):
SelectionKeyboardEvent
{
const
e
=
new
KeyboardEvent
(
typeArg
);
(
<
SelectionKeyboardEvent
>
e
).
preserveFocus
=
preserveFocus
;
return
e
;
}
export
class
TreeResourceNavigator2
<
T
,
TFilterData
>
extends
Disposable
{
private
readonly
_onDidOpenResource
=
new
Emitter
<
IOpenEvent
<
T
|
null
>>
();
...
...
@@ -697,10 +708,13 @@ export class TreeResourceNavigator2<T, TFilterData> extends Disposable {
}
const
isDoubleClick
=
e
.
browserEvent
.
detail
===
2
;
const
preserveFocus
=
(
e
.
browserEvent
instanceof
KeyboardEvent
&&
typeof
(
<
SelectionKeyboardEvent
>
e
.
browserEvent
).
preserveFocus
===
'
boolean
'
)
?
!!
(
<
SelectionKeyboardEvent
>
e
.
browserEvent
).
preserveFocus
:
!
isDoubleClick
;
if
(
this
.
tree
.
openOnSingleClick
||
isDoubleClick
)
{
const
sideBySide
=
e
.
browserEvent
instanceof
MouseEvent
&&
(
e
.
browserEvent
.
ctrlKey
||
e
.
browserEvent
.
metaKey
||
e
.
browserEvent
.
altKey
);
this
.
open
(
!
isDoubleClick
,
isDoubleClick
,
sideBySide
);
this
.
open
(
preserveFocus
,
isDoubleClick
,
sideBySide
);
}
}
...
...
src/vs/workbench/browser/actions/listCommands.ts
浏览文件 @
44e4a980
...
...
@@ -7,7 +7,7 @@ import { KeyMod, KeyCode } from 'vs/base/common/keyCodes';
import
{
ServicesAccessor
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
{
KeybindingsRegistry
,
KeybindingWeight
}
from
'
vs/platform/keybinding/common/keybindingsRegistry
'
;
import
{
List
}
from
'
vs/base/browser/ui/list/listWidget
'
;
import
{
WorkbenchListFocusContextKey
,
IListService
,
WorkbenchListSupportsMultiSelectContextKey
,
ListWidget
,
WorkbenchListHasSelectionOrFocus
}
from
'
vs/platform/list/browser/listService
'
;
import
{
WorkbenchListFocusContextKey
,
IListService
,
WorkbenchListSupportsMultiSelectContextKey
,
ListWidget
,
WorkbenchListHasSelectionOrFocus
,
getSelectionKeyboardEvent
}
from
'
vs/platform/list/browser/listService
'
;
import
{
PagedList
}
from
'
vs/base/browser/ui/list/listPaging
'
;
import
{
range
}
from
'
vs/base/common/arrays
'
;
import
{
ContextKeyExpr
}
from
'
vs/platform/contextkey/common/contextkey
'
;
...
...
@@ -579,7 +579,7 @@ KeybindingsRegistry.registerCommandAndKeybindingRule({
// ObjectTree
else
if
(
focused
instanceof
ObjectTree
||
focused
instanceof
DataTree
||
focused
instanceof
AsyncDataTree
)
{
const
list
=
focused
;
const
fakeKeyboardEvent
=
new
KeyboardEvent
(
'
keydown
'
);
const
fakeKeyboardEvent
=
getSelectionKeyboardEvent
(
'
keydown
'
,
false
);
list
.
setSelection
(
list
.
getFocus
(),
fakeKeyboardEvent
);
list
.
open
(
list
.
getFocus
());
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录