Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
7f182c40
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,发现更多精彩内容 >>
提交
7f182c40
编写于
9月 18, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug brekpoints: polish inline breakpoint decorations
上级
d9ec15cd
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
10 addition
and
12 deletion
+10
-12
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
...nch/contrib/debug/browser/breakpointEditorContribution.ts
+9
-11
src/vs/workbench/contrib/debug/browser/debugSession.ts
src/vs/workbench/contrib/debug/browser/debugSession.ts
+1
-1
未找到文件。
src/vs/workbench/contrib/debug/browser/breakpointEditorContribution.ts
浏览文件 @
7f182c40
...
...
@@ -68,7 +68,7 @@ async function createCandidateDecorations(model: ITextModel, lineNumbers: number
const
result
:
{
range
:
Range
;
options
:
IModelDecorationOptions
;
}[]
=
[];
const
session
=
debugService
.
getViewModel
().
focusedSession
;
if
(
session
&&
session
.
capabilities
.
supportsBreakpointLocationsRequest
)
{
lineNumbers
.
forEach
(
async
lineNumber
=>
{
await
Promise
.
all
(
lineNumbers
.
map
(
async
lineNumber
=>
{
const
positions
=
await
session
.
breakpointsLocations
(
model
.
uri
,
lineNumber
);
positions
.
forEach
(
p
=>
{
result
.
push
({
...
...
@@ -79,7 +79,7 @@ async function createCandidateDecorations(model: ITextModel, lineNumbers: number
}
});
});
});
})
)
;
}
return
result
;
...
...
@@ -114,7 +114,7 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
private
breakpointWidgetVisible
:
IContextKey
<
boolean
>
;
private
toDispose
:
IDisposable
[]
=
[];
private
ignoreDecorationsChangedEvent
=
false
;
private
ignore
First
BreakpointsChangeEvent
=
false
;
private
ignoreBreakpointsChangeEvent
=
false
;
private
breakpointDecorations
:
IBreakpointDecoration
[]
=
[];
private
candidateDecoraions
:
{
decorationId
:
string
,
inlineWidget
:
InlineBreakpointWidget
}[]
=
[];
...
...
@@ -222,11 +222,9 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
await
this
.
setDecorations
();
}));
this
.
toDispose
.
push
(
this
.
debugService
.
getModel
().
onDidChangeBreakpoints
(
async
()
=>
{
if
(
this
.
ignoreFirstBreakpointsChangeEvent
)
{
this
.
ignoreFirstBreakpointsChangeEvent
=
false
;
return
;
}
if
(
!
this
.
ignoreBreakpointsChangeEvent
)
{
await
this
.
setDecorations
();
}
}));
this
.
toDispose
.
push
(
this
.
editor
.
onDidChangeModelDecorations
(()
=>
this
.
onModelDecorationsChanged
()));
}
...
...
@@ -298,7 +296,7 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
nls
.
localize
(
'
addLogPoint
'
,
"
Add Logpoint...
"
),
undefined
,
true
,
()
=>
Promise
.
resolve
(
this
.
showBreakpointWidget
(
lineNumber
,
BreakpointWidgetContext
.
LOG_MESSAGE
))
()
=>
Promise
.
resolve
(
this
.
showBreakpointWidget
(
lineNumber
,
column
,
BreakpointWidgetContext
.
LOG_MESSAGE
))
));
}
...
...
@@ -378,7 +376,7 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
const
lineNumbers
=
distinct
(
this
.
breakpointDecorations
.
map
(
bpd
=>
bpd
.
range
.
startLineNumber
));
let
desiredCandidateDecorations
=
await
createCandidateDecorations
(
this
.
editor
.
getModel
(),
lineNumbers
,
this
.
debugService
);
desiredCandidateDecorations
=
desiredCandidateDecorations
.
filter
(
dbd
=>
{
const
breakpointDecorationAlreadyAtCandidateLocation
=
this
.
breakpointDecorations
.
filter
(
bd
=>
bd
.
range
.
equalsRange
(
dbd
.
range
)).
length
>
=
0
;
const
breakpointDecorationAlreadyAtCandidateLocation
=
this
.
breakpointDecorations
.
filter
(
bd
=>
bd
.
range
.
equalsRange
(
dbd
.
range
)).
length
>
0
;
return
!
breakpointDecorationAlreadyAtCandidateLocation
;
});
const
candidateDecorationids
=
this
.
editor
.
deltaDecorations
(
this
.
candidateDecoraions
.
map
(
c
=>
c
.
decorationId
),
desiredCandidateDecorations
);
...
...
@@ -436,10 +434,10 @@ class BreakpointEditorContribution implements IBreakpointEditorContribution {
}
try
{
this
.
ignore
First
BreakpointsChangeEvent
=
true
;
this
.
ignoreBreakpointsChangeEvent
=
true
;
await
this
.
debugService
.
updateBreakpoints
(
model
.
uri
,
data
,
true
);
}
finally
{
this
.
ignore
First
BreakpointsChangeEvent
=
false
;
this
.
ignoreBreakpointsChangeEvent
=
false
;
}
}
...
...
src/vs/workbench/contrib/debug/browser/debugSession.ts
浏览文件 @
7f182c40
...
...
@@ -376,7 +376,7 @@ export class DebugSession implements IDebugSession {
const
response
=
await
this
.
raw
.
breakpointLocations
({
source
,
line
:
lineNumber
});
const
positions
=
response
.
body
.
breakpoints
.
map
(
bp
=>
({
lineNumber
:
bp
.
line
,
column
:
bp
.
column
||
1
}));
return
distinct
(
positions
,
p
=>
p
.
toString
()
);
return
distinct
(
positions
,
p
=>
`
${
p
.
lineNumber
}
:
${
p
.
column
}
`
);
}
return
Promise
.
reject
(
new
Error
(
'
no debug adapter
'
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录