Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6ba48011
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,发现更多精彩内容 >>
提交
6ba48011
编写于
5月 31, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: tryToAutoFocusStackFrame
fixes #25104
上级
bcdbc335
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
22 addition
and
12 deletion
+22
-12
src/vs/workbench/parts/debug/electron-browser/debugService.ts
...vs/workbench/parts/debug/electron-browser/debugService.ts
+22
-12
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debugService.ts
浏览文件 @
6ba48011
...
@@ -126,7 +126,8 @@ export class DebugService implements debug.IDebugService {
...
@@ -126,7 +126,8 @@ export class DebugService implements debug.IDebugService {
// Some adapters might not respect the number levels in StackTraceRequest and might
// Some adapters might not respect the number levels in StackTraceRequest and might
// return more stackFrames than requested. For those do not send an additional stackTrace request.
// return more stackFrames than requested. For those do not send an additional stackTrace request.
if
(
callStack
.
length
<=
1
)
{
if
(
callStack
.
length
<=
1
)
{
this
.
model
.
fetchCallStack
(
focusedThread
).
done
(
undefined
,
errors
.
onUnexpectedError
);
this
.
model
.
fetchCallStack
(
focusedThread
).
done
(()
=>
this
.
tryToAutoFocusStackFrame
(
focusedThread
),
errors
.
onUnexpectedError
);
}
}
}
}
},
420
);
},
420
);
...
@@ -264,6 +265,25 @@ export class DebugService implements debug.IDebugService {
...
@@ -264,6 +265,25 @@ export class DebugService implements debug.IDebugService {
}
}
}
}
private
tryToAutoFocusStackFrame
(
thread
:
debug
.
IThread
):
TPromise
<
any
>
{
const
callStack
=
thread
.
getCallStack
();
if
(
!
callStack
.
length
||
this
.
viewModel
.
focusedStackFrame
)
{
return
TPromise
.
as
(
null
);
}
// focus first stack frame from top that has source location if no other stack frame is focussed
const
stackFrameToFocus
=
first
(
callStack
,
sf
=>
sf
.
source
&&
sf
.
source
.
available
,
undefined
);
if
(
!
stackFrameToFocus
)
{
return
TPromise
.
as
(
null
);
}
this
.
focusStackFrameAndEvaluate
(
stackFrameToFocus
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
windowService
.
getWindow
().
focus
();
aria
.
alert
(
nls
.
localize
(
'
debuggingPaused
'
,
"
Debugging paused, reason {0}, {1} {2}
"
,
thread
.
stoppedDetails
.
reason
,
stackFrameToFocus
.
source
?
stackFrameToFocus
.
source
.
name
:
''
,
stackFrameToFocus
.
range
.
startLineNumber
));
return
stackFrameToFocus
.
openInEditor
(
this
.
editorService
);
}
private
registerSessionListeners
(
process
:
Process
,
session
:
RawDebugSession
):
void
{
private
registerSessionListeners
(
process
:
Process
,
session
:
RawDebugSession
):
void
{
this
.
toDisposeOnSessionEnd
.
get
(
session
.
getId
()).
push
(
session
);
this
.
toDisposeOnSessionEnd
.
get
(
session
.
getId
()).
push
(
session
);
this
.
toDisposeOnSessionEnd
.
get
(
session
.
getId
()).
push
(
session
.
onDidInitialize
(
event
=>
{
this
.
toDisposeOnSessionEnd
.
get
(
session
.
getId
()).
push
(
session
.
onDidInitialize
(
event
=>
{
...
@@ -307,18 +327,8 @@ export class DebugService implements debug.IDebugService {
...
@@ -307,18 +327,8 @@ export class DebugService implements debug.IDebugService {
// Call fetch call stack twice, the first only return the top stack frame.
// Call fetch call stack twice, the first only return the top stack frame.
// Second retrieves the rest of the call stack. For performance reasons #25605
// Second retrieves the rest of the call stack. For performance reasons #25605
this
.
model
.
fetchCallStack
(
thread
).
then
(()
=>
{
this
.
model
.
fetchCallStack
(
thread
).
then
(()
=>
{
const
callStack
=
thread
.
getCallStack
();
this
.
callStackScheduler
.
schedule
();
this
.
callStackScheduler
.
schedule
();
if
(
callStack
.
length
>
0
&&
!
this
.
viewModel
.
focusedStackFrame
)
{
return
this
.
tryToAutoFocusStackFrame
(
thread
);
// focus first stack frame from top that has source location if no other stack frame is focussed
const
stackFrameToFocus
=
first
(
callStack
,
sf
=>
sf
.
source
&&
sf
.
source
.
available
,
callStack
[
0
]);
this
.
focusStackFrameAndEvaluate
(
stackFrameToFocus
).
done
(
null
,
errors
.
onUnexpectedError
);
this
.
windowService
.
getWindow
().
focus
();
aria
.
alert
(
nls
.
localize
(
'
debuggingPaused
'
,
"
Debugging paused, reason {0}, {1} {2}
"
,
event
.
body
.
reason
,
stackFrameToFocus
.
source
?
stackFrameToFocus
.
source
.
name
:
''
,
stackFrameToFocus
.
range
.
startLineNumber
));
return
stackFrameToFocus
.
openInEditor
(
this
.
editorService
);
}
return
undefined
;
});
});
}
}
},
errors
.
onUnexpectedError
);
},
errors
.
onUnexpectedError
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录