Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
86b95769
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,发现更多精彩内容 >>
提交
86b95769
编写于
2月 17, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: get exception breakpoints from the adapter
fixes #3015
上级
b1afb8d9
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
17 addition
and
8 deletion
+17
-8
src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
.../workbench/parts/debug/browser/debugEditorModelManager.ts
+1
-1
src/vs/workbench/parts/debug/browser/debugHover.ts
src/vs/workbench/parts/debug/browser/debugHover.ts
+1
-1
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+1
-1
src/vs/workbench/parts/debug/common/debugModel.ts
src/vs/workbench/parts/debug/common/debugModel.ts
+9
-1
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+2
-1
src/vs/workbench/parts/debug/node/rawDebugSession.ts
src/vs/workbench/parts/debug/node/rawDebugSession.ts
+3
-3
未找到文件。
src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
浏览文件 @
86b95769
...
...
@@ -282,7 +282,7 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
}
return
result
?
result
:
!
session
||
session
.
capablities
.
supportsConditionalBreakpoints
?
{
!
session
||
session
.
capab
i
lities
.
supportsConditionalBreakpoints
?
{
glyphMarginClassName
:
'
debug-breakpoint-conditional-glyph
'
,
hoverMessage
:
breakpoint
.
condition
,
stickiness
:
editorcommon
.
TrackedRangeStickiness
.
NeverGrowsWhenTypingAtEdges
...
...
src/vs/workbench/parts/debug/browser/debugHover.ts
浏览文件 @
86b95769
...
...
@@ -113,7 +113,7 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
private
getExpression
(
namesToFind
:
string
[]):
TPromise
<
Expression
>
{
const
session
=
this
.
debugService
.
getActiveSession
();
const
focusedStackFrame
=
this
.
debugService
.
getViewModel
().
getFocusedStackFrame
();
if
(
session
.
capablities
.
supportsEvaluateForHovers
)
{
if
(
session
.
capab
i
lities
.
supportsEvaluateForHovers
)
{
return
evaluateExpression
(
session
,
focusedStackFrame
,
new
Expression
(
namesToFind
.
join
(
'
.
'
),
true
),
'
hover
'
);
}
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
86b95769
...
...
@@ -211,7 +211,7 @@ export interface IRawAdapter extends IRawEnvAdapter {
export
interface
IRawDebugSession
extends
ee
.
EventEmitter
{
getType
():
string
;
isAttach
:
boolean
;
capablities
:
DebugProtocol
.
Capabilites
;
capab
i
lities
:
DebugProtocol
.
Capabilites
;
disconnect
(
restart
?:
boolean
,
force
?:
boolean
):
TPromise
<
DebugProtocol
.
DisconnectResponse
>
;
next
(
args
:
DebugProtocol
.
NextArguments
):
TPromise
<
DebugProtocol
.
NextResponse
>
;
...
...
src/vs/workbench/parts/debug/common/debugModel.ts
浏览文件 @
86b95769
...
...
@@ -389,6 +389,13 @@ export class Model extends ee.EventEmitter implements debug.IModel {
return
this
.
exceptionBreakpoints
;
}
public
setExceptionBreakpoints
(
data
:
[{
filter
:
string
,
label
:
string
}]):
void
{
if
(
data
)
{
this
.
exceptionBreakpoints
=
data
.
map
(
d
=>
new
ExceptionBreakpoint
(
d
.
filter
,
d
.
label
,
this
.
exceptionBreakpoints
.
some
(
ebp
=>
ebp
.
filter
===
d
.
filter
&&
ebp
.
enabled
)));
}
}
public
areBreakpointsActivated
():
boolean
{
return
this
.
breakpointsActivated
;
}
...
...
@@ -399,7 +406,8 @@ export class Model extends ee.EventEmitter implements debug.IModel {
}
public
addBreakpoints
(
rawData
:
debug
.
IRawBreakpoint
[]):
void
{
this
.
breakpoints
=
this
.
breakpoints
.
concat
(
rawData
.
map
(
rawBp
=>
new
Breakpoint
(
new
Source
(
Source
.
toRawSource
(
rawBp
.
uri
,
this
)),
rawBp
.
lineNumber
,
rawBp
.
enabled
,
rawBp
.
condition
)));
this
.
breakpoints
=
this
.
breakpoints
.
concat
(
rawData
.
map
(
rawBp
=>
new
Breakpoint
(
new
Source
(
Source
.
toRawSource
(
rawBp
.
uri
,
this
)),
rawBp
.
lineNumber
,
rawBp
.
enabled
,
rawBp
.
condition
)));
this
.
breakpointsActivated
=
true
;
this
.
emit
(
debug
.
ModelEvents
.
BREAKPOINTS_UPDATED
);
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
86b95769
...
...
@@ -234,7 +234,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
this
.
toDispose
.
push
(
this
.
session
.
addListener2
(
debug
.
SessionEvents
.
INITIALIZED
,
(
event
:
DebugProtocol
.
InitializedEvent
)
=>
{
aria
.
alert
(
nls
.
localize
(
'
programStarted
'
,
"
Program started.
"
));
this
.
sendAllBreakpoints
().
then
(()
=>
{
if
(
this
.
session
.
capablities
.
supportsConfigurationDoneRequest
)
{
if
(
this
.
session
.
capab
i
lities
.
supportsConfigurationDoneRequest
)
{
this
.
session
.
configurationDone
().
done
(
null
,
errors
.
onUnexpectedError
);
}
});
...
...
@@ -567,6 +567,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
}
this
.
setStateAndEmit
(
debug
.
State
.
Initializing
);
this
.
model
.
setExceptionBreakpoints
(
this
.
session
.
capabilities
.
exceptionBreakpointFilters
);
return
configuration
.
request
===
'
attach
'
?
this
.
session
.
attach
(
configuration
)
:
this
.
session
.
launch
(
configuration
);
}).
then
((
result
:
DebugProtocol
.
Response
)
=>
{
if
(
openViewlet
)
{
...
...
src/vs/workbench/parts/debug/node/rawDebugSession.ts
浏览文件 @
86b95769
...
...
@@ -25,7 +25,7 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
private
startTime
:
number
;
private
stopServerPending
:
boolean
;
public
isAttach
:
boolean
;
public
capablities
:
DebugProtocol
.
Capabilites
;
public
capab
i
lities
:
DebugProtocol
.
Capabilites
;
constructor
(
private
messageService
:
IMessageService
,
...
...
@@ -34,7 +34,7 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
private
adapter
:
Adapter
)
{
super
();
this
.
capablities
=
{};
this
.
capab
i
lities
=
{};
}
private
initServer
():
TPromise
<
void
>
{
...
...
@@ -68,7 +68,7 @@ export class RawDebugSession extends v8.V8Protocol implements debug.IRawDebugSes
public
initialize
(
args
:
DebugProtocol
.
InitializeRequestArguments
):
TPromise
<
DebugProtocol
.
InitializeResponse
>
{
return
this
.
send
(
'
initialize
'
,
args
).
then
(
response
=>
{
this
.
capab
lities
=
response
.
body
||
this
.
capab
lities
;
this
.
capab
ilities
=
response
.
body
||
this
.
capabi
lities
;
return
response
;
});
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录