Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
136db8a3
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,发现更多精彩内容 >>
提交
136db8a3
编写于
6月 29, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tree: fix recursive visibleCount adjustment
上级
10504981
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
59 addition
and
15 deletion
+59
-15
src/vs/base/browser/ui/tree/treeModel.ts
src/vs/base/browser/ui/tree/treeModel.ts
+10
-3
src/vs/base/test/browser/ui/tree/treeModel.test.ts
src/vs/base/test/browser/ui/tree/treeModel.test.ts
+48
-11
test/tree/server.js
test/tree/server.js
+1
-1
未找到文件。
src/vs/base/browser/ui/tree/treeModel.ts
浏览文件 @
136db8a3
...
...
@@ -125,7 +125,7 @@ export class TreeModel<T> {
}
private
_setCollapsed
(
location
:
number
[],
collapsed
?:
boolean
|
undefined
):
void
{
cons
t
{
node
,
listIndex
,
visible
}
=
this
.
findNode
(
location
);
le
t
{
node
,
listIndex
,
visible
}
=
this
.
findNode
(
location
);
if
(
typeof
collapsed
===
'
undefined
'
)
{
collapsed
=
!
node
.
collapsed
;
...
...
@@ -138,16 +138,23 @@ export class TreeModel<T> {
node
.
collapsed
=
collapsed
;
if
(
visible
)
{
let
visibleCountDiff
:
number
;
if
(
collapsed
)
{
const
deleteCount
=
getVisibleCount
(
node
.
children
);
this
.
list
.
splice
(
listIndex
,
1
+
deleteCount
,
[
node
]);
node
.
visibleCount
=
1
;
visibleCountDiff
=
-
deleteCount
;
}
else
{
const
toInsert
=
[
node
,
...
getVisibleNodes
(
node
.
children
)];
this
.
list
.
splice
(
listIndex
,
1
,
toInsert
);
node
.
visibleCount
=
toInsert
.
length
;
visibleCountDiff
=
toInsert
.
length
-
1
;
}
while
(
node
)
{
node
.
visibleCount
+=
visibleCountDiff
;
node
=
node
.
parent
;
}
}
}
...
...
src/vs/base/test/browser/ui/tree/treeModel.test.ts
浏览文件 @
136db8a3
...
...
@@ -16,16 +16,20 @@ function toSpliceable<T>(arr: T[]): ISpliceable<T> {
};
}
suite
(
'
TreeModel2
'
,
()
=>
{
function
toArray
<
T
>
(
list
:
ITreeNode
<
T
>
[]):
T
[]
{
return
list
.
map
(
i
=>
i
.
element
);
}
suite
(
'
TreeModel2
'
,
function
()
{
test
(
'
ctor
'
,
()
=>
{
test
(
'
ctor
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
assert
(
model
);
assert
.
equal
(
list
.
length
,
0
);
});
test
(
'
insert
'
,
()
=>
{
test
(
'
insert
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -47,7 +51,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
2
].
depth
,
1
);
});
test
(
'
deep insert
'
,
()
=>
{
test
(
'
deep insert
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -84,7 +88,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
5
].
depth
,
1
);
});
test
(
'
deep insert collapsed
'
,
()
=>
{
test
(
'
deep insert collapsed
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -112,7 +116,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
2
].
depth
,
1
);
});
test
(
'
delete
'
,
()
=>
{
test
(
'
delete
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -137,7 +141,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
.
length
,
0
);
});
test
(
'
nested delete
'
,
()
=>
{
test
(
'
nested delete
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -171,7 +175,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
3
].
depth
,
2
);
});
test
(
'
deep delete
'
,
()
=>
{
test
(
'
deep delete
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -199,7 +203,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
1
].
depth
,
1
);
});
test
(
'
hidden delete
'
,
()
=>
{
test
(
'
hidden delete
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -224,7 +228,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
.
length
,
3
);
});
test
(
'
collapse
'
,
()
=>
{
test
(
'
collapse
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -255,7 +259,7 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
2
].
depth
,
1
);
});
test
(
'
expand
'
,
()
=>
{
test
(
'
expand
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
...
...
@@ -294,4 +298,37 @@ suite('TreeModel2', () => {
assert
.
deepEqual
(
list
[
5
].
collapsed
,
false
);
assert
.
deepEqual
(
list
[
5
].
depth
,
1
);
});
test
(
'
collapse should recursively adjust visible count
'
,
function
()
{
const
list
=
[]
as
ITreeNode
<
number
>
[];
const
model
=
new
TreeModel
<
number
>
(
toSpliceable
(
list
));
model
.
splice
([
0
],
0
,
iter
([
{
element
:
1
,
children
:
[
{
element
:
11
,
children
:
[
{
element
:
111
}
]
}
]
},
{
element
:
2
,
children
:
[
{
element
:
21
}
]
}
]));
assert
.
deepEqual
(
list
.
length
,
5
);
assert
.
deepEqual
(
toArray
(
list
),
[
1
,
11
,
111
,
2
,
21
]);
model
.
setCollapsed
([
0
,
0
],
true
);
assert
.
deepEqual
(
list
.
length
,
4
);
assert
.
deepEqual
(
toArray
(
list
),
[
1
,
11
,
2
,
21
]);
model
.
setCollapsed
([
1
],
true
);
assert
.
deepEqual
(
list
.
length
,
3
);
assert
.
deepEqual
(
toArray
(
list
),
[
1
,
11
,
2
]);
});
});
\ No newline at end of file
test/tree/server.js
浏览文件 @
136db8a3
...
...
@@ -17,7 +17,7 @@ async function getTree(fsPath, level) {
const
element
=
path
.
basename
(
fsPath
);
const
stat
=
await
fs
.
stat
(
fsPath
);
if
(
!
stat
.
isDirectory
()
||
element
===
'
.git
'
||
element
===
'
.build
'
||
level
>=
2
)
{
if
(
!
stat
.
isDirectory
()
||
element
===
'
.git
'
||
element
===
'
.build
'
||
level
>=
3
)
{
return
{
element
};
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录