Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2f0a98d2
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,发现更多精彩内容 >>
提交
2f0a98d2
编写于
8月 24, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
explorer: always show root if it can not be resolved
fixes #54988
上级
cd9beb84
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
17 addition
and
10 deletion
+17
-10
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
...kbench/parts/files/electron-browser/views/explorerView.ts
+17
-10
未找到文件。
src/vs/workbench/parts/files/electron-browser/views/explorerView.ts
浏览文件 @
2f0a98d2
...
...
@@ -801,14 +801,21 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
private
resolveRoots
(
targetsToResolve
:
{
root
:
ExplorerItem
,
resource
:
URI
,
options
:
{
resolveTo
:
any
[]
}
}[],
targetsToExpand
:
URI
[]):
TPromise
<
any
>
{
// Display roots only when multi folder workspace
const
input
=
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
?
this
.
model
.
roots
[
0
]
:
this
.
model
;
const
errorFileStat
=
(
resource
:
URI
,
root
:
ExplorerItem
)
=>
ExplorerItem
.
create
({
resource
:
resource
,
name
:
paths
.
basename
(
resource
.
fsPath
),
mtime
:
0
,
etag
:
undefined
,
isDirectory
:
true
},
root
,
undefined
,
true
);
let
input
=
this
.
contextService
.
getWorkbenchState
()
===
WorkbenchState
.
FOLDER
?
this
.
model
.
roots
[
0
]
:
this
.
model
;
const
errorRoot
=
(
resource
:
URI
,
root
:
ExplorerItem
)
=>
{
if
(
input
===
this
.
model
.
roots
[
0
])
{
input
=
this
.
model
;
}
return
ExplorerItem
.
create
({
resource
:
resource
,
name
:
paths
.
basename
(
resource
.
fsPath
),
mtime
:
0
,
etag
:
undefined
,
isDirectory
:
true
},
root
,
undefined
,
true
);
};
const
setInputAndExpand
=
(
input
:
ExplorerItem
|
Model
,
statsToExpand
:
ExplorerItem
[])
=>
{
// Make sure to expand all folders that where expanded in the previous session
...
...
@@ -829,7 +836,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
return
ExplorerItem
.
create
(
result
.
stat
,
targetsToResolve
[
index
].
root
,
targetsToResolve
[
index
].
options
.
resolveTo
);
}
return
error
FileSta
t
(
targetsToResolve
[
index
].
resource
,
targetsToResolve
[
index
].
root
);
return
error
Roo
t
(
targetsToResolve
[
index
].
resource
,
targetsToResolve
[
index
].
root
);
});
// Subsequent refresh: Merge stat into our local model and refresh tree
modelStats
.
forEach
((
modelStat
,
index
)
=>
{
...
...
@@ -852,7 +859,7 @@ export class ExplorerView extends TreeViewsViewletPanel implements IExplorerView
let
delayer
=
new
Delayer
(
100
);
let
delayerPromise
:
TPromise
;
return
TPromise
.
join
(
targetsToResolve
.
map
((
target
,
index
)
=>
this
.
fileService
.
resolveFile
(
target
.
resource
,
target
.
options
)
.
then
(
result
=>
result
.
isDirectory
?
ExplorerItem
.
create
(
result
,
target
.
root
,
target
.
options
.
resolveTo
)
:
error
FileStat
(
target
.
resource
,
target
.
root
),
()
=>
errorFileSta
t
(
target
.
resource
,
target
.
root
))
.
then
(
result
=>
result
.
isDirectory
?
ExplorerItem
.
create
(
result
,
target
.
root
,
target
.
options
.
resolveTo
)
:
error
Root
(
target
.
resource
,
target
.
root
),
()
=>
errorRoo
t
(
target
.
resource
,
target
.
root
))
.
then
(
modelStat
=>
{
// Subsequent refresh: Merge stat into our local model and refresh tree
if
(
index
<
this
.
model
.
roots
.
length
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录