Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d52f137e
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,发现更多精彩内容 >>
提交
d52f137e
编写于
6月 17, 2020
作者:
A
Alex Ross
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Return task execution early from executeTask
Fixes #100361
上级
1abf21d3
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
7 addition
and
4 deletion
+7
-4
src/vs/workbench/api/common/extHostTask.ts
src/vs/workbench/api/common/extHostTask.ts
+3
-2
src/vs/workbench/api/node/extHostTask.ts
src/vs/workbench/api/node/extHostTask.ts
+4
-2
未找到文件。
src/vs/workbench/api/common/extHostTask.ts
浏览文件 @
d52f137e
...
...
@@ -706,7 +706,7 @@ export class WorkerExtHostTask extends ExtHostTaskBase {
public
async
executeTask
(
extension
:
IExtensionDescription
,
task
:
vscode
.
Task
):
Promise
<
vscode
.
TaskExecution
>
{
const
dto
=
TaskDTO
.
from
(
task
,
extension
);
if
(
dto
===
undefined
)
{
return
Promise
.
reject
(
new
Error
(
'
Task is not valid
'
)
);
throw
new
Error
(
'
Task is not valid
'
);
}
// If this task is a custom execution, then we need to save it away
...
...
@@ -720,7 +720,8 @@ export class WorkerExtHostTask extends ExtHostTaskBase {
// Always get the task execution first to prevent timing issues when retrieving it later
const
execution
=
await
this
.
getTaskExecution
(
await
this
.
_proxy
.
$getTaskExecution
(
dto
),
task
);
return
this
.
_proxy
.
$executeTask
(
dto
).
then
(()
=>
execution
);
this
.
_proxy
.
$executeTask
(
dto
).
catch
(
error
=>
{
throw
new
Error
(
error
);
});
return
execution
;
}
protected
provideTasksInternal
(
validTypes
:
{
[
key
:
string
]:
boolean
;
},
taskIdPromises
:
Promise
<
void
>
[],
handler
:
HandlerData
,
value
:
vscode
.
Task
[]
|
null
|
undefined
):
{
tasks
:
tasks
.
TaskDTO
[],
extension
:
IExtensionDescription
}
{
...
...
src/vs/workbench/api/node/extHostTask.ts
浏览文件 @
d52f137e
...
...
@@ -59,7 +59,8 @@ export class ExtHostTask extends ExtHostTaskBase {
throw
new
Error
(
'
Task from execution DTO is undefined
'
);
}
const
execution
=
await
this
.
getTaskExecution
(
executionDTO
,
task
);
return
this
.
_proxy
.
$executeTask
(
executionDTO
.
task
).
then
(()
=>
execution
);
this
.
_proxy
.
$executeTask
(
executionDTO
.
task
).
catch
(
error
=>
{
throw
new
Error
(
error
);
});
return
execution
;
}
else
{
const
dto
=
TaskDTO
.
from
(
task
,
extension
);
if
(
dto
===
undefined
)
{
...
...
@@ -74,7 +75,8 @@ export class ExtHostTask extends ExtHostTaskBase {
}
// Always get the task execution first to prevent timing issues when retrieving it later
const
execution
=
await
this
.
getTaskExecution
(
await
this
.
_proxy
.
$getTaskExecution
(
dto
),
task
);
return
this
.
_proxy
.
$executeTask
(
dto
).
then
(()
=>
execution
);
this
.
_proxy
.
$executeTask
(
dto
).
catch
(
error
=>
{
throw
new
Error
(
error
);
});
return
execution
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录