Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5a83a62a
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,发现更多精彩内容 >>
提交
5a83a62a
编写于
4月 06, 2020
作者:
J
João Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
data tree: support Iterable<T>
上级
13a6b20d
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
12 deletion
+14
-12
src/vs/base/browser/ui/tree/asyncDataTree.ts
src/vs/base/browser/ui/tree/asyncDataTree.ts
+11
-9
src/vs/base/browser/ui/tree/dataTree.ts
src/vs/base/browser/ui/tree/dataTree.ts
+1
-1
src/vs/base/browser/ui/tree/tree.ts
src/vs/base/browser/ui/tree/tree.ts
+2
-2
未找到文件。
src/vs/base/browser/ui/tree/asyncDataTree.ts
浏览文件 @
5a83a62a
...
...
@@ -313,7 +313,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
private
readonly
collapseByDefault
?:
{
(
e
:
T
):
boolean
;
};
private
readonly
subTreeRefreshPromises
=
new
Map
<
IAsyncDataTreeNode
<
TInput
,
T
>
,
Promise
<
void
>>
();
private
readonly
refreshPromises
=
new
Map
<
IAsyncDataTreeNode
<
TInput
,
T
>
,
CancelablePromise
<
T
[]
>>
();
private
readonly
refreshPromises
=
new
Map
<
IAsyncDataTreeNode
<
TInput
,
T
>
,
CancelablePromise
<
Iterable
<
T
>
>>
();
protected
readonly
identityProvider
?:
IIdentityProvider
<
T
>
;
private
readonly
autoExpandSingleChildren
:
boolean
;
...
...
@@ -740,10 +740,10 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
private
async
doRefreshNode
(
node
:
IAsyncDataTreeNode
<
TInput
,
T
>
,
recursive
:
boolean
,
viewStateContext
?:
IAsyncDataTreeViewStateContext
<
TInput
,
T
>
):
Promise
<
IAsyncDataTreeNode
<
TInput
,
T
>
[]
>
{
node
.
hasChildren
=
!!
this
.
dataSource
.
hasChildren
(
node
.
element
!
);
let
childrenPromise
:
Promise
<
T
[]
>
;
let
childrenPromise
:
Promise
<
Iterable
<
T
>
>
;
if
(
!
node
.
hasChildren
)
{
childrenPromise
=
Promise
.
resolve
(
[]
);
childrenPromise
=
Promise
.
resolve
(
Iterable
.
empty
()
);
}
else
{
const
slowTimeout
=
timeout
(
800
);
...
...
@@ -777,7 +777,7 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
}
}
private
doGetChildren
(
node
:
IAsyncDataTreeNode
<
TInput
,
T
>
):
Promise
<
T
[]
>
{
private
doGetChildren
(
node
:
IAsyncDataTreeNode
<
TInput
,
T
>
):
Promise
<
Iterable
<
T
>
>
{
let
result
=
this
.
refreshPromises
.
get
(
node
);
if
(
result
)
{
...
...
@@ -809,7 +809,9 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
}
}
private
setChildren
(
node
:
IAsyncDataTreeNode
<
TInput
,
T
>
,
childrenElements
:
T
[],
recursive
:
boolean
,
viewStateContext
?:
IAsyncDataTreeViewStateContext
<
TInput
,
T
>
):
IAsyncDataTreeNode
<
TInput
,
T
>
[]
{
private
setChildren
(
node
:
IAsyncDataTreeNode
<
TInput
,
T
>
,
childrenElementsIterable
:
Iterable
<
T
>
,
recursive
:
boolean
,
viewStateContext
?:
IAsyncDataTreeViewStateContext
<
TInput
,
T
>
):
IAsyncDataTreeNode
<
TInput
,
T
>
[]
{
const
childrenElements
=
[...
childrenElementsIterable
];
// perf: if the node was and still is a leaf, avoid all this hassle
if
(
node
.
children
.
length
===
0
&&
childrenElements
.
length
===
0
)
{
return
[];
...
...
@@ -949,9 +951,9 @@ export class AsyncDataTree<TInput, T, TFilterData = void> implements IDisposable
};
}
protected
processChildren
(
children
:
T
[]):
T
[]
{
protected
processChildren
(
children
:
Iterable
<
T
>
):
Iterable
<
T
>
{
if
(
this
.
sorter
)
{
children
.
sort
(
this
.
sorter
.
compare
.
bind
(
this
.
sorter
));
children
=
[...
children
]
.
sort
(
this
.
sorter
.
compare
.
bind
(
this
.
sorter
));
}
return
children
;
...
...
@@ -1243,9 +1245,9 @@ export class CompressibleAsyncDataTree<TInput, T, TFilterData = void> extends As
// For compressed async data trees, `TreeVisibility.Recurse` doesn't currently work
// and we have to filter everything beforehand
// Related to #85193 and #85835
protected
processChildren
(
children
:
T
[]):
T
[]
{
protected
processChildren
(
children
:
Iterable
<
T
>
):
Iterable
<
T
>
{
if
(
this
.
filter
)
{
children
=
children
.
filter
(
e
=>
{
children
=
Iterable
.
filter
(
children
,
e
=>
{
const
result
=
this
.
filter
!
.
filter
(
e
,
TreeVisibility
.
Visible
);
const
visibility
=
getVisibility
(
result
);
...
...
src/vs/base/browser/ui/tree/dataTree.ts
浏览文件 @
5a83a62a
...
...
@@ -159,7 +159,7 @@ export class DataTree<TInput, T, TFilterData = void> extends AbstractTree<T | nu
}
private
iterate
(
element
:
TInput
|
T
,
isCollapsed
?:
(
el
:
T
)
=>
boolean
|
undefined
):
{
elements
:
Iterable
<
ITreeElement
<
T
>>
,
size
:
number
}
{
const
children
=
this
.
dataSource
.
getChildren
(
element
)
;
const
children
=
[...
this
.
dataSource
.
getChildren
(
element
)]
;
const
elements
=
Iterable
.
map
(
children
,
element
=>
{
const
{
elements
:
children
,
size
}
=
this
.
iterate
(
element
,
isCollapsed
);
const
collapsible
=
this
.
dataSource
.
hasChildren
?
this
.
dataSource
.
hasChildren
(
element
)
:
undefined
;
...
...
src/vs/base/browser/ui/tree/tree.ts
浏览文件 @
5a83a62a
...
...
@@ -166,12 +166,12 @@ export interface ITreeNavigator<T> {
export
interface
IDataSource
<
TInput
,
T
>
{
hasChildren
?(
element
:
TInput
|
T
):
boolean
;
getChildren
(
element
:
TInput
|
T
):
T
[]
;
getChildren
(
element
:
TInput
|
T
):
Iterable
<
T
>
;
}
export
interface
IAsyncDataSource
<
TInput
,
T
>
{
hasChildren
(
element
:
TInput
|
T
):
boolean
;
getChildren
(
element
:
TInput
|
T
):
T
[]
|
Promise
<
T
[]
>
;
getChildren
(
element
:
TInput
|
T
):
Iterable
<
T
>
|
Promise
<
Iterable
<
T
>
>
;
}
export
const
enum
TreeDragOverBubble
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录