Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fd70f31b
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,发现更多精彩内容 >>
提交
fd70f31b
编写于
10月 06, 2017
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update workspace configuration with memory configuration
上级
cd4ef9fb
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
6 deletion
+10
-6
src/vs/platform/configuration/common/configurationModels.ts
src/vs/platform/configuration/common/configurationModels.ts
+10
-6
未找到文件。
src/vs/platform/configuration/common/configurationModels.ts
浏览文件 @
fd70f31b
...
...
@@ -219,7 +219,6 @@ export class Configuration {
private
_globalConfiguration
:
ConfigurationModel
;
private
_workspaceConsolidatedConfiguration
:
ConfigurationModel
;
protected
_foldersConsolidatedConfigurations
:
StrictResourceMap
<
ConfigurationModel
>
;
protected
_memoryConsolidatedConfigurations
:
StrictResourceMap
<
ConfigurationModel
>
;
constructor
(
protected
_defaults
:
ConfigurationModel
,
protected
_user
:
ConfigurationModel
,
...
...
@@ -245,18 +244,18 @@ export class Configuration {
protected
merge
():
void
{
this
.
_globalConfiguration
=
this
.
_defaults
.
merge
(
this
.
_user
);
this
.
_workspaceConsolidatedConfiguration
=
this
.
_globalConfiguration
.
merge
(
this
.
_workspaceConfiguration
);
this
.
updateWorkspaceConsolidateConfiguration
(
);
this
.
_foldersConsolidatedConfigurations
=
new
StrictResourceMap
<
ConfigurationModel
>
();
for
(
const
folder
of
this
.
folders
.
keys
())
{
this
.
mergeFolder
(
folder
);
}
}
pr
otected
mergeFolder
(
folder
:
URI
)
{
this
.
_
foldersConsolidatedConfigurations
.
set
(
folder
,
this
.
_workspaceConsolidatedConfiguration
.
merge
(
this
.
folders
.
get
(
folder
))
);
pr
ivate
updateWorkspaceConsolidateConfiguration
(
)
{
this
.
_
workspaceConsolidatedConfiguration
=
this
.
_globalConfiguration
.
merge
(
this
.
_workspaceConfiguration
).
merge
(
this
.
_memoryConfiguration
);
}
protected
merge
Memory
(
folder
:
URI
)
{
protected
merge
Folder
(
folder
:
URI
)
{
this
.
_foldersConsolidatedConfigurations
.
set
(
folder
,
this
.
_workspaceConsolidatedConfiguration
.
merge
(
this
.
folders
.
get
(
folder
)));
}
...
...
@@ -281,11 +280,16 @@ export class Configuration {
}
else
{
memoryConfiguration
=
this
.
_memoryConfiguration
;
}
if
(
value
===
void
0
)
{
memoryConfiguration
.
removeValue
(
key
);
}
else
{
memoryConfiguration
.
setValue
(
key
,
value
);
}
if
(
!
overrides
.
resource
)
{
this
.
updateWorkspaceConsolidateConfiguration
();
}
}
lookup
<
C
>
(
key
:
string
,
overrides
:
IConfigurationOverrides
=
{}):
{
...
...
@@ -335,7 +339,7 @@ export class Configuration {
}
if
(
!
resource
)
{
return
this
.
_workspaceConsolidatedConfiguration
.
merge
(
this
.
_memoryConfiguration
)
;
return
this
.
_workspaceConsolidatedConfiguration
;
}
let
consolidateConfiguration
=
this
.
_workspaceConsolidatedConfiguration
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录