Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5bb29d7b
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,发现更多精彩内容 >>
提交
5bb29d7b
编写于
1月 16, 2019
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
return pid from vscodeLaunch
上级
c42b7620
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
17 deletion
+19
-17
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
...workbench/parts/debug/electron-browser/rawDebugSession.ts
+19
-17
未找到文件。
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
浏览文件 @
5bb29d7b
...
...
@@ -494,7 +494,10 @@ export class RawDebugSession {
switch
(
request
.
command
)
{
case
'
launchVSCode
'
:
this
.
launch
(
<
ILaunchVSCodeArguments
>
request
.
arguments
).
then
(
_
=>
{
this
.
launchVsCode
(
<
ILaunchVSCodeArguments
>
request
.
arguments
).
then
(
pid
=>
{
response
.
body
=
{
processId
:
pid
};
safeSendResponse
(
response
);
},
err
=>
{
response
.
success
=
false
;
...
...
@@ -539,41 +542,40 @@ export class RawDebugSession {
}
}
private
launch
(
VSCodeArgs
:
ILaunchVSCodeArguments
):
Promise
<
void
>
{
private
launchVsCode
(
args
:
ILaunchVSCodeArguments
):
Promise
<
number
>
{
const
spawnOpts
:
cp
.
SpawnOptions
=
{
detached
:
false
// https://github.com/Microsoft/vscode/issues/57018
};
if
(
VSCodeA
rgs
.
env
)
{
if
(
a
rgs
.
env
)
{
// merge environment variables into a copy of the process.env
const
envArgs
=
objects
.
mixin
(
objects
.
mixin
({},
process
.
env
),
VSCodeA
rgs
.
env
);
const
envArgs
=
objects
.
mixin
(
objects
.
mixin
({},
process
.
env
),
a
rgs
.
env
);
// and delete some if necessary
Object
.
keys
(
envArgs
).
filter
(
k
=>
envArgs
[
k
]
===
null
).
forEach
(
key
=>
delete
envArgs
[
key
]);
spawnOpts
.
env
=
envArgs
;
}
let
spawnArgs
=
[].
concat
(
VSCodeA
rgs
.
options
);
let
spawnArgs
=
[].
concat
(
a
rgs
.
options
);
switch
(
VSCodeA
rgs
.
debugMode
)
{
switch
(
a
rgs
.
debugMode
)
{
case
'
noDebug
'
:
break
;
case
'
break
'
:
spawnArgs
.
push
(
`--inspect-brk-extensions=
${
VSCodeA
rgs
.
debugPort
}
`
);
spawnArgs
.
push
(
`--inspect-brk-extensions=
${
a
rgs
.
debugPort
}
`
);
break
;
case
'
noBreak
'
:
spawnArgs
.
push
(
`--inspect-extensions=
${
VSCodeA
rgs
.
debugPort
}
`
);
spawnArgs
.
push
(
`--inspect-extensions=
${
a
rgs
.
debugPort
}
`
);
break
;
}
// pass the debug session ID to the EH so that broadcast events know where they come from
if
(
VSCodeA
rgs
.
sessionId
)
{
spawnArgs
.
push
(
`--debugId=
${
VSCodeA
rgs
.
sessionId
}
`
);
if
(
a
rgs
.
sessionId
)
{
spawnArgs
.
push
(
`--debugId=
${
a
rgs
.
sessionId
}
`
);
}
if
(
VSCodeA
rgs
.
extensionDevelopmentPath
)
{
spawnArgs
.
push
(
`--extensionDevelopmentPath=
${
VSCodeA
rgs
.
extensionDevelopmentPath
}
`
);
if
(
a
rgs
.
extensionDevelopmentPath
)
{
spawnArgs
.
push
(
`--extensionDevelopmentPath=
${
a
rgs
.
extensionDevelopmentPath
}
`
);
}
let
runtimeExecutable
=
this
.
environmentService
[
'
execPath
'
];
...
...
@@ -588,12 +590,12 @@ export class RawDebugSession {
const
vscodeWorkspacePath
=
runtimeExecutable
.
substr
(
0
,
electronIdx
);
// only add path if user hasn't already added that path
if
(
VSCodeArgs
.
pathArgs
.
length
===
0
||
VSCodeA
rgs
.
pathArgs
[
0
].
path
.
indexOf
(
vscodeWorkspacePath
)
!==
0
)
{
if
(
args
.
pathArgs
.
length
===
0
||
a
rgs
.
pathArgs
[
0
].
path
.
indexOf
(
vscodeWorkspacePath
)
!==
0
)
{
spawnArgs
.
push
(
vscodeWorkspacePath
);
}
}
VSCodeA
rgs
.
pathArgs
.
forEach
(
p
=>
{
a
rgs
.
pathArgs
.
forEach
(
p
=>
{
switch
(
p
.
type
)
{
case
'
file
'
:
spawnArgs
.
push
(
`--file-uri=
${
p
.
path
}
`
);
...
...
@@ -629,14 +631,14 @@ export class RawDebugSession {
}
}
return
new
Promise
<
void
>
((
resolve
,
reject
)
=>
{
return
new
Promise
((
resolve
,
reject
)
=>
{
const
process
=
cp
.
spawn
(
runtimeExecutable
,
spawnArgs
,
spawnOpts
);
process
.
on
(
'
error
'
,
error
=>
{
reject
(
error
);
});
process
.
on
(
'
exit
'
,
code
=>
{
if
(
code
===
0
)
{
resolve
();
resolve
(
process
.
pid
);
}
else
{
reject
(
new
Error
(
`VS Code exited with
${
code
}
`
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录