Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
bfc01bb9
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,发现更多精彩内容 >>
提交
bfc01bb9
编写于
2月 26, 2020
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Bandaid for task not running after detection is canceled
Fixes #90474
上级
1d58311f
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
39 addition
and
4 deletion
+39
-4
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
...vs/workbench/contrib/tasks/browser/abstractTaskService.ts
+39
-4
未找到文件。
src/vs/workbench/contrib/tasks/browser/abstractTaskService.ts
浏览文件 @
bfc01bb9
...
...
@@ -562,6 +562,37 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
protected
abstract
versionAndEngineCompatible
(
filter
?:
TaskFilter
):
boolean
;
private
tasksAndGroupedTasks
(
filter
?:
TaskFilter
):
{
tasks
:
Promise
<
Task
[]
>
,
grouped
:
Promise
<
TaskMap
>
}
{
if
(
!
this
.
versionAndEngineCompatible
(
filter
))
{
return
{
tasks
:
Promise
.
resolve
<
Task
[]
>
([]),
grouped
:
Promise
.
resolve
(
new
TaskMap
())
};
}
const
grouped
=
this
.
getGroupedTasks
(
filter
?
filter
.
type
:
undefined
);
const
tasks
=
grouped
.
then
((
map
)
=>
{
if
(
!
filter
||
!
filter
.
type
)
{
return
map
.
all
();
}
let
result
:
Task
[]
=
[];
map
.
forEach
((
tasks
)
=>
{
for
(
let
task
of
tasks
)
{
if
(
ContributedTask
.
is
(
task
)
&&
task
.
defines
.
type
===
filter
.
type
)
{
result
.
push
(
task
);
}
else
if
(
CustomTask
.
is
(
task
))
{
if
(
task
.
type
===
filter
.
type
)
{
result
.
push
(
task
);
}
else
{
let
customizes
=
task
.
customizes
();
if
(
customizes
&&
customizes
.
type
===
filter
.
type
)
{
result
.
push
(
task
);
}
}
}
}
});
return
result
;
});
return
{
tasks
,
grouped
};
}
public
tasks
(
filter
?:
TaskFilter
):
Promise
<
Task
[]
>
{
if
(
!
this
.
versionAndEngineCompatible
(
filter
))
{
return
Promise
.
resolve
<
Task
[]
>
([]);
...
...
@@ -705,11 +736,11 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
});
}
public
run
(
task
:
Task
|
undefined
,
options
?:
ProblemMatcherRunOptions
,
runSource
:
TaskRunSource
=
TaskRunSource
.
System
):
Promise
<
ITaskSummary
|
undefined
>
{
public
run
(
task
:
Task
|
undefined
,
options
?:
ProblemMatcherRunOptions
,
runSource
:
TaskRunSource
=
TaskRunSource
.
System
,
grouped
?:
Promise
<
TaskMap
>
):
Promise
<
ITaskSummary
|
undefined
>
{
if
(
!
task
)
{
throw
new
TaskError
(
Severity
.
Info
,
nls
.
localize
(
'
TaskServer.noTask
'
,
'
Task to execute is undefined
'
),
TaskErrors
.
TaskNotFound
);
}
return
this
.
getGroupedTasks
(
).
then
((
grouped
)
=>
{
return
(
grouped
??
this
.
getGroupedTasks
()
).
then
((
grouped
)
=>
{
let
resolver
=
this
.
createResolver
(
grouped
);
if
(
options
&&
options
.
attachProblemMatcher
&&
this
.
shouldAttachProblemMatcher
(
task
)
&&
!
InMemoryTask
.
is
(
task
))
{
return
this
.
attachProblemMatcher
(
task
).
then
((
toExecute
)
=>
{
...
...
@@ -2193,7 +2224,11 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
private
doRunTaskCommand
(
tasks
?:
Task
[]):
void
{
this
.
showIgnoredFoldersMessage
().
then
(()
=>
{
this
.
showQuickPick
(
tasks
?
tasks
:
this
.
tasks
(),
let
taskResult
:
{
tasks
:
Promise
<
Task
[]
>
,
grouped
:
Promise
<
TaskMap
>
}
|
undefined
=
undefined
;
if
(
!
tasks
)
{
taskResult
=
this
.
tasksAndGroupedTasks
();
}
this
.
showQuickPick
(
tasks
?
tasks
:
taskResult
!
.
tasks
,
nls
.
localize
(
'
TaskService.pickRunTask
'
,
'
Select the task to run
'
),
{
label
:
nls
.
localize
(
'
TaskService.noEntryToRun
'
,
'
No task to run found. Configure Tasks...
'
),
...
...
@@ -2208,7 +2243,7 @@ export abstract class AbstractTaskService extends Disposable implements ITaskSer
if
(
task
===
null
)
{
this
.
runConfigureTasks
();
}
else
{
this
.
run
(
task
,
{
attachProblemMatcher
:
true
},
TaskRunSource
.
User
).
then
(
undefined
,
reason
=>
{
this
.
run
(
task
,
{
attachProblemMatcher
:
true
},
TaskRunSource
.
User
,
taskResult
?.
grouped
).
then
(
undefined
,
reason
=>
{
// eat the error, it has already been surfaced to the user and we don't care about it here
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录