Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
e25d8201
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,发现更多精彩内容 >>
未验证
提交
e25d8201
编写于
9月 29, 2021
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #129968
上级
e65864e3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
53 addition
and
30 deletion
+53
-30
src/vs/platform/configuration/common/configurationModels.ts
src/vs/platform/configuration/common/configurationModels.ts
+40
-30
src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
...s/configuration/test/browser/configurationService.test.ts
+13
-0
未找到文件。
src/vs/platform/configuration/common/configurationModels.ts
浏览文件 @
e25d8201
...
...
@@ -21,11 +21,12 @@ import { Workspace } from 'vs/platform/workspace/common/workspace';
export
class
ConfigurationModel
implements
IConfigurationModel
{
private
isFrozen
:
boolean
=
false
;
private
readonly
overrideConfigurations
=
new
Map
<
string
,
ConfigurationModel
>
();
constructor
(
private
_contents
:
any
=
{},
private
_keys
:
string
[]
=
[],
private
_overrides
:
IOverrides
[]
=
[]
private
readonly
_contents
:
any
=
{},
private
readonly
_keys
:
string
[]
=
[],
private
readonly
_overrides
:
IOverrides
[]
=
[]
)
{
}
...
...
@@ -66,34 +67,12 @@ export class ConfigurationModel implements IConfigurationModel {
}
override
(
identifier
:
string
):
ConfigurationModel
{
const
overrideContents
=
this
.
getContentsForOverrideIdentifer
(
identifier
);
if
(
!
overrideContents
||
typeof
overrideContents
!==
'
object
'
||
!
Object
.
keys
(
overrideContents
).
length
)
{
// If there are no valid overrides, return self
return
this
;
let
overrideConfigurationModel
=
this
.
overrideConfigurations
.
get
(
identifier
);
if
(
!
overrideConfigurationModel
)
{
overrideConfigurationModel
=
this
.
createOverrideConfigurationModel
(
identifier
);
this
.
overrideConfigurations
.
set
(
identifier
,
overrideConfigurationModel
);
}
let
contents
:
any
=
{};
for
(
const
key
of
arrays
.
distinct
([...
Object
.
keys
(
this
.
contents
),
...
Object
.
keys
(
overrideContents
)]))
{
let
contentsForKey
=
this
.
contents
[
key
];
let
overrideContentsForKey
=
overrideContents
[
key
];
// If there are override contents for the key, clone and merge otherwise use base contents
if
(
overrideContentsForKey
)
{
// Clone and merge only if base contents and override contents are of type object otherwise just override
if
(
typeof
contentsForKey
===
'
object
'
&&
typeof
overrideContentsForKey
===
'
object
'
)
{
contentsForKey
=
objects
.
deepClone
(
contentsForKey
);
this
.
mergeContents
(
contentsForKey
,
overrideContentsForKey
);
}
else
{
contentsForKey
=
overrideContentsForKey
;
}
}
contents
[
key
]
=
contentsForKey
;
}
return
new
ConfigurationModel
(
contents
,
this
.
keys
,
this
.
overrides
);
return
overrideConfigurationModel
;
}
merge
(...
others
:
ConfigurationModel
[]):
ConfigurationModel
{
...
...
@@ -126,6 +105,37 @@ export class ConfigurationModel implements IConfigurationModel {
return
this
;
}
private
createOverrideConfigurationModel
(
identifier
:
string
):
ConfigurationModel
{
const
overrideContents
=
this
.
getContentsForOverrideIdentifer
(
identifier
);
if
(
!
overrideContents
||
typeof
overrideContents
!==
'
object
'
||
!
Object
.
keys
(
overrideContents
).
length
)
{
// If there are no valid overrides, return self
return
this
;
}
let
contents
:
any
=
{};
for
(
const
key
of
arrays
.
distinct
([...
Object
.
keys
(
this
.
contents
),
...
Object
.
keys
(
overrideContents
)]))
{
let
contentsForKey
=
this
.
contents
[
key
];
let
overrideContentsForKey
=
overrideContents
[
key
];
// If there are override contents for the key, clone and merge otherwise use base contents
if
(
overrideContentsForKey
)
{
// Clone and merge only if base contents and override contents are of type object otherwise just override
if
(
typeof
contentsForKey
===
'
object
'
&&
typeof
overrideContentsForKey
===
'
object
'
)
{
contentsForKey
=
objects
.
deepClone
(
contentsForKey
);
this
.
mergeContents
(
contentsForKey
,
overrideContentsForKey
);
}
else
{
contentsForKey
=
overrideContentsForKey
;
}
}
contents
[
key
]
=
contentsForKey
;
}
return
new
ConfigurationModel
(
contents
,
this
.
keys
,
this
.
overrides
);
}
private
mergeContents
(
source
:
any
,
target
:
any
):
void
{
for
(
const
key
of
Object
.
keys
(
target
))
{
if
(
key
in
source
)
{
...
...
src/vs/workbench/services/configuration/test/browser/configurationService.test.ts
浏览文件 @
e25d8201
...
...
@@ -668,6 +668,12 @@ suite('WorkspaceConfigurationService - Folder', () => {
},
}
});
configurationRegistry
.
registerDefaultConfigurations
([{
'
[jsonc]
'
:
{
'
configurationService.folder.languageSetting
'
:
'
languageValue
'
}
}]);
});
setup
(
async
()
=>
{
...
...
@@ -1052,6 +1058,13 @@ suite('WorkspaceConfigurationService - Folder', () => {
.
then
(()
=>
assert
.
ok
(
target
.
called
));
});
test
(
'
resource language configuration
'
,
async
()
=>
{
assert
.
strictEqual
(
testObject
.
getValue
(
'
configurationService.folder.languageSetting
'
,
{
resource
:
workspaceService
.
getWorkspace
().
folders
[
0
].
uri
,
overrideIdentifier
:
'
jsonc
'
}),
'
languageValue
'
);
await
testObject
.
updateValue
(
'
configurationService.folder.languageSetting
'
,
'
languageValueUpdated
'
,
{
resource
:
workspaceService
.
getWorkspace
().
folders
[
0
].
uri
,
overrideIdentifier
:
'
jsonc
'
},
ConfigurationTarget
.
WORKSPACE_FOLDER
);
assert
.
strictEqual
(
testObject
.
getValue
(
'
configurationService.folder.languageSetting
'
,
{
resource
:
workspaceService
.
getWorkspace
().
folders
[
0
].
uri
,
overrideIdentifier
:
'
jsonc
'
}),
'
languageValueUpdated
'
);
});
test
(
'
remove setting from all targets
'
,
async
()
=>
{
const
key
=
'
configurationService.folder.testSetting
'
;
await
testObject
.
updateValue
(
key
,
'
workspaceValue
'
,
ConfigurationTarget
.
WORKSPACE
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录