Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
e4c0f771
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,发现更多精彩内容 >>
提交
e4c0f771
编写于
10月 25, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Active inline breakpoint isn't highlighted
fixes #81718
上级
03dfb55e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
5 deletion
+28
-5
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
...nch/contrib/debug/browser/breakpointEditorContribution.ts
+7
-1
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+12
-0
src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
...kbench/contrib/debug/browser/media/debug.contribution.css
+9
-4
未找到文件。
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
浏览文件 @
e4c0f771
...
@@ -247,11 +247,17 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
...
@@ -247,11 +247,17 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
this
.
closeBreakpointWidget
();
this
.
closeBreakpointWidget
();
await
this
.
setDecorations
();
await
this
.
setDecorations
();
}));
}));
this
.
toDispose
.
push
(
this
.
debugService
.
getModel
().
onDidChangeBreakpoints
(
async
()
=>
{
this
.
toDispose
.
push
(
this
.
debugService
.
getModel
().
onDidChangeBreakpoints
(()
=>
{
if
(
!
this
.
ignoreBreakpointsChangeEvent
&&
!
this
.
setDecorationsScheduler
.
isScheduled
())
{
if
(
!
this
.
ignoreBreakpointsChangeEvent
&&
!
this
.
setDecorationsScheduler
.
isScheduled
())
{
this
.
setDecorationsScheduler
.
schedule
();
this
.
setDecorationsScheduler
.
schedule
();
}
}
}));
}));
this
.
toDispose
.
push
(
this
.
debugService
.
onDidChangeState
(()
=>
{
// We need to update breakpoint decorations when state changes since the top stack frame and breakpoint decoration might change
if
(
!
this
.
setDecorationsScheduler
.
isScheduled
())
{
this
.
setDecorationsScheduler
.
schedule
();
}
}));
this
.
toDispose
.
push
(
this
.
editor
.
onDidChangeModelDecorations
(()
=>
this
.
onModelDecorationsChanged
()));
this
.
toDispose
.
push
(
this
.
editor
.
onDidChangeModelDecorations
(()
=>
this
.
onModelDecorationsChanged
()));
this
.
toDispose
.
push
(
this
.
configurationService
.
onDidChangeConfiguration
(
async
(
e
)
=>
{
this
.
toDispose
.
push
(
this
.
configurationService
.
onDidChangeConfiguration
(
async
(
e
)
=>
{
if
(
e
.
affectsConfiguration
(
'
debug.showBreakpointsInOverviewRuler
'
))
{
if
(
e
.
affectsConfiguration
(
'
debug.showBreakpointsInOverviewRuler
'
))
{
...
...
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
浏览文件 @
e4c0f771
...
@@ -707,6 +707,18 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
...
@@ -707,6 +707,18 @@ export function getBreakpointMessageAndClassName(debugService: IDebugService, br
};
};
}
}
const
focusedThread
=
debugService
.
getViewModel
().
focusedThread
;
if
(
focusedThread
)
{
const
callStack
=
focusedThread
?
focusedThread
.
getCallStack
()
:
undefined
;
const
topStackFrame
=
callStack
?
callStack
[
0
]
:
undefined
;
if
(
topStackFrame
&&
topStackFrame
.
source
.
uri
.
toString
()
===
breakpoint
.
uri
.
toString
()
&&
topStackFrame
.
range
.
startLineNumber
===
breakpoint
.
lineNumber
&&
topStackFrame
.
range
.
startColumn
===
breakpoint
.
column
)
{
return
{
className
:
'
debug-breakpoint-and-top-stack-frame
'
,
message
:
breakpoint
.
message
||
nls
.
localize
(
'
breakpoint
'
,
"
Breakpoint
"
)
};
}
}
return
{
return
{
className
:
'
debug-breakpoint
'
,
className
:
'
debug-breakpoint
'
,
message
:
breakpoint
.
message
||
nls
.
localize
(
'
breakpoint
'
,
"
Breakpoint
"
)
message
:
breakpoint
.
message
||
nls
.
localize
(
'
breakpoint
'
,
"
Breakpoint
"
)
...
...
src/vs/workbench/contrib/debug/browser/media/debug.contribution.css
浏览文件 @
e4c0f771
...
@@ -54,6 +54,14 @@
...
@@ -54,6 +54,14 @@
margin-left
:
2px
;
margin-left
:
2px
;
}
}
/* Do not show call stack decoration when we plan to show breakpoint and top stack frame in one decoration */
.monaco-editor
.debug-breakpoint-placeholder
~
.debug-top-stack-frame-column
::before
{
width
:
0em
;
content
:
""
;
margin-right
:
0px
;
margin-left
:
0px
;
}
.monaco-editor
.debug-top-stack-frame-column
::before
{
.monaco-editor
.debug-top-stack-frame-column
::before
{
height
:
1.3em
;
height
:
1.3em
;
}
}
...
@@ -111,10 +119,7 @@
...
@@ -111,10 +119,7 @@
background
:
url('breakpoint-unsupported.svg')
center
center
no-repeat
;
background
:
url('breakpoint-unsupported.svg')
center
center
no-repeat
;
}
}
.monaco-editor
.debug-top-stack-frame.debug-breakpoint
,
.monaco-editor
.inline-breakpoint-widget.debug-breakpoint-and-top-stack-frame
{
.monaco-editor
.debug-top-stack-frame.debug-breakpoint-conditional
,
.monaco-editor
.debug-top-stack-frame.debug-breakpoint-log
,
.monaco-editor
.inline-breakpoint-widget.debug-top-stack-frame-column
{
background
:
url('current-and-breakpoint.svg')
center
center
no-repeat
;
background
:
url('current-and-breakpoint.svg')
center
center
no-repeat
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录