Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fe31e7bf
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,发现更多精彩内容 >>
提交
fe31e7bf
编写于
4月 18, 2019
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Switch to file service based configuration only after loading it
上级
053a32e2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
13 addition
and
9 deletion
+13
-9
src/vs/workbench/services/configuration/browser/configuration.ts
...workbench/services/configuration/browser/configuration.ts
+13
-9
未找到文件。
src/vs/workbench/services/configuration/browser/configuration.ts
浏览文件 @
fe31e7bf
...
...
@@ -263,13 +263,13 @@ export class WorkspaceConfiguration extends Disposable {
this
.
_workspaceIdentifier
=
workspaceIdentifier
;
if
(
!
(
this
.
_workspaceConfiguration
instanceof
FileServiceBasedWorkspaceConfiguration
))
{
if
(
this
.
_workspaceIdentifier
.
configPath
.
scheme
===
Schemas
.
file
)
{
this
.
switch
();
this
.
switch
(
new
FileServiceBasedWorkspaceConfiguration
(
this
.
_configurationFileService
)
);
}
else
{
this
.
waitAndSwitch
(
this
.
_workspaceIdentifier
);
}
}
await
this
.
_workspaceConfiguration
.
load
(
this
.
_workspaceIdentifier
);
this
.
_loaded
=
this
.
_workspaceConfiguration
instanceof
FileServiceBasedWorkspaceConfiguration
;
await
this
.
_workspaceConfiguration
.
load
(
this
.
_workspaceIdentifier
);
}
reload
():
Promise
<
void
>
{
...
...
@@ -300,21 +300,25 @@ export class WorkspaceConfiguration extends Disposable {
private
async
waitAndSwitch
(
workspaceIdentifier
:
IWorkspaceIdentifier
):
Promise
<
void
>
{
await
this
.
_configurationFileService
.
whenProviderRegistered
(
workspaceIdentifier
.
configPath
.
scheme
);
if
(
!
(
this
.
_workspaceConfiguration
instanceof
FileServiceBasedWorkspaceConfiguration
))
{
this
.
switch
();
const
fileServiceBasedWorkspaceConfiguration
=
this
.
_register
(
new
FileServiceBasedWorkspaceConfiguration
(
this
.
_configurationFileService
));
await
fileServiceBasedWorkspaceConfiguration
.
load
(
workspaceIdentifier
);
this
.
switch
(
fileServiceBasedWorkspaceConfiguration
);
this
.
_loaded
=
true
;
this
.
onDidWorkspaceConfigurationChange
();
this
.
onDidWorkspaceConfigurationChange
(
false
);
}
}
private
switch
():
void
{
private
switch
(
fileServiceBasedWorkspaceConfiguration
:
FileServiceBasedWorkspaceConfiguration
):
void
{
this
.
_workspaceConfiguration
.
dispose
();
this
.
_workspaceConfigurationChangeDisposable
.
dispose
();
this
.
_workspaceConfiguration
=
this
.
_register
(
new
FileServiceBasedWorkspaceConfiguration
(
this
.
_configurationFileService
)
);
this
.
_workspaceConfigurationChangeDisposable
=
this
.
_register
(
this
.
_workspaceConfiguration
.
onDidChange
(
e
=>
this
.
onDidWorkspaceConfigurationChange
()));
this
.
_workspaceConfiguration
=
this
.
_register
(
fileServiceBasedWorkspaceConfiguration
);
this
.
_workspaceConfigurationChangeDisposable
=
this
.
_register
(
this
.
_workspaceConfiguration
.
onDidChange
(
e
=>
this
.
onDidWorkspaceConfigurationChange
(
true
)));
}
private
async
onDidWorkspaceConfigurationChange
():
Promise
<
void
>
{
await
this
.
reload
();
private
async
onDidWorkspaceConfigurationChange
(
reload
:
boolean
):
Promise
<
void
>
{
if
(
reload
)
{
await
this
.
reload
();
}
this
.
updateCache
();
this
.
_onDidUpdateConfiguration
.
fire
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录