Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
6a9c0580
V
vscode
项目概览
掘金者说
/
vscode
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
V
vscode
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6a9c0580
编写于
3月 08, 2019
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: better has / get map usage due to null checks
上级
5f407914
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
16 addition
and
12 deletion
+16
-12
src/vs/workbench/contrib/debug/browser/debugEditorModelManager.ts
...orkbench/contrib/debug/browser/debugEditorModelManager.ts
+11
-8
src/vs/workbench/contrib/debug/electron-browser/debugEditorContribution.ts
...contrib/debug/electron-browser/debugEditorContribution.ts
+3
-2
src/vs/workbench/contrib/debug/electron-browser/debugSession.ts
.../workbench/contrib/debug/electron-browser/debugSession.ts
+2
-2
未找到文件。
src/vs/workbench/contrib/debug/browser/debugEditorModelManager.ts
浏览文件 @
6a9c0580
...
...
@@ -93,8 +93,9 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
private
onModelRemoved
(
model
:
ITextModel
):
void
{
const
modelUriStr
=
model
.
uri
.
toString
();
if
(
this
.
modelDataMap
.
has
(
modelUriStr
))
{
lifecycle
.
dispose
(
this
.
modelDataMap
.
get
(
modelUriStr
)
!
.
toDispose
);
const
data
=
this
.
modelDataMap
.
get
(
modelUriStr
);
if
(
data
)
{
lifecycle
.
dispose
(
data
.
toDispose
);
this
.
modelDataMap
.
delete
(
modelUriStr
);
}
}
...
...
@@ -132,8 +133,8 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
range
:
columnUntilEOLRange
});
if
(
this
.
modelDataMap
.
has
(
modelUriStr
))
{
const
modelData
=
this
.
modelDataMap
.
get
(
modelUriStr
)
!
;
const
modelData
=
this
.
modelDataMap
.
get
(
modelUriStr
);
if
(
modelData
)
{
if
(
modelData
.
topStackFrameRange
&&
modelData
.
topStackFrameRange
.
startLineNumber
===
stackFrame
.
range
.
startLineNumber
&&
modelData
.
topStackFrameRange
.
startColumn
!==
stackFrame
.
range
.
startColumn
)
{
result
.
push
({
options
:
DebugEditorModelManager
.
TOP_STACK_FRAME_INLINE_DECORATION
,
...
...
@@ -205,16 +206,18 @@ export class DebugEditorModelManager implements IWorkbenchContribution {
const
breakpointsMap
=
new
Map
<
string
,
IBreakpoint
[]
>
();
this
.
debugService
.
getModel
().
getBreakpoints
().
forEach
(
bp
=>
{
const
uriStr
=
bp
.
uri
.
toString
();
if
(
breakpointsMap
.
has
(
uriStr
))
{
breakpointsMap
.
get
(
uriStr
)
!
.
push
(
bp
);
const
breakpoints
=
breakpointsMap
.
get
(
uriStr
);
if
(
breakpoints
)
{
breakpoints
.
push
(
bp
);
}
else
{
breakpointsMap
.
set
(
uriStr
,
[
bp
]);
}
});
breakpointsMap
.
forEach
((
bps
,
uri
)
=>
{
if
(
this
.
modelDataMap
.
has
(
uri
))
{
this
.
updateBreakpoints
(
this
.
modelDataMap
.
get
(
uri
)
!
,
breakpointsMap
.
get
(
uri
)
!
);
const
data
=
this
.
modelDataMap
.
get
(
uri
);
if
(
data
)
{
this
.
updateBreakpoints
(
data
,
breakpointsMap
.
get
(
uri
)
!
);
}
});
this
.
modelDataMap
.
forEach
((
modelData
,
uri
)
=>
{
...
...
src/vs/workbench/contrib/debug/electron-browser/debugEditorContribution.ts
浏览文件 @
6a9c0580
...
...
@@ -641,8 +641,9 @@ export class DebugEditorContribution implements IDebugEditorContribution {
// Compute unique set of names on each line
nameValueMap
.
forEach
((
value
,
name
)
=>
{
if
(
wordToPositionsMap
.
has
(
name
))
{
for
(
let
position
of
wordToPositionsMap
.
get
(
name
))
{
const
positions
=
wordToPositionsMap
.
get
(
name
);
if
(
positions
)
{
for
(
let
position
of
positions
)
{
if
(
range
.
containsPosition
(
position
))
{
if
(
!
lineToNamesMap
.
has
(
position
.
lineNumber
))
{
lineToNamesMap
.
set
(
position
.
lineNumber
,
[]);
...
...
src/vs/workbench/contrib/debug/electron-browser/debugSession.ts
浏览文件 @
6a9c0580
...
...
@@ -517,8 +517,8 @@ export class DebugSession implements IDebugSession {
clearThreads
(
removeThreads
:
boolean
,
reference
:
number
|
undefined
=
undefined
):
void
{
if
(
reference
!==
undefined
&&
reference
!==
null
)
{
if
(
this
.
threads
.
has
(
reference
))
{
const
thread
=
this
.
threads
.
get
(
reference
);
const
thread
=
this
.
threads
.
get
(
reference
);
if
(
thread
)
{
thread
.
clearCallStack
();
thread
.
stoppedDetails
=
undefined
;
thread
.
stopped
=
false
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录