Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
5b5bb81e
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,发现更多精彩内容 >>
未验证
提交
5b5bb81e
编写于
7月 31, 2020
作者:
C
Connor Peet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix: inherit the compound root for all children of debug sessions
Fixes
https://github.com/microsoft/vscode/issues/103705
上级
348a4ce2
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
15 addition
and
2 deletion
+15
-2
src/vs/workbench/api/browser/mainThreadDebugService.ts
src/vs/workbench/api/browser/mainThreadDebugService.ts
+4
-2
src/vs/workbench/contrib/debug/browser/debugSession.ts
src/vs/workbench/contrib/debug/browser/debugSession.ts
+5
-0
src/vs/workbench/contrib/debug/common/debug.ts
src/vs/workbench/contrib/debug/common/debug.ts
+1
-0
src/vs/workbench/contrib/debug/test/common/mockDebug.ts
src/vs/workbench/contrib/debug/test/common/mockDebug.ts
+5
-0
未找到文件。
src/vs/workbench/api/browser/mainThreadDebugService.ts
浏览文件 @
5b5bb81e
...
...
@@ -228,11 +228,13 @@ export class MainThreadDebugService implements MainThreadDebugServiceShape, IDeb
public
$startDebugging
(
folder
:
UriComponents
|
undefined
,
nameOrConfig
:
string
|
IDebugConfiguration
,
options
:
IStartDebuggingOptions
):
Promise
<
boolean
>
{
const
folderUri
=
folder
?
uri
.
revive
(
folder
)
:
undefined
;
const
launch
=
this
.
debugService
.
getConfigurationManager
().
getLaunch
(
folderUri
);
const
parentSession
=
this
.
getSession
(
options
.
parentSessionID
);
const
debugOptions
:
IDebugSessionOptions
=
{
noDebug
:
options
.
noDebug
,
parentSession
:
this
.
getSession
(
options
.
parentSessionID
)
,
parentSession
,
repl
:
options
.
repl
,
compact
:
options
.
compact
compact
:
options
.
compact
,
compoundRoot
:
parentSession
?.
compoundRoot
};
return
this
.
debugService
.
startDebugging
(
launch
,
nameOrConfig
,
debugOptions
).
then
(
success
=>
{
return
success
;
...
...
src/vs/workbench/contrib/debug/browser/debugSession.ts
浏览文件 @
5b5bb81e
...
...
@@ -36,6 +36,7 @@ import { ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle';
import
{
localize
}
from
'
vs/nls
'
;
import
{
canceled
}
from
'
vs/base/common/errors
'
;
import
{
filterExceptionsFromTelemetry
}
from
'
vs/workbench/contrib/debug/common/debugUtils
'
;
import
{
DebugCompoundRoot
}
from
'
vs/workbench/contrib/debug/common/debugCompoundRoot
'
;
export
class
DebugSession
implements
IDebugSession
{
...
...
@@ -133,6 +134,10 @@ export class DebugSession implements IDebugSession {
return
!!
this
.
_options
.
compact
;
}
get
compoundRoot
():
DebugCompoundRoot
|
undefined
{
return
this
.
_options
.
compoundRoot
;
}
setConfiguration
(
configuration
:
{
resolved
:
IConfig
,
unresolved
:
IConfig
|
undefined
})
{
this
.
_configuration
=
configuration
;
}
...
...
src/vs/workbench/contrib/debug/common/debug.ts
浏览文件 @
5b5bb81e
...
...
@@ -169,6 +169,7 @@ export interface IDebugSession extends ITreeElement {
readonly
parentSession
:
IDebugSession
|
undefined
;
readonly
subId
:
string
|
undefined
;
readonly
compact
:
boolean
;
readonly
compoundRoot
:
DebugCompoundRoot
|
undefined
;
setSubId
(
subId
:
string
|
undefined
):
void
;
...
...
src/vs/workbench/contrib/debug/test/common/mockDebug.ts
浏览文件 @
5b5bb81e
...
...
@@ -13,6 +13,7 @@ import Severity from 'vs/base/common/severity';
import
{
AbstractDebugAdapter
}
from
'
vs/workbench/contrib/debug/common/abstractDebugAdapter
'
;
import
{
DebugStorage
}
from
'
vs/workbench/contrib/debug/common/debugStorage
'
;
import
{
ExceptionBreakpoint
,
Expression
,
DataBreakpoint
,
FunctionBreakpoint
,
Breakpoint
,
DebugModel
}
from
'
vs/workbench/contrib/debug/common/debugModel
'
;
import
{
DebugCompoundRoot
}
from
'
vs/workbench/contrib/debug/common/debugCompoundRoot
'
;
export
class
MockDebugService
implements
IDebugService
{
...
...
@@ -135,6 +136,10 @@ export class MockDebugService implements IDebugService {
}
export
class
MockSession
implements
IDebugSession
{
get
compoundRoot
():
DebugCompoundRoot
|
undefined
{
return
undefined
;
}
stepInTargets
(
frameId
:
number
):
Promise
<
{
id
:
number
;
label
:
string
;
}[]
>
{
throw
new
Error
(
'
Method not implemented.
'
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录