Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1fc52c5e
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,发现更多精彩内容 >>
提交
1fc52c5e
编写于
9月 21, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: debug anyway simplifcation
#58817
上级
ff907f33
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
23 addition
and
21 deletion
+23
-21
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+23
-21
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
1fc52c5e
...
...
@@ -68,6 +68,11 @@ function once(kind: TaskEventKind, event: Event<TaskEvent>): Event<TaskEvent> {
};
}
const
enum
TaskRunResult
{
Failure
,
Success
}
export
class
DebugService
implements
IDebugService
{
_serviceBrand
:
any
;
...
...
@@ -386,8 +391,8 @@ export class DebugService implements IDebugService {
}
const
workspace
=
launch
?
launch
.
workspace
:
undefined
;
return
this
.
runTask
(
workspace
,
resolvedConfig
.
preLaunchTask
,
resolvedConfig
,
unresolvedConfig
).
then
(
success
=>
{
if
(
s
uccess
)
{
return
this
.
runTask
(
workspace
,
resolvedConfig
.
preLaunchTask
).
then
(
result
=>
{
if
(
result
===
TaskRunResult
.
S
uccess
)
{
return
this
.
doCreateSession
(
workspace
,
{
resolved
:
resolvedConfig
,
unresolved
:
unresolvedConfig
});
}
return
undefined
;
...
...
@@ -561,9 +566,9 @@ export class DebugService implements IDebugService {
const
unresolvedConfiguration
=
session
.
unresolvedConfiguration
;
if
(
session
.
capabilities
.
supportsRestartRequest
)
{
return
this
.
runTask
(
session
.
root
,
session
.
configuration
.
postDebugTask
,
session
.
configuration
,
unresolvedConfiguration
)
.
then
(
success
=>
success
?
this
.
runTask
(
session
.
root
,
session
.
configuration
.
preLaunchTask
,
session
.
configuration
,
unresolvedConfiguration
)
.
then
(
success
=>
s
uccess
?
session
.
restart
()
:
undefined
)
:
TPromise
.
as
(
<
any
>
undefined
));
return
this
.
runTask
(
session
.
root
,
session
.
configuration
.
postDebugTask
)
.
then
(
taskRunResult
=>
taskRunResult
===
TaskRunResult
.
Success
?
this
.
runTask
(
session
.
root
,
session
.
configuration
.
preLaunchTask
)
.
then
(
taskRunResult
=>
taskRunResult
===
TaskRunResult
.
S
uccess
?
session
.
restart
()
:
undefined
)
:
TPromise
.
as
(
<
any
>
undefined
));
}
const
focusedSession
=
this
.
viewModel
.
focusedSession
;
...
...
@@ -647,7 +652,7 @@ export class DebugService implements IDebugService {
return
TPromise
.
as
(
config
);
}
private
showError
(
message
:
string
,
actions
:
IAction
[]
=
[]):
TPromise
<
any
>
{
private
showError
(
message
:
string
,
actions
:
IAction
[]
=
[]):
TPromise
<
boolean
>
{
const
configureAction
=
this
.
instantiationService
.
createInstance
(
debugactions
.
ConfigureAction
,
debugactions
.
ConfigureAction
.
ID
,
debugactions
.
ConfigureAction
.
LABEL
);
actions
.
push
(
configureAction
);
return
this
.
dialogService
.
show
(
severity
.
Error
,
message
,
actions
.
map
(
a
=>
a
.
label
).
concat
(
nls
.
localize
(
'
cancel
'
,
"
Cancel
"
)),
{
cancelId
:
actions
.
length
}).
then
(
choice
=>
{
...
...
@@ -655,40 +660,37 @@ export class DebugService implements IDebugService {
return
actions
[
choice
].
run
();
}
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
false
);
});
}
//---- task management
private
runTask
(
root
:
IWorkspaceFolder
,
taskId
:
string
|
TaskIdentifier
,
config
:
IConfig
,
unresolvedConfig
:
IConfig
):
TPromise
<
boolean
>
{
const
debugAnywayAction
=
new
Action
(
'
debug.debugAnyway
'
,
nls
.
localize
(
'
debugAnyway
'
,
"
Debug Anyway
"
),
undefined
,
true
,
()
=>
{
return
this
.
doCreateSession
(
root
,
{
resolved
:
config
,
unresolved
:
unresolvedConfig
});
});
private
runTask
(
root
:
IWorkspaceFolder
,
taskId
:
string
|
TaskIdentifier
):
TPromise
<
TaskRunResult
>
{
const
debugAnywayAction
=
new
Action
(
'
debug.debugAnyway
'
,
nls
.
localize
(
'
debugAnyway
'
,
"
Debug Anyway
"
),
undefined
,
true
,
()
=>
TPromise
.
as
(
TaskRunResult
.
Success
));
return
this
.
doRunTask
(
root
,
taskId
).
then
((
taskSummary
:
ITaskSummary
)
=>
{
const
errorCount
=
config
.
preLaunchTask
?
this
.
markerService
.
getStatistics
().
errors
:
0
;
const
errorCount
=
taskId
?
this
.
markerService
.
getStatistics
().
errors
:
0
;
const
successExitCode
=
taskSummary
&&
taskSummary
.
exitCode
===
0
;
const
failureExitCode
=
taskSummary
&&
taskSummary
.
exitCode
!==
undefined
&&
taskSummary
.
exitCode
!==
0
;
if
(
successExitCode
||
(
errorCount
===
0
&&
!
failureExitCode
))
{
return
true
;
return
<
any
>
TaskRunResult
.
Success
;
}
const
task
Id
=
typeof
config
.
preLaunchTask
===
'
string
'
?
config
.
preLaunchTask
:
JSON
.
stringify
(
config
.
preLaunchTask
)
;
const
task
Label
=
typeof
taskId
===
'
string
'
?
taskId
:
taskId
.
name
;
const
message
=
errorCount
>
1
?
nls
.
localize
(
'
preLaunchTaskErrors
'
,
"
Build errors have been detected during preLaunchTask '{0}'.
"
,
task
Id
)
?
nls
.
localize
(
'
preLaunchTaskErrors
'
,
"
Build errors have been detected during preLaunchTask '{0}'.
"
,
task
Label
)
:
errorCount
===
1
?
nls
.
localize
(
'
preLaunchTaskError
'
,
"
Build error has been detected during preLaunchTask '{0}'.
"
,
task
Id
)
:
nls
.
localize
(
'
preLaunchTaskExitCode
'
,
"
The preLaunchTask '{0}' terminated with exit code {1}.
"
,
task
Id
,
taskSummary
.
exitCode
);
?
nls
.
localize
(
'
preLaunchTaskError
'
,
"
Build error has been detected during preLaunchTask '{0}'.
"
,
task
Label
)
:
nls
.
localize
(
'
preLaunchTaskExitCode
'
,
"
The preLaunchTask '{0}' terminated with exit code {1}.
"
,
task
Label
,
taskSummary
.
exitCode
);
const
showErrorsAction
=
new
Action
(
'
debug.showErrors
'
,
nls
.
localize
(
'
showErrors
'
,
"
Show Errors
"
),
undefined
,
true
,
()
=>
{
return
this
.
panelService
.
openPanel
(
Constants
.
MARKERS_PANEL_ID
).
then
(()
=>
undefined
);
return
this
.
panelService
.
openPanel
(
Constants
.
MARKERS_PANEL_ID
).
then
(()
=>
TaskRunResult
.
Failure
);
});
return
this
.
showError
(
message
,
[
debugAnywayAction
,
showErrorsAction
])
.
then
(()
=>
false
)
;
return
this
.
showError
(
message
,
[
debugAnywayAction
,
showErrorsAction
]);
},
(
err
:
TaskError
)
=>
{
return
this
.
showError
(
err
.
message
,
[
debugAnywayAction
,
this
.
taskService
.
configureAction
()])
.
then
(()
=>
false
)
;
return
this
.
showError
(
err
.
message
,
[
debugAnywayAction
,
this
.
taskService
.
configureAction
()]);
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录