Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
2eca3865
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,发现更多精彩内容 >>
提交
2eca3865
编写于
3月 14, 2017
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Allow a stack frame with no source that has a presentationHint
fixes #20677
上级
8e285069
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
21 addition
and
10 deletion
+21
-10
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
+9
-0
src/vs/workbench/parts/debug/common/debugModel.ts
src/vs/workbench/parts/debug/common/debugModel.ts
+5
-4
src/vs/workbench/parts/debug/common/debugSource.ts
src/vs/workbench/parts/debug/common/debugSource.ts
+1
-1
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
+2
-1
src/vs/workbench/parts/debug/test/common/debugSource.test.ts
src/vs/workbench/parts/debug/test/common/debugSource.test.ts
+4
-4
未找到文件。
src/vs/workbench/parts/debug/browser/media/debugViewlet.css
浏览文件 @
2eca3865
...
...
@@ -226,6 +226,15 @@
padding-right
:
0.8em
;
}
.debug-viewlet
.debug-call-stack
.stack-frame.label
{
text-align
:
center
;
font-style
:
italic
;
}
.debug-viewlet
.debug-call-stack
.stack-frame.label
>
.file
{
display
:
none
;
}
.debug-viewlet
.debug-call-stack
.stack-frame
>
.file
{
float
:
right
;
}
...
...
src/vs/workbench/parts/debug/common/debugModel.ts
浏览文件 @
2eca3865
...
...
@@ -370,7 +370,8 @@ export class StackFrame implements IStackFrame {
}
public
openInEditor
(
editorService
:
IWorkbenchEditorService
,
preserveFocus
?:
boolean
,
sideBySide
?:
boolean
):
TPromise
<
any
>
{
return
editorService
.
openEditor
({
return
this
.
source
.
name
===
UNKNOWN_SOURCE_LABEL
?
TPromise
.
as
(
null
)
:
editorService
.
openEditor
({
resource
:
this
.
source
.
uri
,
description
:
this
.
source
.
origin
,
options
:
{
...
...
@@ -449,9 +450,9 @@ export class Thread implements IThread {
return
response
.
body
.
stackFrames
.
map
((
rsf
,
level
)
=>
{
if
(
!
rsf
)
{
return
new
StackFrame
(
this
,
0
,
new
Source
({
name
:
UNKNOWN_SOURCE_LABEL
},
true
),
nls
.
localize
(
'
unknownStack
'
,
"
Unknown stack location
"
),
null
,
null
);
return
new
StackFrame
(
this
,
0
,
new
Source
({
name
:
UNKNOWN_SOURCE_LABEL
},
rsf
.
presentationHint
),
nls
.
localize
(
'
unknownStack
'
,
"
Unknown stack location
"
),
null
,
null
);
}
let
source
=
rsf
.
source
?
new
Source
(
rsf
.
source
,
rsf
.
source
.
presentationHint
===
'
deemphasize
'
)
:
new
Source
({
name
:
UNKNOWN_SOURCE_LABEL
},
true
);
let
source
=
rsf
.
source
?
new
Source
(
rsf
.
source
,
rsf
.
source
.
presentationHint
)
:
new
Source
({
name
:
UNKNOWN_SOURCE_LABEL
},
rsf
.
presentationHint
);
if
(
this
.
process
.
sources
.
has
(
source
.
uri
.
toString
()))
{
source
=
this
.
process
.
sources
.
get
(
source
.
uri
.
toString
());
}
else
{
...
...
@@ -972,7 +973,7 @@ export class Model implements IModel {
public
deemphasizeSource
(
uri
:
uri
):
void
{
this
.
processes
.
forEach
(
p
=>
{
if
(
p
.
sources
.
has
(
uri
.
toString
()))
{
p
.
sources
.
get
(
uri
.
toString
()).
deemphasize
=
true
;
p
.
sources
.
get
(
uri
.
toString
()).
presenationHint
=
'
deemphasize
'
;
}
});
this
.
_onDidChangeCallStack
.
fire
();
...
...
src/vs/workbench/parts/debug/common/debugSource.ts
浏览文件 @
2eca3865
...
...
@@ -10,7 +10,7 @@ export class Source {
public
uri
:
uri
;
constructor
(
public
raw
:
DebugProtocol
.
Source
,
public
deemphasize
:
boolean
)
{
constructor
(
public
raw
:
DebugProtocol
.
Source
,
public
presenationHint
:
string
)
{
const
path
=
raw
.
path
||
raw
.
name
;
this
.
uri
=
raw
.
sourceReference
>
0
?
uri
.
parse
(
`
${
DEBUG_SCHEME
}
:
${
path
}
`
)
:
uri
.
file
(
path
);
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugViewer.ts
浏览文件 @
2eca3865
...
...
@@ -524,7 +524,8 @@ export class CallStackRenderer implements IRenderer {
}
private
renderStackFrame
(
stackFrame
:
debug
.
IStackFrame
,
data
:
IStackFrameTemplateData
):
void
{
stackFrame
.
source
.
deemphasize
?
dom
.
addClass
(
data
.
stackFrame
,
'
disabled
'
)
:
dom
.
removeClass
(
data
.
stackFrame
,
'
disabled
'
);
stackFrame
.
source
.
presenationHint
===
'
deemphasize
'
?
dom
.
addClass
(
data
.
stackFrame
,
'
disabled
'
)
:
dom
.
removeClass
(
data
.
stackFrame
,
'
disabled
'
);
stackFrame
.
source
.
presenationHint
===
'
label
'
?
dom
.
addClass
(
data
.
stackFrame
,
'
label
'
)
:
dom
.
removeClass
(
data
.
stackFrame
,
'
label
'
);
data
.
file
.
title
=
stackFrame
.
source
.
raw
.
path
||
stackFrame
.
source
.
name
;
if
(
stackFrame
.
source
.
raw
.
origin
)
{
data
.
file
.
title
+=
`\n
${
stackFrame
.
source
.
raw
.
origin
}
`
;
...
...
src/vs/workbench/parts/debug/test/common/debugSource.test.ts
浏览文件 @
2eca3865
...
...
@@ -15,9 +15,9 @@ suite('Debug - Source', () => {
path
:
'
/xx/yy/zz
'
,
sourceReference
:
0
};
const
source
=
new
Source
(
rawSource
,
false
);
const
source
=
new
Source
(
rawSource
,
'
label
'
);
assert
.
equal
(
source
.
deemphasize
,
false
);
assert
.
equal
(
source
.
presenationHint
,
'
label
'
);
assert
.
equal
(
source
.
name
,
rawSource
.
name
);
assert
.
equal
(
source
.
inMemory
,
false
);
assert
.
equal
(
source
.
reference
,
rawSource
.
sourceReference
);
...
...
@@ -29,9 +29,9 @@ suite('Debug - Source', () => {
name
:
'
internalModule.js
'
,
sourceReference
:
11
};
const
source
=
new
Source
(
rawSource
,
true
);
const
source
=
new
Source
(
rawSource
,
'
deemphasize
'
);
assert
.
equal
(
source
.
deemphasize
,
true
);
assert
.
equal
(
source
.
presenationHint
,
'
deemphasize
'
);
assert
.
equal
(
source
.
name
,
rawSource
.
name
);
assert
.
equal
(
source
.
inMemory
,
true
);
assert
.
equal
(
source
.
reference
,
rawSource
.
sourceReference
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录