Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
33fc7752
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,发现更多精彩内容 >>
提交
33fc7752
编写于
11月 29, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
objectTreeModel preserves collapse state on strict identity
上级
d88dd690
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
64 deletion
+36
-64
src/vs/base/browser/ui/tree/objectTreeModel.ts
src/vs/base/browser/ui/tree/objectTreeModel.ts
+26
-51
src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
+10
-13
未找到文件。
src/vs/base/browser/ui/tree/objectTreeModel.ts
浏览文件 @
33fc7752
...
...
@@ -8,20 +8,14 @@ import { Iterator, ISequence, getSequenceIterator } from 'vs/base/common/iterato
import
{
IndexTreeModel
,
IIndexTreeModelOptions
}
from
'
vs/base/browser/ui/tree/indexTreeModel
'
;
import
{
Event
}
from
'
vs/base/common/event
'
;
import
{
ITreeModel
,
ITreeNode
,
ITreeElement
}
from
'
vs/base/browser/ui/tree/tree
'
;
import
{
IIdentityProvider
}
from
'
vs/base/browser/ui/list/list
'
;
export
interface
IObjectTreeModelOptions
<
T
,
TFilterData
>
extends
IIndexTreeModelOptions
<
T
,
TFilterData
>
{
identityProvider
?:
IIdentityProvider
<
T
>
;
}
export
interface
IObjectTreeModelOptions
<
T
,
TFilterData
>
extends
IIndexTreeModelOptions
<
T
,
TFilterData
>
{
}
export
class
ObjectTreeModel
<
T
extends
NonNullable
<
any
>
,
TFilterData
=
void
>
implements
ITreeModel
<
T
,
TFilterData
,
T
>
{
private
model
:
IndexTreeModel
<
T
,
TFilterData
>
;
private
nodes
=
new
Map
<
T
,
ITreeNode
<
T
,
TFilterData
>>
();
private
identityProvider
:
IIdentityProvider
<
T
>
|
undefined
=
undefined
;
private
nodesByIdentity
:
Map
<
string
,
ITreeNode
<
T
,
TFilterData
>>
|
undefined
=
undefined
;
readonly
onDidChangeCollapseState
:
Event
<
ITreeNode
<
T
,
TFilterData
>>
;
readonly
onDidChangeRenderNodeCount
:
Event
<
ITreeNode
<
T
,
TFilterData
>>
;
...
...
@@ -29,39 +23,23 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData = void> imp
constructor
(
list
:
ISpliceable
<
ITreeNode
<
T
,
TFilterData
>>
,
options
:
IObjectTreeModelOptions
<
T
,
TFilterData
>
=
{})
{
this
.
model
=
new
IndexTreeModel
(
list
,
options
);
this
.
identityProvider
=
options
.
identityProvider
;
if
(
this
.
identityProvider
)
{
this
.
nodesByIdentity
=
new
Map
();
}
this
.
onDidChangeCollapseState
=
this
.
model
.
onDidChangeCollapseState
;
this
.
onDidChangeRenderNodeCount
=
this
.
model
.
onDidChangeRenderNodeCount
;
}
setChildren
(
element
:
T
|
null
,
// TODO@joao also use identity provider to preserve children when `children` is undefined!!!
children
:
ISequence
<
ITreeElement
<
T
>>
|
undefined
,
onDidCreateNode
?:
(
node
:
ITreeNode
<
T
,
TFilterData
>
)
=>
void
,
onDidDeleteNode
?:
(
node
:
ITreeNode
<
T
,
TFilterData
>
)
=>
void
):
Iterator
<
ITreeElement
<
T
>>
{
const
location
=
this
.
getElementLocation
(
element
);
const
insertedElements
=
new
Set
<
T
>
();
let
createdNodesByIdentity
:
Map
<
string
,
ITreeNode
<
T
,
TFilterData
>>
|
undefined
;
if
(
this
.
identityProvider
)
{
createdNodesByIdentity
=
new
Map
();
}
const
_onDidCreateNode
=
(
node
:
ITreeNode
<
T
,
TFilterData
>
)
=>
{
insertedElements
.
add
(
node
.
element
);
this
.
nodes
.
set
(
node
.
element
,
node
);
if
(
createdNodesByIdentity
)
{
createdNodesByIdentity
.
set
(
this
.
identityProvider
!
.
getId
(
node
.
element
).
toString
(),
node
);
}
if
(
onDidCreateNode
)
{
onDidCreateNode
(
node
);
}
...
...
@@ -72,43 +50,40 @@ export class ObjectTreeModel<T extends NonNullable<any>, TFilterData = void> imp
this
.
nodes
.
delete
(
node
.
element
);
}
if
(
this
.
nodesByIdentity
)
{
this
.
nodesByIdentity
.
delete
(
this
.
identityProvider
!
.
getId
(
node
.
element
).
toString
());
}
if
(
onDidDeleteNode
)
{
onDidDeleteNode
(
node
);
}
};
const
preserveCollapseState
=
(
elements
:
ISequence
<
ITreeElement
<
T
>>
):
ISequence
<
ITreeElement
<
T
>>
=>
{
const
iterator
=
getSequenceIterator
(
elements
);
return
Iterator
.
map
(
iterator
,
treeElement
=>
{
const
identity
=
this
.
identityProvider
!
.
getId
(
treeElement
.
element
).
toString
();
const
node
=
this
.
nodesByIdentity
!
.
get
(
identity
);
const
collapsible
=
typeof
treeElement
.
collapsible
===
'
boolean
'
?
treeElement
.
collapsible
:
(
typeof
treeElement
.
collapsed
!==
'
undefined
'
);
return
{
...
treeElement
,
collapsible
,
collapsed
:
typeof
treeElement
.
collapsed
===
'
undefined
'
?
(
node
?
(
collapsible
&&
node
.
collapsed
)
:
undefined
)
:
treeElement
.
collapsed
,
children
:
treeElement
.
children
&&
preserveCollapseState
(
treeElement
.
children
)
};
});
};
return
this
.
model
.
splice
(
[...
location
,
0
],
Number
.
MAX_VALUE
,
this
.
preserveCollapseState
(
children
),
_onDidCreateNode
,
_onDidDeleteNode
);
}
if
(
children
&&
this
.
identityProvider
)
{
children
=
preserveCollapseState
(
children
);
}
private
preserveCollapseState
(
elements
:
ISequence
<
ITreeElement
<
T
>>
|
undefined
):
ISequence
<
ITreeElement
<
T
>>
{
const
iterator
=
elements
?
getSequenceIterator
(
elements
)
:
Iterator
.
empty
<
ITreeElement
<
T
>>
();
const
result
=
this
.
model
.
splice
([...
location
,
0
],
Number
.
MAX_VALUE
,
children
,
_onDidCreateNode
,
_onDidDeleteNode
);
return
Iterator
.
map
(
iterator
,
treeElement
=>
{
const
node
=
this
.
nodes
.
get
(
treeElement
.
element
);
if
(
createdNodesByIdentity
)
{
createdNodesByIdentity
.
forEach
((
node
,
identity
)
=>
this
.
nodesByIdentity
!
.
set
(
identity
,
node
));
}
if
(
!
node
)
{
return
treeElement
;
}
const
collapsible
=
typeof
treeElement
.
collapsible
===
'
boolean
'
?
treeElement
.
collapsible
:
node
.
collapsible
;
const
collapsed
=
typeof
treeElement
.
collapsed
!==
'
undefined
'
?
treeElement
.
collapsed
:
(
collapsible
&&
node
.
collapsed
);
return
result
;
return
{
...
treeElement
,
collapsible
,
collapsed
,
children
:
this
.
preserveCollapseState
(
treeElement
.
children
)
};
});
}
getParentElement
(
ref
:
T
|
null
=
null
):
T
|
null
{
...
...
src/vs/base/test/browser/ui/tree/objectTreeModel.test.ts
浏览文件 @
33fc7752
...
...
@@ -141,7 +141,7 @@ suite('ObjectTreeModel', function () {
assert
.
deepEqual
(
toArray
(
list
),
[
1
,
11
,
111
,
112
,
2
]);
});
test
(
'
collapse state is
lost without an identity provider
'
,
()
=>
{
test
(
'
collapse state is
preserved with strict identity
'
,
()
=>
{
const
list
:
ITreeNode
<
string
>
[]
=
[];
const
model
=
new
ObjectTreeModel
<
string
>
(
toSpliceable
(
list
),
{
collapseByDefault
:
true
});
const
data
=
[{
element
:
'
father
'
,
children
:
[{
element
:
'
child
'
}]
}];
...
...
@@ -153,22 +153,19 @@ suite('ObjectTreeModel', function () {
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
child
'
]);
model
.
setChildren
(
null
,
data
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
]);
});
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
child
'
]);
test
(
'
collapse state is preserved with an identity provider
'
,
()
=>
{
const
list
:
ITreeNode
<
string
>
[]
=
[];
const
identityProvider
=
{
getId
:
(
name
:
string
)
=>
name
};
const
model
=
new
ObjectTreeModel
<
string
>
(
toSpliceable
(
list
),
{
collapseByDefault
:
true
,
identityProvider
});
const
data
=
[{
element
:
'
father
'
,
children
:
[{
element
:
'
child
'
}]
}];
const
data2
=
[{
element
:
'
father
'
,
children
:
[{
element
:
'
child
'
}]
},
{
element
:
'
uncle
'
}];
model
.
setChildren
(
null
,
data2
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
child
'
,
'
uncle
'
]);
model
.
setChildren
(
null
,
data
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
]);
model
.
setChildren
(
null
,
[{
element
:
'
uncle
'
}]
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
uncle
'
]);
model
.
setC
ollapsed
(
'
father
'
,
false
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
child
'
]);
model
.
setC
hildren
(
null
,
data2
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
uncle
'
]);
model
.
setChildren
(
null
,
data
);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
,
'
child
'
]);
assert
.
deepEqual
(
toArray
(
list
),
[
'
father
'
]);
});
});
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录