Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
0affcfd8
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,发现更多精彩内容 >>
提交
0affcfd8
编写于
12月 14, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
avoid data tree expansion in recursive expand
上级
1c6050ce
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
38 addition
and
25 deletion
+38
-25
src/vs/base/browser/ui/tree/abstractTree.ts
src/vs/base/browser/ui/tree/abstractTree.ts
+5
-5
src/vs/base/browser/ui/tree/asyncDataTree.ts
src/vs/base/browser/ui/tree/asyncDataTree.ts
+8
-5
src/vs/base/browser/ui/tree/indexTreeModel.ts
src/vs/base/browser/ui/tree/indexTreeModel.ts
+16
-11
src/vs/base/browser/ui/tree/objectTreeModel.ts
src/vs/base/browser/ui/tree/objectTreeModel.ts
+3
-3
src/vs/base/browser/ui/tree/tree.ts
src/vs/base/browser/ui/tree/tree.ts
+6
-1
未找到文件。
src/vs/base/browser/ui/tree/abstractTree.ts
浏览文件 @
0affcfd8
...
...
@@ -11,7 +11,7 @@ import { append, $, toggleClass } from 'vs/base/browser/dom';
import
{
Event
,
Relay
}
from
'
vs/base/common/event
'
;
import
{
StandardKeyboardEvent
}
from
'
vs/base/browser/keyboardEvent
'
;
import
{
KeyCode
}
from
'
vs/base/common/keyCodes
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeRenderer
,
ITreeEvent
,
ITreeMouseEvent
,
ITreeContextMenuEvent
,
ITreeFilter
,
ITreeNavigator
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeRenderer
,
ITreeEvent
,
ITreeMouseEvent
,
ITreeContextMenuEvent
,
ITreeFilter
,
ITreeNavigator
,
ICollapseStateChangeEvent
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
ISpliceable
}
from
'
vs/base/common/sequence
'
;
function
asListOptions
<
T
,
TFilterData
>
(
options
?:
IAbstractTreeOptions
<
T
,
TFilterData
>
):
IListOptions
<
ITreeNode
<
T
,
TFilterData
>>
|
undefined
{
...
...
@@ -74,11 +74,11 @@ class TreeRenderer<T, TFilterData, TTemplateData> implements IListRenderer<ITree
constructor
(
private
renderer
:
ITreeRenderer
<
T
,
TFilterData
,
TTemplateData
>
,
onDidChangeCollapseState
:
Event
<
I
TreeNode
<
T
,
TFilterData
>>
onDidChangeCollapseState
:
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
)
{
this
.
templateId
=
renderer
.
templateId
;
onDidChangeCollapseState
(
this
.
onDidChangeNodeTwistieState
,
this
,
this
.
disposables
);
Event
.
map
(
onDidChangeCollapseState
,
e
=>
e
.
node
)
(
this
.
onDidChangeNodeTwistieState
,
this
,
this
.
disposables
);
if
(
renderer
.
onDidChangeTwistieState
)
{
renderer
.
onDidChangeTwistieState
(
this
.
onDidChangeTwistieState
,
this
,
this
.
disposables
);
...
...
@@ -204,7 +204,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
get
onDidFocus
():
Event
<
void
>
{
return
this
.
view
.
onDidFocus
;
}
get
onDidBlur
():
Event
<
void
>
{
return
this
.
view
.
onDidBlur
;
}
get
onDidChangeCollapseState
():
Event
<
I
TreeNode
<
T
,
TFilterData
>>
{
return
this
.
model
.
onDidChangeCollapseState
;
}
get
onDidChangeCollapseState
():
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
{
return
this
.
model
.
onDidChangeCollapseState
;
}
get
onDidChangeRenderNodeCount
():
Event
<
ITreeNode
<
T
,
TFilterData
>>
{
return
this
.
model
.
onDidChangeRenderNodeCount
;
}
get
onDidDispose
():
Event
<
void
>
{
return
this
.
view
.
onDidDispose
;
}
...
...
@@ -217,7 +217,7 @@ export abstract class AbstractTree<T, TFilterData, TRef> implements IDisposable
)
{
const
treeDelegate
=
new
ComposedTreeDelegate
<
T
,
ITreeNode
<
T
,
TFilterData
>>
(
delegate
);
const
onDidChangeCollapseStateRelay
=
new
Relay
<
I
TreeNode
<
T
,
TFilterData
>>
();
const
onDidChangeCollapseStateRelay
=
new
Relay
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
();
const
treeRenderers
=
renderers
.
map
(
r
=>
new
TreeRenderer
<
T
,
TFilterData
,
any
>
(
r
,
onDidChangeCollapseStateRelay
.
event
));
this
.
disposables
.
push
(...
treeRenderers
);
...
...
src/vs/base/browser/ui/tree/asyncDataTree.ts
浏览文件 @
0affcfd8
...
...
@@ -6,7 +6,7 @@
import
{
ComposedTreeDelegate
,
IAbstractTreeOptions
}
from
'
vs/base/browser/ui/tree/abstractTree
'
;
import
{
ObjectTree
,
IObjectTreeOptions
}
from
'
vs/base/browser/ui/tree/objectTree
'
;
import
{
IListVirtualDelegate
,
IIdentityProvider
}
from
'
vs/base/browser/ui/list/list
'
;
import
{
ITreeElement
,
ITreeNode
,
ITreeRenderer
,
ITreeEvent
,
ITreeMouseEvent
,
ITreeContextMenuEvent
,
ITreeSorter
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
ITreeElement
,
ITreeNode
,
ITreeRenderer
,
ITreeEvent
,
ITreeMouseEvent
,
ITreeContextMenuEvent
,
ITreeSorter
,
ICollapseStateChangeEvent
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
Emitter
,
Event
}
from
'
vs/base/common/event
'
;
import
{
timeout
,
always
}
from
'
vs/base/common/async
'
;
...
...
@@ -193,7 +193,6 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
get
onDidChangeFocus
():
Event
<
ITreeEvent
<
T
>>
{
return
Event
.
map
(
this
.
tree
.
onDidChangeFocus
,
asTreeEvent
);
}
get
onDidChangeSelection
():
Event
<
ITreeEvent
<
T
>>
{
return
Event
.
map
(
this
.
tree
.
onDidChangeSelection
,
asTreeEvent
);
}
get
onDidOpen
():
Event
<
ITreeEvent
<
T
>>
{
return
Event
.
map
(
this
.
tree
.
onDidOpen
,
asTreeEvent
);
}
get
onDidChangeCollapseState
():
Event
<
T
>
{
return
Event
.
map
(
this
.
tree
.
onDidChangeCollapseState
,
e
=>
e
.
element
!
.
element
!
);
}
private
readonly
_onDidResolveChildren
=
new
Emitter
<
IChildrenResolutionEvent
<
T
>>
();
readonly
onDidResolveChildren
:
Event
<
IChildrenResolutionEvent
<
T
>>
=
this
.
_onDidResolveChildren
.
event
;
...
...
@@ -496,9 +495,13 @@ export class AsyncDataTree<T extends NonNullable<any>, TFilterData = void> imple
}
}
private
_onDidChangeCollapseState
(
treeNode
:
ITreeNode
<
IAsyncDataTreeNode
<
T
>
,
any
>
):
void
{
if
(
!
treeNode
.
collapsed
&&
treeNode
.
element
.
state
===
AsyncDataTreeNodeState
.
Uninitialized
)
{
this
.
refreshNode
(
treeNode
.
element
,
false
,
ChildrenResolutionReason
.
Expand
);
private
_onDidChangeCollapseState
({
node
,
deep
}:
ICollapseStateChangeEvent
<
IAsyncDataTreeNode
<
T
>
,
any
>
):
void
{
if
(
!
node
.
collapsed
&&
node
.
element
.
state
===
AsyncDataTreeNodeState
.
Uninitialized
)
{
if
(
deep
)
{
this
.
collapse
(
node
.
element
.
element
!
);
}
else
{
this
.
refreshNode
(
node
.
element
,
false
,
ChildrenResolutionReason
.
Expand
);
}
}
}
...
...
src/vs/base/browser/ui/tree/indexTreeModel.ts
浏览文件 @
0affcfd8
...
...
@@ -7,7 +7,7 @@ import { ISpliceable } from 'vs/base/common/sequence';
import
{
Iterator
,
ISequence
}
from
'
vs/base/common/iterator
'
;
import
{
Emitter
,
Event
,
EventBufferer
}
from
'
vs/base/common/event
'
;
import
{
tail2
}
from
'
vs/base/common/arrays
'
;
import
{
ITreeFilterDataResult
,
TreeVisibility
,
ITreeFilter
,
ITreeModel
,
ITreeNode
,
ITreeElement
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
ITreeFilterDataResult
,
TreeVisibility
,
ITreeFilter
,
ITreeModel
,
ITreeNode
,
ITreeElement
,
ICollapseStateChangeEvent
}
from
'
vs/base/browser/ui/tree/tree
'
;
interface
IMutableTreeNode
<
T
,
TFilterData
>
extends
ITreeNode
<
T
,
TFilterData
>
{
readonly
parent
:
IMutableTreeNode
<
T
,
TFilterData
>
|
undefined
;
...
...
@@ -48,10 +48,10 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
readonly
rootRef
=
[];
private
root
:
IMutableTreeNode
<
T
,
TFilterData
>
;
private
eventBufferer
=
new
EventBufferer
();
// TODO@joao is this really necessary
private
eventBufferer
=
new
EventBufferer
();
private
_onDidChangeCollapseState
=
new
Emitter
<
I
TreeNode
<
T
,
TFilterData
>>
();
readonly
onDidChangeCollapseState
:
Event
<
I
TreeNode
<
T
,
TFilterData
>>
=
this
.
eventBufferer
.
wrapEvent
(
this
.
_onDidChangeCollapseState
.
event
);
private
_onDidChangeCollapseState
=
new
Emitter
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
();
readonly
onDidChangeCollapseState
:
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
=
this
.
eventBufferer
.
wrapEvent
(
this
.
_onDidChangeCollapseState
.
event
);
private
_onDidChangeRenderNodeCount
=
new
Emitter
<
ITreeNode
<
T
,
TFilterData
>>
();
readonly
onDidChangeRenderNodeCount
:
Event
<
ITreeNode
<
T
,
TFilterData
>>
=
this
.
eventBufferer
.
wrapEvent
(
this
.
_onDidChangeRenderNodeCount
.
event
);
...
...
@@ -63,6 +63,8 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
this
.
collapseByDefault
=
typeof
options
.
collapseByDefault
===
'
undefined
'
?
false
:
options
.
collapseByDefault
;
this
.
filter
=
options
.
filter
;
// this.onDidChangeCollapseState(node => console.log(node.collapsed, node));
this
.
root
=
{
parent
:
undefined
,
element
:
rootElement
,
...
...
@@ -140,11 +142,13 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
collapsed
=
!
node
.
collapsed
;
}
return
this
.
_setCollapsed
(
node
,
listIndex
,
revealed
,
collapsed
,
recursive
||
false
);
return
this
.
eventBufferer
.
bufferEvents
(()
=>
{
return
this
.
_setCollapsed
(
node
,
listIndex
,
revealed
,
collapsed
!
,
recursive
||
false
);
});
}
private
_setCollapsed
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
listIndex
:
number
,
revealed
:
boolean
,
collapsed
:
boolean
,
recursive
:
boolean
):
boolean
{
const
result
=
this
.
_setNodeCollapsed
(
node
,
collapsed
,
recursive
);
const
result
=
this
.
_setNodeCollapsed
(
node
,
collapsed
,
recursive
,
false
);
if
(
!
revealed
||
!
node
.
visible
)
{
return
result
;
...
...
@@ -152,25 +156,26 @@ export class IndexTreeModel<T extends Exclude<any, undefined>, TFilterData = voi
const
previousRenderNodeCount
=
node
.
renderNodeCount
;
const
toInsert
=
this
.
updateNodeAfterCollapseChange
(
node
);
const
deleteCount
=
previousRenderNodeCount
-
(
listIndex
===
-
1
?
0
:
1
);
this
.
list
.
splice
(
listIndex
+
1
,
deleteCount
,
toInsert
.
slice
(
1
));
this
.
_onDidChangeCollapseState
.
fire
(
node
);
return
result
;
}
private
_setNodeCollapsed
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
collapsed
:
boolean
,
recursive
:
boolean
):
boolean
{
private
_setNodeCollapsed
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
collapsed
:
boolean
,
recursive
:
boolean
,
deep
:
boolean
):
boolean
{
let
result
=
node
.
collapsible
&&
node
.
collapsed
!==
collapsed
;
if
(
node
.
collapsible
)
{
node
.
collapsed
=
collapsed
;
if
(
result
)
{
this
.
_onDidChangeCollapseState
.
fire
({
node
,
deep
});
}
}
if
(
recursive
)
{
for
(
const
child
of
node
.
children
)
{
result
=
this
.
_setNodeCollapsed
(
child
,
collapsed
,
true
)
||
result
;
result
=
this
.
_setNodeCollapsed
(
child
,
collapsed
,
true
,
true
)
||
result
;
}
}
...
...
src/vs/base/browser/ui/tree/objectTreeModel.ts
浏览文件 @
0affcfd8
...
...
@@ -7,7 +7,7 @@ import { ISpliceable } from 'vs/base/common/sequence';
import
{
Iterator
,
ISequence
,
getSequenceIterator
}
from
'
vs/base/common/iterator
'
;
import
{
IndexTreeModel
,
IIndexTreeModelOptions
}
from
'
vs/base/browser/ui/tree/indexTreeModel
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeElement
,
ITreeSorter
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeElement
,
ITreeSorter
,
ICollapseStateChangeEvent
}
from
'
vs/base/browser/ui/tree/tree
'
;
export
interface
IObjectTreeModelOptions
<
T
,
TFilterData
>
extends
IIndexTreeModelOptions
<
T
,
TFilterData
>
{
sorter
?:
ITreeSorter
<
T
>
;
...
...
@@ -21,14 +21,14 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData extends Non
private
nodes
=
new
Map
<
T
|
null
,
ITreeNode
<
T
,
TFilterData
>>
();
private
sorter
?:
ITreeSorter
<
ITreeElement
<
T
>>
;
readonly
onDidChangeCollapseState
:
Event
<
I
TreeNode
<
T
,
TFilterData
>>
;
readonly
onDidChangeCollapseState
:
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
;
readonly
onDidChangeRenderNodeCount
:
Event
<
ITreeNode
<
T
,
TFilterData
>>
;
get
size
():
number
{
return
this
.
nodes
.
size
;
}
constructor
(
list
:
ISpliceable
<
ITreeNode
<
T
,
TFilterData
>>
,
options
:
IObjectTreeModelOptions
<
T
,
TFilterData
>
=
{})
{
this
.
model
=
new
IndexTreeModel
(
list
,
null
,
options
);
this
.
onDidChangeCollapseState
=
this
.
model
.
onDidChangeCollapseState
as
Event
<
I
TreeNode
<
T
,
TFilterData
>>
;
this
.
onDidChangeCollapseState
=
this
.
model
.
onDidChangeCollapseState
as
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
;
this
.
onDidChangeRenderNodeCount
=
this
.
model
.
onDidChangeRenderNodeCount
as
Event
<
ITreeNode
<
T
,
TFilterData
>>
;
if
(
options
.
sorter
)
{
...
...
src/vs/base/browser/ui/tree/tree.ts
浏览文件 @
0affcfd8
...
...
@@ -89,9 +89,14 @@ export interface ITreeNode<T, TFilterData = void> {
readonly
filterData
:
TFilterData
|
undefined
;
}
export
interface
ICollapseStateChangeEvent
<
T
,
TFilterData
>
{
node
:
ITreeNode
<
T
,
TFilterData
>
;
deep
:
boolean
;
}
export
interface
ITreeModel
<
T
,
TFilterData
,
TRef
>
{
readonly
rootRef
:
TRef
;
readonly
onDidChangeCollapseState
:
Event
<
I
TreeNode
<
T
,
TFilterData
>>
;
readonly
onDidChangeCollapseState
:
Event
<
I
CollapseStateChangeEvent
<
T
,
TFilterData
>>
;
readonly
onDidChangeRenderNodeCount
:
Event
<
ITreeNode
<
T
,
TFilterData
>>
;
getListIndex
(
location
:
TRef
):
number
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录