Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
ff7d4095
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,发现更多精彩内容 >>
提交
ff7d4095
编写于
3月 01, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: show stoppedEvent.text on hover
fixes #3101
上级
29ae86e4
变更
5
显示空白变更内容
内联
并排
Showing
5 changed file
with
22 addition
and
12 deletion
+22
-12
src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
.../workbench/parts/debug/browser/debugEditorModelManager.ts
+1
-1
src/vs/workbench/parts/debug/browser/debugViewlet.ts
src/vs/workbench/parts/debug/browser/debugViewlet.ts
+7
-3
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+8
-2
src/vs/workbench/parts/debug/common/debugModel.ts
src/vs/workbench/parts/debug/common/debugModel.ts
+5
-5
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+1
-1
未找到文件。
src/vs/workbench/parts/debug/browser/debugEditorModelManager.ts
浏览文件 @
ff7d4095
...
...
@@ -151,7 +151,7 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
range
:
createRange
(
sf
.
lineNumber
,
sf
.
column
,
sf
.
lineNumber
,
sf
.
column
+
1
)
});
if
(
thread
.
stopped
R
eason
===
'
exception
'
)
{
if
(
thread
.
stopped
Details
.
r
eason
===
'
exception
'
)
{
result
.
push
({
options
:
DebugEditorModelManager
.
TOP_STACK_FRAME_EXCEPTION_DECORATION
,
range
:
wholeLineRange
...
...
src/vs/workbench/parts/debug/browser/debugViewlet.ts
浏览文件 @
ff7d4095
...
...
@@ -252,11 +252,15 @@ class CallStackView extends viewlet.CollapsibleViewletView {
this
.
toDispose
.
push
(
debugModel
.
addListener2
(
debug
.
ModelEvents
.
CALLSTACK_UPDATED
,
()
=>
{
this
.
tree
.
refresh
().
done
(
null
,
errors
.
onUnexpectedError
);
}));
this
.
toDispose
.
push
(
this
.
debugService
.
getViewModel
().
addListener2
(
debug
.
ViewModelEvents
.
FOCUSED_STACK_FRAME_UPDATED
,
()
=>
{
const
focussedThread
=
this
.
debugService
.
getModel
().
getThreads
()[
this
.
debugService
.
getViewModel
().
getFocusedThreadId
()];
if
(
focussedThread
&&
focussedThread
.
stoppedReason
&&
focussedThread
.
stoppedReason
!==
'
step
'
)
{
this
.
pauseMessageLabel
.
text
(
nls
.
localize
(
'
debugStopped
'
,
"
Paused on {0}
"
,
focussedThread
.
stoppedReason
));
focussedThread
.
stoppedReason
===
'
exception
'
?
this
.
pauseMessageLabel
.
addClass
(
'
exception
'
)
:
this
.
pauseMessageLabel
.
removeClass
(
'
exception
'
);
if
(
focussedThread
&&
focussedThread
.
stoppedDetails
&&
focussedThread
.
stoppedDetails
.
reason
!==
'
step
'
)
{
this
.
pauseMessageLabel
.
text
(
nls
.
localize
(
'
debugStopped
'
,
"
Paused on {0}
"
,
focussedThread
.
stoppedDetails
.
reason
));
if
(
focussedThread
.
stoppedDetails
.
text
)
{
this
.
pauseMessageLabel
.
title
(
focussedThread
.
stoppedDetails
.
text
);
}
focussedThread
.
stoppedDetails
.
reason
===
'
exception
'
?
this
.
pauseMessageLabel
.
addClass
(
'
exception
'
)
:
this
.
pauseMessageLabel
.
removeClass
(
'
exception
'
);
this
.
pauseMessage
.
show
();
}
else
{
this
.
pauseMessage
.
hide
();
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
ff7d4095
...
...
@@ -24,7 +24,13 @@ export interface IRawModelUpdate {
threadId
:
number
;
thread
?:
DebugProtocol
.
Thread
;
callStack
?:
DebugProtocol
.
StackFrame
[];
stoppedReason
?:
string
;
stoppedDetails
?:
IRawStoppedDetails
;
}
export
interface
IRawStoppedDetails
{
reason
:
string
;
threadId
?:
number
;
text
?:
string
;
}
// model
...
...
@@ -48,7 +54,7 @@ export interface IThread extends ITreeElement {
threadId
:
number
;
name
:
string
;
callStack
:
IStackFrame
[];
stopped
Reason
:
string
;
stopped
Details
:
IRawStoppedDetails
;
}
export
interface
IScope
extends
IExpressionContainer
{
...
...
src/vs/workbench/parts/debug/common/debugModel.ts
浏览文件 @
ff7d4095
...
...
@@ -90,10 +90,10 @@ export function getFullExpressionName(expression: debug.IExpression, sessionType
export
class
Thread
implements
debug
.
IThread
{
public
stopped
Reason
:
string
;
public
stopped
Details
:
debug
.
IRawStoppedDetails
;
constructor
(
public
name
:
string
,
public
threadId
,
public
callStack
:
debug
.
IStackFrame
[])
{
this
.
stopped
Reason
=
undefined
;
this
.
stopped
Details
=
undefined
;
}
public
getId
():
string
{
...
...
@@ -358,7 +358,7 @@ export class Model extends ee.EventEmitter implements debug.IModel {
delete
this
.
threads
[
reference
];
}
else
{
this
.
threads
[
reference
].
callStack
=
[];
this
.
threads
[
reference
].
stopped
Reason
=
undefined
;
this
.
threads
[
reference
].
stopped
Details
=
undefined
;
}
}
else
{
if
(
removeThreads
)
{
...
...
@@ -368,7 +368,7 @@ export class Model extends ee.EventEmitter implements debug.IModel {
for
(
let
ref
in
this
.
threads
)
{
if
(
this
.
threads
.
hasOwnProperty
(
ref
))
{
this
.
threads
[
ref
].
callStack
=
[];
this
.
threads
[
ref
].
stopped
Reason
=
undefined
;
this
.
threads
[
ref
].
stopped
Details
=
undefined
;
}
}
}
...
...
@@ -636,7 +636,7 @@ export class Model extends ee.EventEmitter implements debug.IModel {
return
new
StackFrame
(
data
.
threadId
,
rsf
.
id
,
rsf
.
source
?
new
Source
(
rsf
.
source
)
:
new
Source
({
name
:
'
unknown
'
}),
rsf
.
name
,
rsf
.
line
,
rsf
.
column
);
});
this
.
threads
[
data
.
threadId
].
stopped
Reason
=
data
.
stoppedReason
;
this
.
threads
[
data
.
threadId
].
stopped
Details
=
data
.
stoppedDetails
;
}
this
.
emit
(
debug
.
ModelEvents
.
CALLSTACK_UPDATED
);
...
...
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
ff7d4095
...
...
@@ -240,7 +240,7 @@ export class DebugService extends ee.EventEmitter implements debug.IDebugService
this
.
getThreadData
(
threadId
).
then
(()
=>
{
this
.
session
.
stackTrace
({
threadId
:
threadId
,
levels
:
20
}).
done
((
result
)
=>
{
this
.
model
.
rawUpdate
({
threadId
:
threadId
,
callStack
:
result
.
body
.
stackFrames
,
stopped
Reason
:
event
.
body
.
reason
});
this
.
model
.
rawUpdate
({
threadId
:
threadId
,
callStack
:
result
.
body
.
stackFrames
,
stopped
Details
:
event
.
body
});
this
.
windowService
.
getWindow
().
focus
();
const
callStack
=
this
.
model
.
getThreads
()[
threadId
].
callStack
;
if
(
callStack
.
length
>
0
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录