Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
0d45ae7a
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,发现更多精彩内容 >>
提交
0d45ae7a
编写于
7月 25, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
If the restart is automatic disconnect, otherwise send the terminate signal
fixes #55064
上级
9c4e41fc
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
23 addition
and
22 deletion
+23
-22
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+6
-5
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
...workbench/parts/debug/electron-browser/rawDebugSession.ts
+17
-17
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
0d45ae7a
...
...
@@ -166,7 +166,7 @@ export class DebugService implements debug.IDebugService {
});
}
else
{
const
root
=
raw
.
root
;
raw
.
dis
pose
(
);
raw
.
dis
connect
().
done
(
undefined
,
errors
.
onUnexpectedError
);
this
.
doCreateSession
(
root
,
{
resolved
:
session
.
configuration
,
unresolved
:
session
.
unresolvedConfiguration
},
session
.
getId
());
}
...
...
@@ -291,7 +291,7 @@ export class DebugService implements debug.IDebugService {
return
raw
.
configurationDone
().
done
(
null
,
e
=>
{
// Disconnect the debug session on configuration done error #10596
if
(
raw
)
{
raw
.
dis
pose
(
);
raw
.
dis
connect
().
done
(
undefined
,
errors
.
onUnexpectedError
);
}
this
.
notificationService
.
error
(
e
.
message
);
});
...
...
@@ -341,7 +341,7 @@ export class DebugService implements debug.IDebugService {
if
(
event
.
body
&&
event
.
body
.
restart
&&
session
)
{
this
.
restartSession
(
session
,
event
.
body
.
restart
).
done
(
null
,
err
=>
this
.
notificationService
.
error
(
err
.
message
));
}
else
{
raw
.
dis
pose
(
);
raw
.
dis
connect
().
done
(
undefined
,
errors
.
onUnexpectedError
);
}
}
}));
...
...
@@ -973,7 +973,7 @@ export class DebugService implements debug.IDebugService {
this
.
telemetryService
.
publicLog
(
'
debugMisconfiguration
'
,
{
type
:
resolved
?
resolved
.
type
:
undefined
,
error
:
errorMessage
});
this
.
updateStateAndEmit
(
raw
.
getId
(),
debug
.
State
.
Inactive
);
if
(
!
raw
.
disconnected
)
{
raw
.
dis
pose
();
raw
.
dis
connect
();
}
else
if
(
session
)
{
this
.
model
.
removeSession
(
session
.
getId
());
}
...
...
@@ -1110,7 +1110,8 @@ export class DebugService implements debug.IDebugService {
// Do not run preLaunch and postDebug tasks for automatic restarts
this
.
skipRunningTask
=
!!
restartData
;
return
session
.
raw
.
terminate
(
true
).
then
(()
=>
{
// If the restart is automatic disconnect, otherwise send the terminate signal #55064
return
(
!
restartData
?
(
<
RawDebugSession
>
session
.
raw
).
disconnect
(
true
)
:
session
.
raw
.
terminate
(
true
)).
then
(()
=>
{
if
(
strings
.
equalsIgnoreCase
(
session
.
configuration
.
type
,
'
extensionHost
'
)
&&
session
.
raw
.
root
)
{
return
this
.
broadcastService
.
broadcast
({
channel
:
EXTENSION_RELOAD_BROADCAST_CHANNEL
,
...
...
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
浏览文件 @
0d45ae7a
...
...
@@ -348,8 +348,7 @@ export class RawDebugSession implements IRawSession {
return
this
.
send
(
'
terminate
'
,
{
restart
});
}
this
.
dispose
(
restart
);
return
TPromise
.
as
(
null
);
return
this
.
disconnect
(
restart
);
}
public
setBreakpoints
(
args
:
DebugProtocol
.
SetBreakpointsArguments
):
TPromise
<
DebugProtocol
.
SetBreakpointsResponse
>
{
...
...
@@ -475,24 +474,25 @@ export class RawDebugSession implements IRawSession {
});
}
public
dis
pose
(
restart
=
false
):
void
{
public
dis
connect
(
restart
=
false
):
TPromise
<
any
>
{
if
(
this
.
disconnected
)
{
this
.
stopServer
().
done
(
undefined
,
errors
.
onUnexpectedError
);
}
else
{
return
this
.
stopServer
(
);
}
// Cancel all sent promises on disconnect so debug trees are not left in a broken state #3666.
// Give a 1s timeout to give a chance for some promises to complete.
setTimeout
(()
=>
{
this
.
sentPromises
.
forEach
(
p
=>
p
&&
p
.
cancel
());
this
.
sentPromises
=
[];
},
1000
);
if
(
this
.
debugAdapter
&&
!
this
.
disconnected
)
{
// point of no return: from now on don't report any errors
this
.
disconnected
=
true
;
this
.
send
(
'
disconnect
'
,
{
restart
},
false
).
then
(()
=>
this
.
stopServer
(),
()
=>
this
.
stopServer
()).
done
(
undefined
,
errors
.
onUnexpectedError
);
}
// Cancel all sent promises on disconnect so debug trees are not left in a broken state #3666.
// Give a 1s timeout to give a chance for some promises to complete.
setTimeout
(()
=>
{
this
.
sentPromises
.
forEach
(
p
=>
p
&&
p
.
cancel
());
this
.
sentPromises
=
[];
},
1000
);
if
(
this
.
debugAdapter
&&
!
this
.
disconnected
)
{
// point of no return: from now on don't report any errors
this
.
disconnected
=
true
;
return
this
.
send
(
'
disconnect
'
,
{
restart
},
false
).
then
(()
=>
this
.
stopServer
(),
()
=>
this
.
stopServer
());
}
return
TPromise
.
as
(
null
);
}
private
stopServer
():
TPromise
<
any
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录