Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
3757d767
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,发现更多精彩内容 >>
提交
3757d767
编写于
5月 09, 2018
作者:
S
Sandeep Somavarapu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix #49399
上级
c9864420
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
4 deletion
+11
-4
src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
...vices/configuration/common/configurationExtensionPoint.ts
+11
-4
未找到文件。
src/vs/workbench/services/configuration/common/configurationExtensionPoint.ts
浏览文件 @
3757d767
...
@@ -11,6 +11,7 @@ import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/e
...
@@ -11,6 +11,7 @@ import { ExtensionsRegistry, IExtensionPointUser } from 'vs/workbench/services/e
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
,
editorConfigurationSchemaId
,
IDefaultConfigurationExtension
,
validateProperty
,
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IConfigurationNode
,
IConfigurationRegistry
,
Extensions
,
editorConfigurationSchemaId
,
IDefaultConfigurationExtension
,
validateProperty
,
ConfigurationScope
}
from
'
vs/platform/configuration/common/configurationRegistry
'
;
import
{
IJSONContributionRegistry
,
Extensions
as
JSONExtensions
}
from
'
vs/platform/jsonschemas/common/jsonContributionRegistry
'
;
import
{
IJSONContributionRegistry
,
Extensions
as
JSONExtensions
}
from
'
vs/platform/jsonschemas/common/jsonContributionRegistry
'
;
import
{
workspaceSettingsSchemaId
,
launchSchemaId
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
workspaceSettingsSchemaId
,
launchSchemaId
}
from
'
vs/workbench/services/configuration/common/configuration
'
;
import
{
isObject
}
from
'
vs/base/common/types
'
;
const
configurationRegistry
=
Registry
.
as
<
IConfigurationRegistry
>
(
Extensions
.
Configuration
);
const
configurationRegistry
=
Registry
.
as
<
IConfigurationRegistry
>
(
Extensions
.
Configuration
);
...
@@ -131,7 +132,17 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
...
@@ -131,7 +132,17 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
}
}
for
(
let
key
in
properties
)
{
for
(
let
key
in
properties
)
{
const
message
=
validateProperty
(
key
);
const
message
=
validateProperty
(
key
);
if
(
message
)
{
delete
properties
[
key
];
extension
.
collector
.
warn
(
message
);
continue
;
}
const
propertyConfiguration
=
configuration
.
properties
[
key
];
const
propertyConfiguration
=
configuration
.
properties
[
key
];
if
(
!
isObject
(
propertyConfiguration
))
{
delete
properties
[
key
];
extension
.
collector
.
error
(
nls
.
localize
(
'
invalid.property
'
,
"
'configuration.property' must be an object
"
));
continue
;
}
if
(
propertyConfiguration
.
scope
)
{
if
(
propertyConfiguration
.
scope
)
{
if
(
propertyConfiguration
.
scope
.
toString
()
===
'
application
'
)
{
if
(
propertyConfiguration
.
scope
.
toString
()
===
'
application
'
)
{
propertyConfiguration
.
scope
=
ConfigurationScope
.
APPLICATION
;
propertyConfiguration
.
scope
=
ConfigurationScope
.
APPLICATION
;
...
@@ -144,10 +155,6 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
...
@@ -144,10 +155,6 @@ function validateProperties(configuration: IConfigurationNode, extension: IExten
propertyConfiguration
.
scope
=
ConfigurationScope
.
WINDOW
;
propertyConfiguration
.
scope
=
ConfigurationScope
.
WINDOW
;
}
}
propertyConfiguration
.
notMultiRootAdopted
=
!
(
extension
.
description
.
isBuiltin
||
(
Array
.
isArray
(
extension
.
description
.
keywords
)
&&
extension
.
description
.
keywords
.
indexOf
(
'
multi-root ready
'
)
!==
-
1
));
propertyConfiguration
.
notMultiRootAdopted
=
!
(
extension
.
description
.
isBuiltin
||
(
Array
.
isArray
(
extension
.
description
.
keywords
)
&&
extension
.
description
.
keywords
.
indexOf
(
'
multi-root ready
'
)
!==
-
1
));
if
(
message
)
{
extension
.
collector
.
warn
(
message
);
delete
properties
[
key
];
}
}
}
}
}
let
subNodes
=
configuration
.
allOf
;
let
subNodes
=
configuration
.
allOf
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录