Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5fece3f3
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,发现更多精彩内容 >>
提交
5fece3f3
编写于
12月 19, 2018
作者:
A
Andre Weinand
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
do not ignore debggers that lack a label; fixes #61649
上级
32153576
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
30 addition
and
32 deletion
+30
-32
src/vs/workbench/api/node/extHostDebugService.ts
src/vs/workbench/api/node/extHostDebugService.ts
+2
-2
src/vs/workbench/parts/debug/node/debugger.ts
src/vs/workbench/parts/debug/node/debugger.ts
+28
-30
未找到文件。
src/vs/workbench/api/node/extHostDebugService.ts
浏览文件 @
5fece3f3
...
...
@@ -128,8 +128,8 @@ export class ExtHostDebugService implements ExtHostDebugServiceShape {
const
debuggers
=
<
IDebuggerContribution
[]
>
ed
.
contributes
[
'
debuggers
'
];
if
(
debuggers
&&
debuggers
.
length
>
0
)
{
for
(
const
dbg
of
debuggers
)
{
// only debugger contributions with a
"label"
are considered a "defining" debugger contribution
if
(
dbg
.
type
&&
dbg
.
label
)
{
// only debugger contributions with a
label, program, or runtime attribute
are considered a "defining" debugger contribution
if
(
dbg
.
type
&&
(
dbg
.
label
||
dbg
.
program
||
dbg
.
runtime
)
)
{
debugTypes
.
push
(
dbg
.
type
);
if
(
dbg
.
adapterExecutableCommand
)
{
this
.
_aexCommands
.
set
(
dbg
.
type
,
dbg
.
adapterExecutableCommand
);
...
...
src/vs/workbench/parts/debug/node/debugger.ts
浏览文件 @
5fece3f3
...
...
@@ -42,37 +42,35 @@ export class Debugger implements IDebugger {
}
public
createDebugAdapter
(
session
:
IDebugSession
,
outputService
:
IOutputService
):
Promise
<
IDebugAdapter
>
{
return
new
Promise
<
IDebugAdapter
>
((
resolve
,
reject
)
=>
{
this
.
configurationManager
.
activateDebuggers
(
'
onDebugAdapterProtocolTracker
'
,
this
.
type
).
then
(
_
=>
{
resolve
(
this
.
_createDebugAdapter
(
session
,
outputService
));
},
reject
);
});
}
private
_createDebugAdapter
(
session
:
IDebugSession
,
outputService
:
IOutputService
):
Promise
<
IDebugAdapter
>
{
if
(
this
.
inExtHost
())
{
return
Promise
.
resolve
(
this
.
configurationManager
.
createDebugAdapter
(
session
));
}
else
{
return
this
.
getAdapterDescriptor
(
session
).
then
(
adapterDescriptor
=>
{
switch
(
adapterDescriptor
.
type
)
{
case
'
executable
'
:
return
new
ExecutableDebugAdapter
(
adapterDescriptor
,
this
.
type
,
outputService
);
case
'
server
'
:
return
new
SocketDebugAdapter
(
adapterDescriptor
);
case
'
implementation
'
:
// TODO@AW: this.inExtHost() should now return true
return
Promise
.
resolve
(
this
.
configurationManager
.
createDebugAdapter
(
session
));
default
:
throw
new
Error
(
'
unknown type
'
);
}
}).
catch
(
err
=>
{
if
(
err
&&
err
.
message
)
{
throw
new
Error
(
nls
.
localize
(
'
cannot.create.da.with.err
'
,
"
Cannot create debug adapter ({0}).
"
,
err
.
message
));
}
else
{
throw
new
Error
(
nls
.
localize
(
'
cannot.create.da
'
,
"
Cannot create debug adapter.
"
));
return
this
.
configurationManager
.
activateDebuggers
(
'
onDebugAdapterProtocolTracker
'
,
this
.
type
).
then
(
_
=>
{
if
(
this
.
inExtHost
())
{
const
da
=
this
.
configurationManager
.
createDebugAdapter
(
session
);
if
(
da
)
{
return
Promise
.
resolve
(
da
);
}
});
}
throw
new
Error
(
nls
.
localize
(
'
cannot.find.da
'
,
"
Cannot find debug adapter for type '{0}'.
"
,
this
.
type
));
}
else
{
return
this
.
getAdapterDescriptor
(
session
).
then
(
adapterDescriptor
=>
{
switch
(
adapterDescriptor
.
type
)
{
case
'
executable
'
:
return
new
ExecutableDebugAdapter
(
adapterDescriptor
,
this
.
type
,
outputService
);
case
'
server
'
:
return
new
SocketDebugAdapter
(
adapterDescriptor
);
case
'
implementation
'
:
// TODO@AW: this.inExtHost() should now return true
return
Promise
.
resolve
(
this
.
configurationManager
.
createDebugAdapter
(
session
));
default
:
throw
new
Error
(
'
unknown descriptor type
'
);
}
}).
catch
(
err
=>
{
if
(
err
&&
err
.
message
)
{
throw
new
Error
(
nls
.
localize
(
'
cannot.create.da.with.err
'
,
"
Cannot create debug adapter ({0}).
"
,
err
.
message
));
}
else
{
throw
new
Error
(
nls
.
localize
(
'
cannot.create.da
'
,
"
Cannot create debug adapter.
"
));
}
});
}
});
}
private
getAdapterDescriptor
(
session
:
IDebugSession
):
Promise
<
IAdapterDescriptor
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录