Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
徽霖
Vscode
提交
b8408ca5
V
Vscode
项目概览
徽霖
/
Vscode
通知
9
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,发现更多精彩内容 >>
提交
b8408ca5
编写于
10月 04, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Explorer view expansion on root changes
fixes #35121
上级
84cbd061
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
18 addition
and
7 deletion
+18
-7
src/vs/workbench/parts/files/browser/views/explorerView.ts
src/vs/workbench/parts/files/browser/views/explorerView.ts
+18
-7
未找到文件。
src/vs/workbench/parts/files/browser/views/explorerView.ts
浏览文件 @
b8408ca5
...
...
@@ -8,7 +8,7 @@ import nls = require('vs/nls');
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
{
Builder
,
$
}
from
'
vs/base/browser/builder
'
;
import
URI
from
'
vs/base/common/uri
'
;
import
{
ThrottledDelayer
}
from
'
vs/base/common/async
'
;
import
{
ThrottledDelayer
,
sequence
}
from
'
vs/base/common/async
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
paths
=
require
(
'
vs/base/common/paths
'
);
import
resources
=
require
(
'
vs/base/common/resources
'
);
...
...
@@ -165,7 +165,7 @@ export class ExplorerView extends ViewsViewletPanel {
this
.
disposables
.
push
(
this
.
themeService
.
onDidFileIconThemeChange
(
onFileIconThemeChange
));
this
.
disposables
.
push
(
this
.
contextService
.
onDidChangeWorkspaceFolders
(
e
=>
this
.
refreshFromEvent
(
e
.
added
)));
this
.
disposables
.
push
(
this
.
contextService
.
onDidChangeWorkbenchState
(
e
=>
this
.
refreshFromEvent
(
this
.
contextService
.
getWorkspace
().
folders
)));
this
.
disposables
.
push
(
this
.
contextService
.
onDidChangeWorkbenchState
(
e
=>
this
.
refreshFromEvent
()));
onFileIconThemeChange
(
this
.
themeService
.
getFileIconTheme
());
}
...
...
@@ -685,7 +685,13 @@ export class ExplorerView extends ViewsViewletPanel {
if
(
this
.
isVisible
())
{
this
.
explorerRefreshDelayer
.
trigger
(()
=>
{
if
(
!
this
.
explorerViewer
.
getHighlight
())
{
return
this
.
doRefresh
(
newRoots
.
map
(
r
=>
r
.
uri
));
return
this
.
doRefresh
(
newRoots
.
map
(
r
=>
r
.
uri
)).
then
(()
=>
{
if
(
newRoots
.
length
===
1
)
{
return
this
.
reveal
(
this
.
model
.
findClosest
(
newRoots
[
0
].
uri
),
0.5
);
}
return
undefined
;
});
}
return
TPromise
.
as
(
null
);
...
...
@@ -727,7 +733,7 @@ export class ExplorerView extends ViewsViewletPanel {
});
}
private
doRefresh
(
targetsToExpand
:
URI
[]
=
[]):
TPromise
<
void
>
{
private
doRefresh
(
targetsToExpand
:
URI
[]
=
[]):
TPromise
<
any
>
{
const
targetsToResolve
:
{
root
:
FileStat
,
resource
:
URI
,
options
:
{
resolveTo
:
URI
[]
}
}[]
=
[];
this
.
model
.
roots
.
forEach
(
root
=>
{
const
rootAndTargets
=
{
root
,
resource
:
root
.
resource
,
options
:
{
resolveTo
:
[]
}
};
...
...
@@ -782,14 +788,19 @@ export class ExplorerView extends ViewsViewletPanel {
modelStats
.
forEach
((
modelStat
,
index
)
=>
FileStat
.
mergeLocalWithDisk
(
modelStat
,
this
.
model
.
roots
[
index
]));
const
input
=
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
?
this
.
model
.
roots
[
0
]
:
this
.
model
;
const
statsToExpand
=
this
.
explorerViewer
.
getExpandedElements
().
concat
(
targetsToExpand
.
map
(
target
=>
this
.
model
.
findClosest
(
target
)));
let
statsToExpand
:
FileStat
[]
=
this
.
explorerViewer
.
getExpandedElements
().
concat
(
targetsToExpand
.
map
(
target
=>
this
.
model
.
findClosest
(
target
)));
if
(
input
===
this
.
explorerViewer
.
getInput
())
{
return
this
.
explorerViewer
.
refresh
().
then
(()
=>
this
.
explorerViewer
.
expandAll
(
statsToExpand
));
return
this
.
explorerViewer
.
refresh
().
then
(()
=>
sequence
(
statsToExpand
.
map
(
e
=>
()
=>
this
.
explorerViewer
.
expand
(
e
))
));
}
// Display roots only when multi folder workspace
// Make sure to expand all folders that where expanded in the previous session
return
this
.
explorerViewer
.
setInput
(
input
).
then
(()
=>
this
.
explorerViewer
.
expandAll
(
statsToExpand
));
if
(
input
===
this
.
model
)
{
// We have transitioned into workspace view -> expand all roots
statsToExpand
=
this
.
model
.
roots
.
concat
(
statsToExpand
);
}
return
this
.
explorerViewer
.
setInput
(
input
).
then
(()
=>
sequence
(
statsToExpand
.
map
(
e
=>
()
=>
this
.
explorerViewer
.
expand
(
e
))));
},
e
=>
TPromise
.
wrapError
(
e
));
this
.
progressService
.
showWhile
(
promise
,
this
.
partService
.
isCreated
()
?
800
:
3200
/* less ugly initial startup */
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录