Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
3445fcb5
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,发现更多精彩内容 >>
提交
3445fcb5
编写于
9月 02, 2019
作者:
J
jeanp413
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #80238
上级
bdb28224
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
28 deletion
+13
-28
src/vs/workbench/contrib/search/browser/searchView.ts
src/vs/workbench/contrib/search/browser/searchView.ts
+13
-28
未找到文件。
src/vs/workbench/contrib/search/browser/searchView.ts
浏览文件 @
3445fcb5
...
...
@@ -711,7 +711,7 @@ export class SearchView extends ViewletPanel {
const
[
selected
]
=
this
.
tree
.
getSelection
();
// Expand the initial selected node, if needed
if
(
selected
instanceof
FileMatch
)
{
if
(
selected
&&
!
(
selected
instanceof
Match
)
)
{
if
(
this
.
tree
.
isCollapsed
(
selected
))
{
this
.
tree
.
expand
(
selected
);
}
...
...
@@ -721,18 +721,16 @@ export class SearchView extends ViewletPanel {
let
next
=
navigator
.
next
();
if
(
!
next
)
{
// Reached the end - get a new navigator from the root.
navigator
=
this
.
tree
.
navigate
();
next
=
navigator
.
first
();
}
// Expand
and go past FileMatch nodes
// Expand
until first child is a Match
while
(
!
(
next
instanceof
Match
))
{
if
(
this
.
tree
.
isCollapsed
(
next
))
{
this
.
tree
.
expand
(
next
);
}
// Select the
FileMatch's
first child
// Select the first child
next
=
navigator
.
next
();
}
...
...
@@ -749,30 +747,17 @@ export class SearchView extends ViewletPanel {
let
prev
=
navigator
.
previous
();
// Expand and go past FileMatch nodes
if
(
!
(
prev
instanceof
Match
))
{
prev
=
navigator
.
previous
();
if
(
!
prev
)
{
// Wrap around
prev
=
navigator
.
last
();
// This is complicated because .last will set the navigator to the last FileMatch,
// so expand it and FF to its last child
this
.
tree
.
expand
(
prev
);
let
tmp
:
RenderableMatch
|
null
;
while
(
tmp
=
navigator
.
next
())
{
prev
=
tmp
;
}
}
// Select previous until find a Match or a collapsed item
while
(
!
prev
||
(
!
(
prev
instanceof
Match
)
&&
!
this
.
tree
.
isCollapsed
(
prev
)))
{
prev
=
prev
?
navigator
.
previous
()
:
navigator
.
last
();
}
if
(
!
(
prev
instanceof
Match
))
{
// There is a second non-Match result, which must be a collapsed FileMatch.
// Expand it then select its last child.
const
nextItem
=
navigator
.
next
();
this
.
tree
.
expand
(
prev
);
navigator
=
this
.
tree
.
navigate
(
nextItem
);
// recreate navigator because modifying the tree can invalidate it
prev
=
navigator
.
previous
();
}
// Expand until last child is a Match
while
(
!
(
prev
instanceof
Match
))
{
const
nextItem
=
navigator
.
next
();
this
.
tree
.
expand
(
prev
);
navigator
=
this
.
tree
.
navigate
(
nextItem
);
// recreate navigator because modifying the tree can invalidate it
prev
=
nextItem
?
navigator
.
previous
()
:
navigator
.
last
();
// select last child
}
// Reveal the newly selected element
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录