Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
15cec5d9
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,发现更多精彩内容 >>
提交
15cec5d9
编写于
4月 13, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
#47154 Fix Adopt from cached configuration:
Shift to file based configuration only after loading
上级
19b2f873
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
39 addition
and
20 deletion
+39
-20
src/vs/workbench/services/configuration/node/configuration.ts
...vs/workbench/services/configuration/node/configuration.ts
+27
-12
src/vs/workbench/services/configuration/node/configurationService.ts
...bench/services/configuration/node/configurationService.ts
+12
-8
未找到文件。
src/vs/workbench/services/configuration/node/configuration.ts
浏览文件 @
15cec5d9
...
@@ -457,21 +457,36 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
...
@@ -457,21 +457,36 @@ export class FolderConfiguration extends Disposable implements IFolderConfigurat
return
this
.
_loaded
;
return
this
.
_loaded
;
}
}
adopt
(
fileService
:
IFileService
):
boolean
{
adopt
(
fileService
:
IFileService
):
TPromise
<
boolean
>
{
let
result
=
false
;
if
(
fileService
)
{
if
(
fileService
&&
!
(
this
.
folderConfiguration
instanceof
FileServiceBasedFolderConfiguration
))
{
if
(
this
.
folderConfiguration
instanceof
CachedFolderConfiguration
)
{
if
(
this
.
folderConfiguration
instanceof
CachedFolderConfiguration
)
{
this
.
folderConfiguration
=
new
FileServiceBasedFolderConfiguration
(
this
.
workspaceFolder
.
uri
,
this
.
configFolderRelativePath
,
this
.
workbenchState
,
fileService
);
return
this
.
adoptFromCachedConfiguration
(
fileService
);
this
.
updateCache
();
}
result
=
true
;
}
else
{
if
(
this
.
folderConfiguration
instanceof
NodeBasedFolderConfiguration
)
{
const
oldFolderConfiguration
=
this
.
folderConfiguration
;
return
this
.
adoptFromNodeBasedConfiguration
(
fileService
);
this
.
folderConfiguration
=
new
FileServiceBasedFolderConfiguration
(
this
.
workspaceFolder
.
uri
,
this
.
configFolderRelativePath
,
this
.
workbenchState
,
fileService
,
<
AbstractFolderConfiguration
>
oldFolderConfiguration
);
oldFolderConfiguration
.
dispose
();
}
}
this
.
_register
(
this
.
folderConfiguration
.
onDidChange
(
e
=>
this
.
onDidFolderConfigurationChange
()));
}
}
return
result
;
return
TPromise
.
as
(
false
);
}
private
adoptFromCachedConfiguration
(
fileService
:
IFileService
):
TPromise
<
boolean
>
{
const
folderConfiguration
=
new
FileServiceBasedFolderConfiguration
(
this
.
workspaceFolder
.
uri
,
this
.
configFolderRelativePath
,
this
.
workbenchState
,
fileService
);
return
folderConfiguration
.
loadConfiguration
()
.
then
(()
=>
{
this
.
folderConfiguration
=
folderConfiguration
;
this
.
_register
(
this
.
folderConfiguration
.
onDidChange
(
e
=>
this
.
onDidFolderConfigurationChange
()));
this
.
updateCache
();
return
true
;
});
}
private
adoptFromNodeBasedConfiguration
(
fileService
:
IFileService
):
TPromise
<
boolean
>
{
const
oldFolderConfiguration
=
this
.
folderConfiguration
;
this
.
folderConfiguration
=
new
FileServiceBasedFolderConfiguration
(
this
.
workspaceFolder
.
uri
,
this
.
configFolderRelativePath
,
this
.
workbenchState
,
fileService
,
<
AbstractFolderConfiguration
>
oldFolderConfiguration
);
oldFolderConfiguration
.
dispose
();
this
.
_register
(
this
.
folderConfiguration
.
onDidChange
(
e
=>
this
.
onDidFolderConfigurationChange
()));
return
TPromise
.
as
(
false
);
}
}
private
onDidFolderConfigurationChange
():
void
{
private
onDidFolderConfigurationChange
():
void
{
...
...
src/vs/workbench/services/configuration/node/configurationService.ts
浏览文件 @
15cec5d9
...
@@ -312,14 +312,18 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
...
@@ -312,14 +312,18 @@ export class WorkspaceService extends Disposable implements IWorkspaceConfigurat
acquireFileService
(
fileService
:
IFileService
):
void
{
acquireFileService
(
fileService
:
IFileService
):
void
{
this
.
fileService
=
fileService
;
this
.
fileService
=
fileService
;
const
changedWorkspaceFolders
:
IWorkspaceFolder
[]
=
[];
const
changedWorkspaceFolders
:
IWorkspaceFolder
[]
=
[];
this
.
cachedFolderConfigs
.
forEach
(
folderConfiguration
=>
{
TPromise
.
join
(
this
.
cachedFolderConfigs
.
values
()
if
(
folderConfiguration
.
adopt
(
fileService
))
{
.
map
(
folderConfiguration
=>
folderConfiguration
.
adopt
(
fileService
)
changedWorkspaceFolders
.
push
(
folderConfiguration
.
workspaceFolder
);
.
then
(
result
=>
{
}
if
(
result
)
{
});
changedWorkspaceFolders
.
push
(
folderConfiguration
.
workspaceFolder
);
for
(
const
workspaceFolder
of
changedWorkspaceFolders
)
{
}
this
.
onWorkspaceFolderConfigurationChanged
(
workspaceFolder
);
})))
}
.
then
(()
=>
{
for
(
const
workspaceFolder
of
changedWorkspaceFolders
)
{
this
.
onWorkspaceFolderConfigurationChanged
(
workspaceFolder
);
}
});
}
}
acquireInstantiationService
(
instantiationService
:
IInstantiationService
):
void
{
acquireInstantiationService
(
instantiationService
:
IInstantiationService
):
void
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录