Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e7921a0d
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,发现更多精彩内容 >>
提交
e7921a0d
编写于
8月 03, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Debug: fix debt around preLaunchTask
fixes #31674
上级
5a0d16d8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
11 addition
and
38 deletion
+11
-38
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+11
-38
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
e7921a0d
...
...
@@ -38,7 +38,7 @@ import { ViewModel } from 'vs/workbench/parts/debug/common/debugViewModel';
import
*
as
debugactions
from
'
vs/workbench/parts/debug/browser/debugActions
'
;
import
{
ConfigurationManager
}
from
'
vs/workbench/parts/debug/electron-browser/debugConfigurationManager
'
;
import
{
ToggleMarkersPanelAction
}
from
'
vs/workbench/parts/markers/browser/markersPanelActions
'
;
import
{
ITaskService
,
Task
Event
,
TaskType
,
Task
ServiceEvents
,
ITaskSummary
}
from
'
vs/workbench/parts/tasks/common/taskService
'
;
import
{
ITaskService
,
TaskServiceEvents
,
ITaskSummary
}
from
'
vs/workbench/parts/tasks/common/taskService
'
;
import
{
TaskError
}
from
'
vs/workbench/parts/tasks/common/taskSystem
'
;
import
{
VIEWLET_ID
as
EXPLORER_VIEWLET_ID
}
from
'
vs/workbench/parts/files/common/files
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
...
...
@@ -75,7 +75,6 @@ export class DebugService implements debug.IDebugService {
private
allSessionIds
:
Set
<
string
>
;
private
configurationManager
:
ConfigurationManager
;
private
customTelemetryService
:
ITelemetryService
;
private
lastTaskEvent
:
TaskEvent
;
private
toDispose
:
lifecycle
.
IDisposable
[];
private
toDisposeOnSessionEnd
:
Map
<
string
,
lifecycle
.
IDisposable
[]
>
;
private
inDebugMode
:
IContextKey
<
boolean
>
;
...
...
@@ -135,24 +134,8 @@ export class DebugService implements debug.IDebugService {
private
registerListeners
(
lifecycleService
:
ILifecycleService
):
void
{
this
.
toDispose
.
push
(
this
.
fileService
.
onFileChanges
(
e
=>
this
.
onFileChanges
(
e
)));
if
(
this
.
taskService
)
{
this
.
toDispose
.
push
(
this
.
taskService
.
addListener
(
TaskServiceEvents
.
Active
,
(
e
:
TaskEvent
)
=>
{
this
.
lastTaskEvent
=
e
;
}));
this
.
toDispose
.
push
(
this
.
taskService
.
addListener
(
TaskServiceEvents
.
Inactive
,
(
e
:
TaskEvent
)
=>
{
if
(
e
.
type
===
TaskType
.
SingleRun
)
{
this
.
lastTaskEvent
=
null
;
}
}));
this
.
toDispose
.
push
(
this
.
taskService
.
addListener
(
TaskServiceEvents
.
Terminated
,
(
e
:
TaskEvent
)
=>
{
this
.
lastTaskEvent
=
null
;
}));
}
lifecycleService
.
onShutdown
(
this
.
store
,
this
);
lifecycleService
.
onShutdown
(
this
.
dispose
,
this
);
this
.
toDispose
.
push
(
this
.
broadcastService
.
onBroadcast
(
this
.
onBroadcast
,
this
));
}
...
...
@@ -907,29 +890,19 @@ export class DebugService implements debug.IDebugService {
return
TPromise
.
wrapError
(
errors
.
create
(
nls
.
localize
(
'
DebugTaskNotFound
'
,
"
Could not find the preLaunchTask
\
'{0}
\
'.
"
,
taskName
)));
}
// task is already running - nothing to do.
if
(
this
.
lastTaskEvent
&&
this
.
lastTaskEvent
.
taskId
===
task
.
_id
)
{
return
TPromise
.
as
(
null
);
}
return
this
.
taskService
.
getActiveTasks
().
then
(
tasks
=>
{
if
(
tasks
.
filter
(
t
=>
t
.
_id
===
task
.
_id
).
length
)
{
// task is already running - nothing to do.
return
TPromise
.
as
(
null
);
}
if
(
this
.
lastTaskEvent
)
{
// there is a different task running currently.
return
TPromise
.
wrapError
(
errors
.
create
(
nls
.
localize
(
'
differentTaskRunning
'
,
"
The task '{0}' is already running. Cannot run pre-launch task '{1}'.
"
,
this
.
lastTaskEvent
.
taskName
,
taskName
)));
}
const
taskPromise
=
this
.
taskService
.
run
(
task
);
if
(
task
.
isBackground
)
{
return
new
TPromise
((
c
,
e
)
=>
this
.
taskService
.
addOneTimeListener
(
TaskServiceEvents
.
Inactive
,
()
=>
c
(
null
)));
}
// no task running, execute the preLaunchTask.
const
taskPromise
=
this
.
taskService
.
run
(
task
).
then
(
result
=>
{
this
.
lastTaskEvent
=
null
;
return
result
;
},
err
=>
{
this
.
lastTaskEvent
=
null
;
return
taskPromise
;
});
if
(
task
.
isBackground
)
{
return
new
TPromise
((
c
,
e
)
=>
this
.
taskService
.
addOneTimeListener
(
TaskServiceEvents
.
Inactive
,
()
=>
c
(
null
)));
}
return
taskPromise
;
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录