Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
fc3083dd
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,发现更多精彩内容 >>
未验证
提交
fc3083dd
编写于
11月 13, 2018
作者:
A
Alex Ross
提交者:
GitHub
11月 13, 2018
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
tasks.json should use deprecation message for env. config. and command. (#62787)
Fixes #21340
上级
c72cb129
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
27 addition
and
4 deletion
+27
-4
src/vs/workbench/parts/debug/node/debugger.ts
src/vs/workbench/parts/debug/node/debugger.ts
+2
-3
src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
...s/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
+13
-1
src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts
...onfigurationResolver/common/configurationResolverUtils.ts
+12
-0
未找到文件。
src/vs/workbench/parts/debug/node/debugger.ts
浏览文件 @
fc3083dd
...
...
@@ -17,6 +17,7 @@ import { ICommandService } from 'vs/platform/commands/common/commands';
import
{
IOutputService
}
from
'
vs/workbench/parts/output/common/output
'
;
import
{
ExecutableDebugAdapter
,
SocketDebugAdapter
}
from
'
vs/workbench/parts/debug/node/debugAdapter
'
;
import
{
IConfigurationResolverService
}
from
'
vs/workbench/services/configurationResolver/common/configurationResolver
'
;
import
*
as
ConfigurationResolverUtils
from
'
vs/workbench/services/configurationResolver/common/configurationResolverUtils
'
;
import
{
TelemetryService
}
from
'
vs/platform/telemetry/common/telemetryService
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
memoize
}
from
'
vs/base/common/decorators
'
;
...
...
@@ -291,9 +292,7 @@ export class Debugger implements IDebugger {
};
Object
.
keys
(
attributes
.
properties
).
forEach
(
name
=>
{
// Use schema allOf property to get independent error reporting #21113
attributes
.
properties
[
name
].
pattern
=
attributes
.
properties
[
name
].
pattern
||
'
^(?!.*
\\
$
\\
{(env|config|command)
\\
.)
'
;
attributes
.
properties
[
name
].
patternErrorMessage
=
attributes
.
properties
[
name
].
patternErrorMessage
||
nls
.
localize
(
'
deprecatedVariables
'
,
"
'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead.
"
);
ConfigurationResolverUtils
.
applyDeprecatedVariableMessage
(
attributes
.
properties
[
name
]);
});
return
attributes
;
...
...
src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
浏览文件 @
fc3083dd
...
...
@@ -5,12 +5,13 @@
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
Objects
from
'
vs/base/common/objects
'
;
import
{
IJSONSchema
}
from
'
vs/base/common/jsonSchema
'
;
import
{
IJSONSchema
,
IJSONSchemaMap
}
from
'
vs/base/common/jsonSchema
'
;
import
commonSchema
from
'
./jsonSchemaCommon
'
;
import
{
ProblemMatcherRegistry
}
from
'
vs/workbench/parts/tasks/common/problemMatcher
'
;
import
{
TaskDefinitionRegistry
}
from
'
../common/taskDefinitionRegistry
'
;
import
*
as
ConfigurationResolverUtils
from
'
vs/workbench/services/configurationResolver/common/configurationResolverUtils
'
;
function
fixReferences
(
literal
:
any
)
{
if
(
Array
.
isArray
(
literal
))
{
...
...
@@ -458,10 +459,21 @@ const schema: IJSONSchema = {
schema
.
definitions
=
definitions
;
function
deprecatedVariableMessage
(
schemaMap
:
IJSONSchemaMap
,
property
:
string
)
{
if
(
schemaMap
[
property
].
properties
)
{
Object
.
keys
(
schemaMap
[
property
].
properties
).
forEach
(
name
=>
{
deprecatedVariableMessage
(
schemaMap
[
property
].
properties
,
name
);
});
}
else
{
ConfigurationResolverUtils
.
applyDeprecatedVariableMessage
(
schemaMap
[
property
]);
}
}
Object
.
getOwnPropertyNames
(
definitions
).
forEach
(
key
=>
{
let
newKey
=
key
+
'
2
'
;
definitions
[
newKey
]
=
definitions
[
key
];
delete
definitions
[
key
];
deprecatedVariableMessage
(
definitions
,
newKey
);
});
fixReferences
(
schema
);
...
...
src/vs/workbench/services/configurationResolver/common/configurationResolverUtils.ts
0 → 100644
浏览文件 @
fc3083dd
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
*
as
nls
from
'
vs/nls
'
;
import
{
IJSONSchema
}
from
'
vs/base/common/jsonSchema
'
;
export
function
applyDeprecatedVariableMessage
(
schema
:
IJSONSchema
)
{
schema
.
pattern
=
schema
.
pattern
||
'
^(?!.*
\\
$
\\
{(env|config|command)
\\
.)
'
;
schema
.
patternErrorMessage
=
schema
.
patternErrorMessage
||
nls
.
localize
(
'
deprecatedVariables
'
,
"
'env.', 'config.' and 'command.' are deprecated, use 'env:', 'config:' and 'command:' instead.
"
);
}
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录