Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
928e3e01
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,发现更多精彩内容 >>
提交
928e3e01
编写于
3月 26, 2020
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #93366
上级
3364686d
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
3 deletion
+34
-3
src/vs/workbench/services/configuration/browser/configurationService.ts
...ch/services/configuration/browser/configurationService.ts
+34
-3
未找到文件。
src/vs/workbench/services/configuration/browser/configurationService.ts
浏览文件 @
928e3e01
...
...
@@ -192,11 +192,17 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
const
storedFoldersToAdd
:
IStoredWorkspaceFolder
[]
=
[];
foldersToAdd
.
forEach
(
folderToAdd
=>
{
foldersToAdd
.
forEach
(
async
folderToAdd
=>
{
const
folderURI
=
folderToAdd
.
uri
;
if
(
this
.
contains
(
currentWorkspaceFolderUris
,
folderURI
))
{
return
;
// already existing
}
try
{
const
result
=
await
this
.
fileService
.
resolve
(
folderURI
);
if
(
!
result
.
isDirectory
)
{
return
;
}
}
catch
(
e
)
{
/* Ignore */
}
storedFoldersToAdd
.
push
(
getStoredWorkspaceFolder
(
folderURI
,
folderToAdd
.
name
,
workspaceConfigFolder
,
slashForPath
));
});
...
...
@@ -380,6 +386,10 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
if
(
folderChanges
&&
(
folderChanges
.
added
.
length
||
folderChanges
.
removed
.
length
||
folderChanges
.
changed
.
length
))
{
this
.
_onDidChangeWorkspaceFolders
.
fire
(
folderChanges
);
}
}
else
{
// Not waiting on this validation to unblock start up
this
.
validateWorkspaceFoldersAndReload
();
}
});
}
...
...
@@ -531,11 +541,11 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
this
.
triggerConfigurationChange
(
change
,
previous
,
ConfigurationTarget
.
USER
);
}
private
onWorkspaceConfigurationChanged
():
Promise
<
void
>
{
private
async
onWorkspaceConfigurationChanged
():
Promise
<
void
>
{
if
(
this
.
workspace
&&
this
.
workspace
.
configuration
)
{
const
previous
=
{
data
:
this
.
_configuration
.
toData
(),
workspace
:
this
.
workspace
};
const
change
=
this
.
_configuration
.
compareAndUpdateWorkspaceConfiguration
(
this
.
workspaceConfiguration
.
getConfiguration
());
let
configuredFolders
=
toWorkspaceFolders
(
this
.
workspaceConfiguration
.
getFolders
(),
this
.
workspace
.
configuration
);
let
configuredFolders
=
await
this
.
toValidWorkspaceFolders
(
toWorkspaceFolders
(
this
.
workspaceConfiguration
.
getFolders
(),
this
.
workspace
.
configuration
)
);
const
changes
=
this
.
compareFolders
(
this
.
workspace
.
folders
,
configuredFolders
);
if
(
changes
.
added
.
length
||
changes
.
removed
.
length
||
changes
.
changed
.
length
)
{
this
.
workspace
.
folders
=
configuredFolders
;
...
...
@@ -600,6 +610,27 @@ export class WorkspaceService extends Disposable implements IConfigurationServic
})]);
}
private
async
validateWorkspaceFoldersAndReload
():
Promise
<
void
>
{
const
validWorkspaceFolders
=
await
this
.
toValidWorkspaceFolders
(
this
.
workspace
.
folders
);
const
{
removed
}
=
this
.
compareFolders
(
this
.
workspace
.
folders
,
validWorkspaceFolders
);
if
(
removed
.
length
)
{
return
this
.
onWorkspaceConfigurationChanged
();
}
}
private
async
toValidWorkspaceFolders
(
workspaceFolders
:
WorkspaceFolder
[]):
Promise
<
WorkspaceFolder
[]
>
{
const
validWorkspaceFolders
:
WorkspaceFolder
[]
=
[];
for
(
const
workspaceFolder
of
workspaceFolders
)
{
try
{
const
result
=
await
this
.
fileService
.
resolve
(
workspaceFolder
.
uri
);
if
(
result
.
isDirectory
)
{
validWorkspaceFolders
.
push
(
workspaceFolder
);
}
}
catch
(
e
)
{
/* Ignore */
}
}
return
validWorkspaceFolders
;
}
private
writeConfigurationValue
(
key
:
string
,
value
:
any
,
target
:
ConfigurationTarget
,
overrides
:
IConfigurationOverrides
|
undefined
,
donotNotifyError
:
boolean
):
Promise
<
void
>
{
if
(
target
===
ConfigurationTarget
.
DEFAULT
)
{
return
Promise
.
reject
(
new
Error
(
'
Invalid configuration target
'
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录