Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c6c9d5b4
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,发现更多精彩内容 >>
提交
c6c9d5b4
编写于
8月 12, 2020
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: more precise computatino of top stack frame call stack decoration
上级
e3a0f6a9
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
18 addition
and
11 deletion
+18
-11
src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
...ench/contrib/debug/browser/callStackEditorContribution.ts
+2
-2
src/vs/workbench/contrib/debug/browser/debugService.ts
src/vs/workbench/contrib/debug/browser/debugService.ts
+3
-6
src/vs/workbench/contrib/debug/common/debug.ts
src/vs/workbench/contrib/debug/common/debug.ts
+6
-0
src/vs/workbench/contrib/debug/common/debugModel.ts
src/vs/workbench/contrib/debug/common/debugModel.ts
+5
-1
src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
...vs/workbench/contrib/debug/test/browser/callStack.test.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/debug/browser/callStackEditorContribution.ts
浏览文件 @
c6c9d5b4
...
...
@@ -48,8 +48,8 @@ export function createDecorationsForStackFrame(stackFrame: IStackFrame, topStack
// compute how to decorate the editor. Different decorations are used if this is a top stack frame, focused stack frame,
// an exception or a stack frame that did not change the line number (we only decorate the columns, not the whole line).
const
callStack
=
stackFrame
.
thread
.
getCallStack
();
if
(
callStack
&&
callStack
.
length
&&
stackFrame
===
callStack
[
0
]
)
{
const
topStackFrame
=
stackFrame
.
thread
.
getTopStackFrame
();
if
(
stackFrame
.
getId
()
===
topStackFrame
?.
getId
()
)
{
result
.
push
({
options
:
TOP_STACK_FRAME_MARGIN
,
range
...
...
src/vs/workbench/contrib/debug/browser/debugService.ts
浏览文件 @
c6c9d5b4
...
...
@@ -6,7 +6,7 @@
import
*
as
nls
from
'
vs/nls
'
;
import
{
Event
,
Emitter
}
from
'
vs/base/common/event
'
;
import
{
URI
as
uri
}
from
'
vs/base/common/uri
'
;
import
{
first
,
distinct
}
from
'
vs/base/common/arrays
'
;
import
{
distinct
}
from
'
vs/base/common/arrays
'
;
import
*
as
errors
from
'
vs/base/common/errors
'
;
import
severity
from
'
vs/base/common/severity
'
;
import
*
as
aria
from
'
vs/base/browser/ui/aria/aria
'
;
...
...
@@ -991,11 +991,8 @@ export function getStackFrameThreadAndSessionToFocus(model: IDebugModel, stackFr
}
}
if
(
!
stackFrame
)
{
if
(
thread
)
{
const
callStack
=
thread
.
getCallStack
();
stackFrame
=
first
(
callStack
,
sf
=>
!!
(
sf
&&
sf
.
source
&&
sf
.
source
.
available
&&
sf
.
source
.
presentationHint
!==
'
deemphasize
'
),
undefined
);
}
if
(
!
stackFrame
&&
thread
)
{
stackFrame
=
thread
.
getTopStackFrame
();
}
return
{
session
,
thread
,
stackFrame
};
...
...
src/vs/workbench/contrib/debug/common/debug.ts
浏览文件 @
c6c9d5b4
...
...
@@ -288,6 +288,12 @@ export interface IThread extends ITreeElement {
*/
getCallStack
():
ReadonlyArray
<
IStackFrame
>
;
/**
* Gets the top stack frame that is not hidden if the callstack has already been received from the debug adapter
*/
getTopStackFrame
():
IStackFrame
|
undefined
;
/**
* Invalidates the callstack cache
*/
...
...
src/vs/workbench/contrib/debug/common/debugModel.ts
浏览文件 @
c6c9d5b4
...
...
@@ -10,7 +10,7 @@ import { Event, Emitter } from 'vs/base/common/event';
import
{
generateUuid
}
from
'
vs/base/common/uuid
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
import
{
isString
,
isUndefinedOrNull
}
from
'
vs/base/common/types
'
;
import
{
distinct
,
lastIndex
}
from
'
vs/base/common/arrays
'
;
import
{
distinct
,
lastIndex
,
first
}
from
'
vs/base/common/arrays
'
;
import
{
Range
,
IRange
}
from
'
vs/editor/common/core/range
'
;
import
{
ITreeElement
,
IExpression
,
IExpressionContainer
,
IDebugSession
,
IStackFrame
,
IExceptionBreakpoint
,
IBreakpoint
,
IFunctionBreakpoint
,
IDebugModel
,
...
...
@@ -398,6 +398,10 @@ export class Thread implements IThread {
return
this
.
staleCallStack
;
}
getTopStackFrame
():
IStackFrame
|
undefined
{
return
first
(
this
.
getCallStack
(),
sf
=>
!!
(
sf
&&
sf
.
source
&&
sf
.
source
.
available
&&
sf
.
source
.
presentationHint
!==
'
deemphasize
'
),
undefined
);
}
get
stateLabel
():
string
{
if
(
this
.
stoppedDetails
)
{
return
this
.
stoppedDetails
.
description
||
...
...
src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
浏览文件 @
c6c9d5b4
...
...
@@ -42,8 +42,8 @@ function createTwoStackFrames(session: DebugSession): { firstStackFrame: StackFr
sourceReference
:
11
,
},
'
aDebugSessionId
'
);
firstStackFrame
=
new
StackFrame
(
thread
,
1
,
firstSource
,
'
app.js
'
,
'
normal
'
,
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
1
,
endColumn
:
10
},
1
);
secondStackFrame
=
new
StackFrame
(
thread
,
1
,
secondSource
,
'
app.js
'
,
'
normal
'
,
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
1
,
endColumn
:
10
},
1
);
firstStackFrame
=
new
StackFrame
(
thread
,
0
,
firstSource
,
'
app.js
'
,
'
normal
'
,
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
1
,
endColumn
:
10
},
0
);
secondStackFrame
=
new
StackFrame
(
thread
,
1
,
secondSource
,
'
app
2
.js
'
,
'
normal
'
,
{
startLineNumber
:
1
,
startColumn
:
1
,
endLineNumber
:
1
,
endColumn
:
10
},
1
);
return
{
firstStackFrame
,
secondStackFrame
};
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录