Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
8455a0aa
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,发现更多精彩内容 >>
提交
8455a0aa
编写于
11月 07, 2018
作者:
D
Dirk Baeumer
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Convert TPromose -> Promise
上级
364e1a85
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
11 deletion
+10
-11
src/vs/workbench/parts/tasks/node/processTaskSystem.ts
src/vs/workbench/parts/tasks/node/processTaskSystem.ts
+10
-11
未找到文件。
src/vs/workbench/parts/tasks/node/processTaskSystem.ts
浏览文件 @
8455a0aa
...
...
@@ -7,7 +7,6 @@ import * as nls from 'vs/nls';
import
*
as
Objects
from
'
vs/base/common/objects
'
;
import
*
as
Types
from
'
vs/base/common/types
'
;
import
*
as
Platform
from
'
vs/base/common/platform
'
;
import
{
TPromise
,
Promise
}
from
'
vs/base/common/winjs.base
'
;
import
*
as
Async
from
'
vs/base/common/async
'
;
import
Severity
from
'
vs/base/common/severity
'
;
import
*
as
Strings
from
'
vs/base/common/strings
'
;
...
...
@@ -51,7 +50,7 @@ export class ProcessTaskSystem implements ITaskSystem {
private
errorsShown
:
boolean
;
private
childProcess
:
LineProcess
;
private
activeTask
:
CustomTask
;
private
activeTaskPromise
:
T
Promise
<
ITaskSummary
>
;
private
activeTaskPromise
:
Promise
<
ITaskSummary
>
;
private
readonly
_onDidStateChange
:
Emitter
<
TaskEvent
>
;
...
...
@@ -75,8 +74,8 @@ export class ProcessTaskSystem implements ITaskSystem {
return
this
.
_onDidStateChange
.
event
;
}
public
isActive
():
T
Promise
<
boolean
>
{
return
TPromise
.
as
(
!!
this
.
childProcess
);
public
isActive
():
Promise
<
boolean
>
{
return
Promise
.
resolve
(
!!
this
.
childProcess
);
}
public
isActiveSync
():
boolean
{
...
...
@@ -117,14 +116,14 @@ export class ProcessTaskSystem implements ITaskSystem {
return
true
;
}
public
terminate
(
task
:
Task
):
T
Promise
<
TaskTerminateResponse
>
{
public
terminate
(
task
:
Task
):
Promise
<
TaskTerminateResponse
>
{
if
(
!
this
.
activeTask
||
Task
.
getMapKey
(
this
.
activeTask
)
!==
Task
.
getMapKey
(
task
))
{
return
TPromise
.
as
<
TaskTerminateResponse
>
({
success
:
false
,
task
:
undefined
});
return
Promise
.
resolve
<
TaskTerminateResponse
>
({
success
:
false
,
task
:
undefined
});
}
return
this
.
terminateAll
().
then
(
values
=>
values
[
0
]);
}
public
terminateAll
():
T
Promise
<
TaskTerminateResponse
[]
>
{
public
terminateAll
():
Promise
<
TaskTerminateResponse
[]
>
{
if
(
this
.
childProcess
)
{
let
task
=
this
.
activeTask
;
return
this
.
childProcess
.
terminate
().
then
((
response
)
=>
{
...
...
@@ -133,7 +132,7 @@ export class ProcessTaskSystem implements ITaskSystem {
return
[
result
];
});
}
return
TPromise
.
as
<
TaskTerminateResponse
[]
>
([{
success
:
true
,
task
:
undefined
}]);
return
Promise
.
resolve
<
TaskTerminateResponse
[]
>
([{
success
:
true
,
task
:
undefined
}]);
}
private
executeTask
(
task
:
Task
,
trigger
:
string
=
Triggers
.
command
):
ITaskExecuteResult
{
...
...
@@ -169,7 +168,7 @@ export class ProcessTaskSystem implements ITaskSystem {
}
*/
this
.
telemetryService
.
publicLog
(
ProcessTaskSystem
.
TelemetryEventName
,
telemetryEvent
);
return
TPromise
.
wrapError
<
ITaskSummary
>
(
err
);
return
Promise
.
reject
<
ITaskSummary
>
(
err
);
});
return
result
;
}
catch
(
err
)
{
...
...
@@ -356,7 +355,7 @@ export class ProcessTaskSystem implements ITaskSystem {
this
.
activeTaskPromise
=
null
;
}
private
handleError
(
task
:
CustomTask
,
errorData
:
ErrorData
):
Promise
{
private
handleError
(
task
:
CustomTask
,
errorData
:
ErrorData
):
Promise
<
ITaskSummary
>
{
let
makeVisible
=
false
;
if
(
errorData
.
error
&&
!
errorData
.
terminated
)
{
let
args
:
string
=
task
.
command
.
args
?
task
.
command
.
args
.
join
(
'
'
)
:
''
;
...
...
@@ -382,7 +381,7 @@ export class ProcessTaskSystem implements ITaskSystem {
error
.
stderr
=
errorData
.
stderr
;
error
.
stdout
=
errorData
.
stdout
;
error
.
terminated
=
errorData
.
terminated
;
return
TPromise
.
wrapError
(
error
);
return
Promise
.
reject
(
error
);
}
private
checkTerminated
(
task
:
Task
,
data
:
SuccessData
|
ErrorData
):
boolean
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录