Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
46d8d3aa
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,发现更多精彩内容 >>
提交
46d8d3aa
编写于
3月 17, 2020
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Tasks without command are added to instances
Part of #92792
上级
de976e87
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
12 addition
and
6 deletion
+12
-6
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
+12
-6
未找到文件。
src/vs/workbench/contrib/tasks/browser/terminalTaskSystem.ts
浏览文件 @
46d8d3aa
...
@@ -33,7 +33,7 @@ import { IOutputService } from 'vs/workbench/contrib/output/common/output';
...
@@ -33,7 +33,7 @@ import { IOutputService } from 'vs/workbench/contrib/output/common/output';
import
{
StartStopProblemCollector
,
WatchingProblemCollector
,
ProblemCollectorEventKind
,
ProblemHandlingStrategy
}
from
'
vs/workbench/contrib/tasks/common/problemCollectors
'
;
import
{
StartStopProblemCollector
,
WatchingProblemCollector
,
ProblemCollectorEventKind
,
ProblemHandlingStrategy
}
from
'
vs/workbench/contrib/tasks/common/problemCollectors
'
;
import
{
import
{
Task
,
CustomTask
,
ContributedTask
,
RevealKind
,
CommandOptions
,
ShellConfiguration
,
RuntimeType
,
PanelKind
,
Task
,
CustomTask
,
ContributedTask
,
RevealKind
,
CommandOptions
,
ShellConfiguration
,
RuntimeType
,
PanelKind
,
TaskEvent
,
TaskEventKind
,
ShellQuotingOptions
,
ShellQuoting
,
CommandString
,
CommandConfiguration
,
ExtensionTaskSource
,
TaskScope
,
RevealProblemKind
,
DependsOrder
,
TaskSourceKind
TaskEvent
,
TaskEventKind
,
ShellQuotingOptions
,
ShellQuoting
,
CommandString
,
CommandConfiguration
,
ExtensionTaskSource
,
TaskScope
,
RevealProblemKind
,
DependsOrder
,
TaskSourceKind
,
InMemoryTask
}
from
'
vs/workbench/contrib/tasks/common/tasks
'
;
}
from
'
vs/workbench/contrib/tasks/common/tasks
'
;
import
{
import
{
ITaskSystem
,
ITaskSummary
,
ITaskExecuteResult
,
TaskExecuteKind
,
TaskError
,
TaskErrors
,
ITaskResolver
,
ITaskSystem
,
ITaskSummary
,
ITaskExecuteResult
,
TaskExecuteKind
,
TaskError
,
TaskErrors
,
ITaskResolver
,
...
@@ -250,10 +250,12 @@ export class TerminalTaskSystem implements ITaskSystem {
...
@@ -250,10 +250,12 @@ export class TerminalTaskSystem implements ITaskSystem {
executeResult
.
promise
.
then
(
summary
=>
{
executeResult
.
promise
.
then
(
summary
=>
{
this
.
lastTask
=
this
.
currentTask
;
this
.
lastTask
=
this
.
currentTask
;
});
});
if
(
!
this
.
instances
[
commonKey
])
{
if
(
InMemoryTask
.
is
(
task
)
||
!
this
.
isTaskEmpty
(
task
))
{
this
.
instances
[
commonKey
]
=
new
InstanceManager
();
if
(
!
this
.
instances
[
commonKey
])
{
this
.
instances
[
commonKey
]
=
new
InstanceManager
();
}
this
.
instances
[
commonKey
].
addInstance
();
}
}
this
.
instances
[
commonKey
].
addInstance
();
return
executeResult
;
return
executeResult
;
}
catch
(
error
)
{
}
catch
(
error
)
{
if
(
error
instanceof
TaskError
)
{
if
(
error
instanceof
TaskError
)
{
...
@@ -606,8 +608,7 @@ export class TerminalTaskSystem implements ITaskSystem {
...
@@ -606,8 +608,7 @@ export class TerminalTaskSystem implements ITaskSystem {
const
resolvedVariables
=
this
.
resolveVariablesFromSet
(
systemInfo
,
workspaceFolder
,
task
,
variables
,
alreadyResolved
);
const
resolvedVariables
=
this
.
resolveVariablesFromSet
(
systemInfo
,
workspaceFolder
,
task
,
variables
,
alreadyResolved
);
return
resolvedVariables
.
then
((
resolvedVariables
)
=>
{
return
resolvedVariables
.
then
((
resolvedVariables
)
=>
{
const
isCustomExecution
=
(
task
.
command
.
runtime
===
RuntimeType
.
CustomExecution
);
if
(
resolvedVariables
&&
!
this
.
isTaskEmpty
(
task
))
{
if
(
resolvedVariables
&&
(
task
.
command
!==
undefined
)
&&
task
.
command
.
runtime
&&
(
isCustomExecution
||
(
task
.
command
.
name
!==
undefined
)))
{
this
.
currentTask
.
resolvedVariables
=
resolvedVariables
;
this
.
currentTask
.
resolvedVariables
=
resolvedVariables
;
return
this
.
executeInTerminal
(
task
,
trigger
,
new
VariableResolver
(
workspaceFolder
,
systemInfo
,
resolvedVariables
.
variables
,
this
.
configurationResolverService
),
workspaceFolder
);
return
this
.
executeInTerminal
(
task
,
trigger
,
new
VariableResolver
(
workspaceFolder
,
systemInfo
,
resolvedVariables
.
variables
,
this
.
configurationResolverService
),
workspaceFolder
);
}
else
{
}
else
{
...
@@ -620,6 +621,11 @@ export class TerminalTaskSystem implements ITaskSystem {
...
@@ -620,6 +621,11 @@ export class TerminalTaskSystem implements ITaskSystem {
});
});
}
}
private
isTaskEmpty
(
task
:
CustomTask
|
ContributedTask
):
boolean
{
const
isCustomExecution
=
(
task
.
command
.
runtime
===
RuntimeType
.
CustomExecution
);
return
!
((
task
.
command
!==
undefined
)
&&
task
.
command
.
runtime
&&
(
isCustomExecution
||
(
task
.
command
.
name
!==
undefined
)));
}
private
reexecuteCommand
(
task
:
CustomTask
|
ContributedTask
,
trigger
:
string
,
alreadyResolved
:
Map
<
string
,
string
>
):
Promise
<
ITaskSummary
>
{
private
reexecuteCommand
(
task
:
CustomTask
|
ContributedTask
,
trigger
:
string
,
alreadyResolved
:
Map
<
string
,
string
>
):
Promise
<
ITaskSummary
>
{
const
lastTask
=
this
.
lastTask
;
const
lastTask
=
this
.
lastTask
;
if
(
!
lastTask
)
{
if
(
!
lastTask
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录