Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
fa6145fc
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,发现更多精彩内容 >>
提交
fa6145fc
编写于
6月 26, 2017
作者:
D
Dirk Baeumer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixes #29446: Issue a error if version 2.0.0 defines global OS specific tasks.
上级
7b90f16e
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
3 deletion
+23
-3
src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
...s/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
+8
-3
src/vs/workbench/parts/tasks/node/taskConfiguration.ts
src/vs/workbench/parts/tasks/node/taskConfiguration.ts
+15
-0
未找到文件。
src/vs/workbench/parts/tasks/electron-browser/jsonSchema_v2.ts
浏览文件 @
fa6145fc
...
...
@@ -245,9 +245,14 @@ definitions.commandConfiguration.properties.isShellCommand = Objects.deepClone(s
definitions
.
options
.
properties
.
shell
=
{
$ref
:
'
#/definitions/shellConfiguration
'
};
definitions
.
taskRunnerConfiguration
.
properties
.
isShellCommand
=
Objects
.
deepClone
(
shellCommand
);
definitions
.
taskRunnerConfiguration
.
properties
.
type
=
Objects
.
deepClone
(
taskType
);
definitions
.
taskRunnerConfiguration
.
properties
.
version
=
Objects
.
deepClone
(
version
);
let
osSpecificTaskRunnerConfiguration
=
Objects
.
deepClone
(
definitions
.
taskRunnerConfiguration
);
delete
osSpecificTaskRunnerConfiguration
.
properties
.
tasks
;
osSpecificTaskRunnerConfiguration
.
additionalProperties
=
false
;
definitions
.
osSpecificTaskRunnerConfiguration
=
osSpecificTaskRunnerConfiguration
;
const
schema
:
IJSONSchema
=
{
oneOf
:
[
...
...
@@ -259,15 +264,15 @@ const schema: IJSONSchema = {
properties
:
{
version
:
Objects
.
deepClone
(
version
),
windows
:
{
'
$ref
'
:
'
#/definitions/
t
askRunnerConfiguration
'
,
'
$ref
'
:
'
#/definitions/
osSpecificT
askRunnerConfiguration
'
,
'
description
'
:
nls
.
localize
(
'
JsonSchema.windows
'
,
'
Windows specific command configuration
'
)
},
osx
:
{
'
$ref
'
:
'
#/definitions/
t
askRunnerConfiguration
'
,
'
$ref
'
:
'
#/definitions/
osSpecificT
askRunnerConfiguration
'
,
'
description
'
:
nls
.
localize
(
'
JsonSchema.mac
'
,
'
Mac specific command configuration
'
)
},
linux
:
{
'
$ref
'
:
'
#/definitions/
t
askRunnerConfiguration
'
,
'
$ref
'
:
'
#/definitions/
osSpecificT
askRunnerConfiguration
'
,
'
description
'
:
nls
.
localize
(
'
JsonSchema.linux
'
,
'
Linux specific command configuration
'
)
}
}
...
...
src/vs/workbench/parts/tasks/node/taskConfiguration.ts
浏览文件 @
fa6145fc
...
...
@@ -1649,12 +1649,27 @@ class ConfigurationParser {
}
context
.
namedProblemMatchers
=
ProblemMatcherConverter
.
namedFrom
(
fileConfig
.
declares
,
context
);
let
globalTasks
:
Tasks
.
CustomTask
[];
let
externalGlobalTasks
:
(
ConfiguringTask
|
CustomTask
)[];
if
(
fileConfig
.
windows
&&
Platform
.
platform
===
Platform
.
Platform
.
Windows
)
{
globalTasks
=
TaskParser
.
from
(
fileConfig
.
windows
.
tasks
,
globals
,
context
).
custom
;
externalGlobalTasks
=
fileConfig
.
windows
.
tasks
;
}
else
if
(
fileConfig
.
osx
&&
Platform
.
platform
===
Platform
.
Platform
.
Mac
)
{
globalTasks
=
TaskParser
.
from
(
fileConfig
.
osx
.
tasks
,
globals
,
context
).
custom
;
externalGlobalTasks
=
fileConfig
.
osx
.
tasks
;
}
else
if
(
fileConfig
.
linux
&&
Platform
.
platform
===
Platform
.
Platform
.
Linux
)
{
globalTasks
=
TaskParser
.
from
(
fileConfig
.
linux
.
tasks
,
globals
,
context
).
custom
;
externalGlobalTasks
=
fileConfig
.
linux
.
tasks
;
}
if
(
context
.
schemaVersion
===
Tasks
.
JsonSchemaVersion
.
V2_0_0
&&
globalTasks
&&
globalTasks
.
length
>
0
&&
externalGlobalTasks
&&
externalGlobalTasks
.
length
>
0
)
{
let
taskContent
:
string
[]
=
[];
for
(
let
task
of
externalGlobalTasks
)
{
taskContent
.
push
(
JSON
.
stringify
(
task
,
null
,
4
));
}
context
.
problemReporter
.
error
(
nls
.
localize
(
'
TaskParse.noOsSpecificGlobalTasks
'
,
'
Task version 2.0.0 doesn
\'
t support gloabl OS specific tasks. Convert them to a task with a OS specific command. Affected tasks are:
\n
{0}
'
,
taskContent
.
join
(
'
\n
'
))
);
}
let
result
:
TaskParseResult
=
{
custom
:
undefined
,
configured
:
undefined
};
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录