Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
af5f77bb
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,发现更多精彩内容 >>
提交
af5f77bb
编写于
11月 01, 2018
作者:
J
Joao Moreno
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tree: pass along parent visibility to filter function
fixes #62216
上级
986b5532
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
29 addition
and
30 deletion
+29
-30
src/vs/base/browser/ui/tree/indexTreeModel.ts
src/vs/base/browser/ui/tree/indexTreeModel.ts
+21
-22
src/vs/base/browser/ui/tree/tree.ts
src/vs/base/browser/ui/tree/tree.ts
+1
-1
src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
...bench/parts/markers/electron-browser/markersTreeViewer.ts
+7
-7
未找到文件。
src/vs/base/browser/ui/tree/indexTreeModel.ts
浏览文件 @
af5f77bb
...
...
@@ -30,13 +30,11 @@ function treeNodeToElement<T>(node: IMutableTreeNode<T, any>): ITreeElement<T> {
return
{
element
,
children
,
collapsed
};
}
function
getVisibleState
(
visibility
:
boolean
|
TreeVisibility
):
boolean
|
undefined
{
function
getVisibleState
(
visibility
:
boolean
|
TreeVisibility
):
TreeVisibility
{
switch
(
visibility
)
{
case
true
:
return
true
;
case
false
:
return
false
;
case
TreeVisibility
.
Hidden
:
return
false
;
case
TreeVisibility
.
Visible
:
return
true
;
case
TreeVisibility
.
Recurse
:
return
undefined
;
case
true
:
return
TreeVisibility
.
Visible
;
case
false
:
return
TreeVisibility
.
Hidden
;
default
:
return
visibility
;
}
}
...
...
@@ -85,7 +83,7 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
const
{
parentNode
,
listIndex
,
revealed
}
=
this
.
getParentNodeWithListIndex
(
location
);
const
treeListElementsToInsert
:
ITreeNode
<
T
,
TFilterData
>
[]
=
[];
const
nodesToInsertIterator
=
Iterator
.
map
(
Iterator
.
from
(
toInsert
),
el
=>
this
.
createTreeNode
(
el
,
parentNode
,
revealed
,
treeListElementsToInsert
,
onDidCreateNode
));
const
nodesToInsertIterator
=
Iterator
.
map
(
Iterator
.
from
(
toInsert
),
el
=>
this
.
createTreeNode
(
el
,
parentNode
,
parentNode
.
visible
?
TreeVisibility
.
Visible
:
TreeVisibility
.
Hidden
,
revealed
,
treeListElementsToInsert
,
onDidCreateNode
));
const
nodesToInsert
:
IMutableTreeNode
<
T
,
TFilterData
>
[]
=
[];
let
renderNodeCount
=
0
;
...
...
@@ -186,6 +184,7 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
private
createTreeNode
(
treeElement
:
ITreeElement
<
T
>
,
parent
:
IMutableTreeNode
<
T
,
TFilterData
>
,
parentVisibility
:
TreeVisibility
,
revealed
:
boolean
,
treeListElements
:
ITreeNode
<
T
,
TFilterData
>
[],
onDidCreateNode
?:
(
node
:
ITreeNode
<
T
,
TFilterData
>
)
=>
void
...
...
@@ -202,15 +201,15 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
filterData
:
undefined
};
const
visib
le
=
this
.
_filterNode
(
node
);
const
visib
ility
=
this
.
_filterNode
(
node
,
parentVisibility
);
if
(
revealed
)
{
treeListElements
.
push
(
node
);
}
const
childElements
=
Iterator
.
from
(
treeElement
.
children
);
const
childRevealed
=
revealed
&&
visib
le
!==
false
&&
!
node
.
collapsed
;
const
childNodes
=
Iterator
.
map
(
childElements
,
el
=>
this
.
createTreeNode
(
el
,
node
,
childRevealed
,
treeListElements
,
onDidCreateNode
));
const
childRevealed
=
revealed
&&
visib
ility
!==
TreeVisibility
.
Hidden
&&
!
node
.
collapsed
;
const
childNodes
=
Iterator
.
map
(
childElements
,
el
=>
this
.
createTreeNode
(
el
,
node
,
visibility
,
childRevealed
,
treeListElements
,
onDidCreateNode
));
let
hasVisibleDescendants
=
false
;
let
renderNodeCount
=
1
;
...
...
@@ -222,7 +221,7 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
});
node
.
collapsible
=
node
.
collapsible
||
node
.
children
.
length
>
0
;
node
.
visible
=
typeof
visible
===
'
undefined
'
?
hasVisibleDescendants
:
visible
;
node
.
visible
=
visibility
===
TreeVisibility
.
Recurse
?
hasVisibleDescendants
:
(
visibility
===
TreeVisibility
.
Visible
)
;
if
(
!
node
.
visible
)
{
node
.
renderNodeCount
=
0
;
...
...
@@ -273,19 +272,19 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
const
previousRenderNodeCount
=
node
.
renderNodeCount
;
const
result
:
ITreeNode
<
T
,
TFilterData
>
[]
=
[];
this
.
_updateNodeAfterFilterChange
(
node
,
result
);
this
.
_updateNodeAfterFilterChange
(
node
,
node
.
visible
?
TreeVisibility
.
Visible
:
TreeVisibility
.
Hidden
,
result
);
this
.
_updateAncestorsRenderNodeCount
(
node
.
parent
,
result
.
length
-
previousRenderNodeCount
);
return
result
;
}
private
_updateNodeAfterFilterChange
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
result
:
ITreeNode
<
T
,
TFilterData
>
[],
revealed
=
true
):
boolean
{
let
visib
le
:
boolean
|
undefined
;
private
_updateNodeAfterFilterChange
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
parentVisibility
:
TreeVisibility
,
result
:
ITreeNode
<
T
,
TFilterData
>
[],
revealed
=
true
):
boolean
{
let
visib
ility
:
TreeVisibility
;
if
(
node
!==
this
.
root
)
{
visib
le
=
this
.
_filterNode
(
node
);
visib
ility
=
this
.
_filterNode
(
node
,
parentVisibility
);
if
(
visib
le
===
false
)
{
if
(
visib
ility
===
TreeVisibility
.
Hidden
)
{
node
.
visible
=
false
;
return
false
;
}
...
...
@@ -299,14 +298,14 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
node
.
renderNodeCount
=
node
===
this
.
root
?
0
:
1
;
let
hasVisibleDescendants
=
false
;
if
(
visib
le
!==
false
||
!
node
.
collapsed
)
{
if
(
visib
ility
!==
TreeVisibility
.
Hidden
||
!
node
.
collapsed
)
{
for
(
const
child
of
node
.
children
)
{
hasVisibleDescendants
=
this
.
_updateNodeAfterFilterChange
(
child
,
result
,
revealed
&&
!
node
.
collapsed
)
||
hasVisibleDescendants
;
hasVisibleDescendants
=
this
.
_updateNodeAfterFilterChange
(
child
,
visibility
,
result
,
revealed
&&
!
node
.
collapsed
)
||
hasVisibleDescendants
;
}
}
if
(
node
!==
this
.
root
)
{
node
.
visible
=
typeof
visible
===
'
undefined
'
?
hasVisibleDescendants
:
visible
;
node
.
visible
=
visibility
===
TreeVisibility
.
Recurse
?
hasVisibleDescendants
:
(
visibility
===
TreeVisibility
.
Visible
)
;
}
if
(
!
node
.
visible
)
{
...
...
@@ -335,12 +334,12 @@ export class IndexTreeModel<T, TFilterData = void> implements ITreeModel<T, TFil
}
}
private
_filterNode
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
):
boolean
|
undefined
{
const
result
=
this
.
filter
?
this
.
filter
.
filter
(
node
.
element
)
:
TreeVisibility
.
Visible
;
private
_filterNode
(
node
:
IMutableTreeNode
<
T
,
TFilterData
>
,
parentVisibility
:
TreeVisibility
):
TreeVisibility
{
const
result
=
this
.
filter
?
this
.
filter
.
filter
(
node
.
element
,
parentVisibility
)
:
TreeVisibility
.
Visible
;
if
(
typeof
result
===
'
boolean
'
)
{
node
.
filterData
=
undefined
;
return
result
;
return
TreeVisibility
.
Visible
;
}
else
if
(
isFilterResult
<
TFilterData
>
(
result
))
{
node
.
filterData
=
result
.
data
;
return
getVisibleState
(
result
.
visibility
);
...
...
src/vs/base/browser/ui/tree/tree.ts
浏览文件 @
af5f77bb
...
...
@@ -64,7 +64,7 @@ export interface ITreeFilter<T, TFilterData = void> {
*
* @param element The tree element.
*/
filter
(
element
:
T
):
TreeFilterResult
<
TFilterData
>
;
filter
(
element
:
T
,
parentVisibility
:
TreeVisibility
):
TreeFilterResult
<
TFilterData
>
;
}
export
interface
ITreeElement
<
T
>
{
...
...
src/vs/workbench/parts/markers/electron-browser/markersTreeViewer.ts
浏览文件 @
af5f77bb
...
...
@@ -328,13 +328,13 @@ export class Filter implements ITreeFilter<TreeElement, FilterData> {
options
=
new
FilterOptions
();
filter
(
element
:
TreeElement
):
TreeFilterResult
<
FilterData
>
{
filter
(
element
:
TreeElement
,
parentVisibility
:
TreeVisibility
):
TreeFilterResult
<
FilterData
>
{
if
(
element
instanceof
ResourceMarkers
)
{
return
this
.
filterResourceMarkers
(
element
);
}
else
if
(
element
instanceof
Marker
)
{
return
this
.
filterMarker
(
element
);
return
this
.
filterMarker
(
element
,
parentVisibility
);
}
else
{
return
this
.
filterRelatedInformation
(
element
);
return
this
.
filterRelatedInformation
(
element
,
parentVisibility
);
}
}
...
...
@@ -360,7 +360,7 @@ export class Filter implements ITreeFilter<TreeElement, FilterData> {
return
TreeVisibility
.
Recurse
;
}
private
filterMarker
(
marker
:
Marker
):
TreeFilterResult
<
FilterData
>
{
private
filterMarker
(
marker
:
Marker
,
parentVisibility
:
TreeVisibility
):
TreeFilterResult
<
FilterData
>
{
if
(
this
.
options
.
filterErrors
&&
MarkerSeverity
.
Error
===
marker
.
marker
.
severity
)
{
return
true
;
}
...
...
@@ -385,10 +385,10 @@ export class Filter implements ITreeFilter<TreeElement, FilterData> {
return
{
visibility
:
true
,
data
:
{
type
:
FilterDataType
.
Marker
,
messageMatches
:
messageMatches
||
[],
sourceMatches
:
sourceMatches
||
[],
codeMatches
:
codeMatches
||
[]
}
};
}
return
TreeVisibility
.
Recurse
;
return
parentVisibility
;
}
private
filterRelatedInformation
(
relatedInformation
:
RelatedInformation
):
TreeFilterResult
<
FilterData
>
{
private
filterRelatedInformation
(
relatedInformation
:
RelatedInformation
,
parentVisibility
:
TreeVisibility
):
TreeFilterResult
<
FilterData
>
{
if
(
!
this
.
options
.
textFilter
)
{
return
true
;
}
...
...
@@ -400,6 +400,6 @@ export class Filter implements ITreeFilter<TreeElement, FilterData> {
return
{
visibility
:
true
,
data
:
{
type
:
FilterDataType
.
RelatedInformation
,
uriMatches
:
uriMatches
||
[],
messageMatches
:
messageMatches
||
[]
}
};
}
return
false
;
return
parentVisibility
;
}
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录