Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
82c0e30d
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
82c0e30d
编写于
12月 03, 2015
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: remove passing extensionHostData around.
上级
aa3fa0d5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
28 deletion
+14
-28
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+0
-1
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+9
-17
src/vs/workbench/parts/debug/node/debugConfigurationManager.ts
...s/workbench/parts/debug/node/debugConfigurationManager.ts
+1
-3
src/vs/workbench/parts/debug/node/rawDebugSession.ts
src/vs/workbench/parts/debug/node/rawDebugSession.ts
+4
-7
未找到文件。
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
82c0e30d
...
...
@@ -173,7 +173,6 @@ export interface IConfig {
preLaunchTask
?:
string
;
externalConsole
?:
boolean
;
debugServer
?:
number
;
extensionHostData
?:
any
;
}
export
interface
IRawEnvAdapter
{
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
82c0e30d
...
...
@@ -270,12 +270,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
}));
this
.
toDispose
.
push
(
this
.
session
.
addListener2
(
debug
.
SessionEvents
.
DEBUGEE_TERMINATED
,
(
event
:
DebugProtocol
.
TerminatedEvent
)
=>
{
// if there is some opaque data in the body of the terminate event, just pass it to the next launch request
let
extensionHostData
=
event
.
body
?
event
.
body
.
extensionHost
:
undefined
;
if
(
extensionHostData
)
{
this
.
restartSession
(
extensionHostData
).
done
(
null
,
errors
.
onUnexpectedError
);
}
else
if
(
this
.
session
)
{
if
(
this
.
session
)
{
this
.
session
.
disconnect
().
done
(
null
,
errors
.
onUnexpectedError
);
}
}));
...
...
@@ -474,13 +469,11 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
this
.
model
.
clearWatchExpressions
(
id
);
}
public
createSession
(
extensionHostData
?:
any
,
openViewlet
=
true
):
Promise
{
public
createSession
(
openViewlet
=
true
):
Promise
{
this
.
textFileService
.
saveAll
().
done
(
null
,
errors
.
onUnexpectedError
);
if
(
!
extensionHostData
)
{
this
.
clearReplExpressions
();
}
this
.
clearReplExpressions
();
return
this
.
pluginService
.
onReady
().
then
(()
=>
this
.
configurationManager
.
setConfiguration
(
this
.
configurationManager
.
getConfigurationName
()
,
extensionHostData
)).
then
(()
=>
{
return
this
.
pluginService
.
onReady
().
then
(()
=>
this
.
configurationManager
.
setConfiguration
(
this
.
configurationManager
.
getConfigurationName
())).
then
(()
=>
{
const
configuration
=
this
.
configurationManager
.
getConfiguration
();
if
(
!
configuration
)
{
return
this
.
configurationManager
.
openConfigFile
(
false
).
then
(
openend
=>
{
...
...
@@ -530,8 +523,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
}
private
runPreLaunchTask
(
config
:
debug
.
IConfig
):
Promise
{
// Only run the task if we are not reattaching (extensionHostData is defined).
if
(
!
config
.
preLaunchTask
||
config
.
extensionHostData
)
{
if
(
!
config
.
preLaunchTask
)
{
return
Promise
.
as
(
true
);
}
...
...
@@ -582,14 +574,14 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
},
true
);
}
public
restartSession
(
extensionHostData
?:
any
):
Promise
{
return
this
.
session
?
this
.
session
.
disconnect
(
true
).
then
(()
=>
{
public
restartSession
():
Promise
{
return
this
.
session
?
this
.
session
.
disconnect
().
then
(()
=>
{
new
Promise
(
c
=>
{
setTimeout
(()
=>
{
this
.
createSession
(
extensionHostData
,
false
).
then
(()
=>
c
(
true
));
this
.
createSession
(
false
).
then
(()
=>
c
(
true
));
},
300
);
});
})
:
this
.
createSession
(
extensionHostData
,
false
);
})
:
this
.
createSession
(
false
);
}
public
getActiveSession
():
debug
.
IRawDebugSession
{
...
...
src/vs/workbench/parts/debug/node/debugConfigurationManager.ts
浏览文件 @
82c0e30d
...
...
@@ -218,7 +218,7 @@ export class ConfigurationManager {
return
this
.
adapters
.
filter
(
adapter
=>
adapter
.
type
===
this
.
configuration
.
type
).
pop
();
}
public
setConfiguration
(
name
:
string
,
extensionHostData
:
any
=
null
):
Promise
{
public
setConfiguration
(
name
:
string
):
Promise
{
return
this
.
loadLaunchConfig
().
then
(
config
=>
{
if
(
!
config
||
!
config
.
configurations
)
{
this
.
configuration
=
null
;
...
...
@@ -242,8 +242,6 @@ export class ConfigurationManager {
this
.
configuration
.
runtimeExecutable
=
this
.
resolvePath
(
this
.
systemVariables
.
resolve
(
this
.
configuration
.
runtimeExecutable
));
this
.
configuration
.
runtimeArgs
=
this
.
configuration
.
runtimeArgs
&&
this
.
configuration
.
runtimeArgs
.
length
>
0
?
this
.
systemVariables
.
resolve
(
this
.
configuration
.
runtimeArgs
)
:
null
;
this
.
configuration
.
outDir
=
this
.
resolvePath
(
this
.
configuration
.
outDir
);
// send opaque data back as part of the (undocumented) arguments of the launch request.
this
.
configuration
.
extensionHostData
=
extensionHostData
;
}
});
}
...
...
src/vs/workbench/parts/debug/node/rawDebugSession.ts
浏览文件 @
82c0e30d
...
...
@@ -116,14 +116,11 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
return
this
.
send
(
'
pause
'
,
args
);
}
public
disconnect
(
restart
=
false
):
TPromise
<
DebugProtocol
.
DisconnectResponse
>
{
public
disconnect
():
TPromise
<
DebugProtocol
.
DisconnectResponse
>
{
if
((
this
.
serverProcess
||
this
.
socket
)
&&
!
this
.
stopServerPending
)
{
this
.
stopServerPending
=
true
;
// point of no return: from now on don't report any errors
return
this
.
send
(
'
disconnect
'
,
{
extensionHostData
:
{
restart
:
restart
}
}).
then
(()
=>
{
return
this
.
stopServer
();
},
()
=>
{
return
this
.
stopServer
();
});
// point of no return: from now on don't report any errors
this
.
stopServerPending
=
true
;
return
this
.
stopServer
();
}
return
Promise
.
as
(
null
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录