Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
12c5f274
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,发现更多精彩内容 >>
未验证
提交
12c5f274
编写于
7月 27, 2021
作者:
I
Isidor Nikolic
提交者:
GitHub
7月 27, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #129439 from nickdelja/main
Fixed minor typos
上级
f93aba91
023c58e5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
14 deletion
+14
-14
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
+1
-1
src/vs/workbench/contrib/debug/common/debugModel.ts
src/vs/workbench/contrib/debug/common/debugModel.ts
+12
-12
src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
...vs/workbench/contrib/debug/test/browser/callStack.test.ts
+1
-1
未找到文件。
src/vs/workbench/contrib/debug/browser/breakpointsView.ts
浏览文件 @
12c5f274
...
...
@@ -1027,7 +1027,7 @@ export function getBreakpointMessageAndIcon(state: State, breakpointsActivated:
if
(
debugActive
&&
!
breakpoint
.
verified
)
{
return
{
icon
:
breakpointIcon
.
unverified
,
message
:
(
'
message
'
in
breakpoint
&&
breakpoint
.
message
)
?
breakpoint
.
message
:
(
breakpoint
.
logMessage
?
localize
(
'
unverifiedLogpoint
'
,
"
Unverified Logpoint
"
)
:
localize
(
'
unverifiedBreak
op
int
'
,
"
Unverified Breakpoint
"
)),
message
:
(
'
message
'
in
breakpoint
&&
breakpoint
.
message
)
?
breakpoint
.
message
:
(
breakpoint
.
logMessage
?
localize
(
'
unverifiedLogpoint
'
,
"
Unverified Logpoint
"
)
:
localize
(
'
unverifiedBreak
po
int
'
,
"
Unverified Breakpoint
"
)),
};
}
...
...
src/vs/workbench/contrib/debug/common/debugModel.ts
浏览文件 @
12c5f274
...
...
@@ -973,7 +973,7 @@ export class DebugModel implements IDebugModel {
private
breakpoints
:
Breakpoint
[];
private
functionBreakpoints
:
FunctionBreakpoint
[];
private
exceptionBreakpoints
:
ExceptionBreakpoint
[];
private
dataBreak
op
ints
:
DataBreakpoint
[];
private
dataBreak
po
ints
:
DataBreakpoint
[];
private
watchExpressions
:
Expression
[];
private
instructionBreakpoints
:
InstructionBreakpoint
[];
...
...
@@ -985,7 +985,7 @@ export class DebugModel implements IDebugModel {
this
.
breakpoints
=
debugStorage
.
loadBreakpoints
();
this
.
functionBreakpoints
=
debugStorage
.
loadFunctionBreakpoints
();
this
.
exceptionBreakpoints
=
debugStorage
.
loadExceptionBreakpoints
();
this
.
dataBreak
op
ints
=
debugStorage
.
loadDataBreakpoints
();
this
.
dataBreak
po
ints
=
debugStorage
.
loadDataBreakpoints
();
this
.
watchExpressions
=
debugStorage
.
loadWatchExpressions
();
this
.
instructionBreakpoints
=
[];
this
.
sessions
=
[];
...
...
@@ -1003,7 +1003,7 @@ export class DebugModel implements IDebugModel {
}
getSessions
(
includeInactive
=
false
):
IDebugSession
[]
{
// By default do not return inactive sesions.
// By default do not return inactive ses
s
ions.
// However we are still holding onto inactive sessions due to repl and debug service session revival (eh scenario)
return
this
.
sessions
.
filter
(
s
=>
includeInactive
||
s
.
state
!==
State
.
Inactive
);
}
...
...
@@ -1011,7 +1011,7 @@ export class DebugModel implements IDebugModel {
addSession
(
session
:
IDebugSession
):
void
{
this
.
sessions
=
this
.
sessions
.
filter
(
s
=>
{
if
(
s
.
getId
()
===
session
.
getId
())
{
// Make sure to de-dupe if a session is re-intialized. In case of EH debugging we are adding a session again after an attach.
// Make sure to de-dupe if a session is re-in
i
tialized. In case of EH debugging we are adding a session again after an attach.
return
false
;
}
if
(
s
.
state
===
State
.
Inactive
&&
s
.
configuration
.
name
===
session
.
configuration
.
name
)
{
...
...
@@ -1136,7 +1136,7 @@ export class DebugModel implements IDebugModel {
}
getDataBreakpoints
():
IDataBreakpoint
[]
{
return
this
.
dataBreak
op
ints
;
return
this
.
dataBreak
po
ints
;
}
getExceptionBreakpoints
():
IExceptionBreakpoint
[]
{
...
...
@@ -1229,7 +1229,7 @@ export class DebugModel implements IDebugModel {
}
}
});
this
.
dataBreak
op
ints
.
forEach
(
dbp
=>
{
this
.
dataBreak
po
ints
.
forEach
(
dbp
=>
{
if
(
!
data
)
{
dbp
.
setSessionData
(
sessionId
,
undefined
);
}
else
{
...
...
@@ -1321,7 +1321,7 @@ export class DebugModel implements IDebugModel {
}
fbp
.
enabled
=
enable
;
});
this
.
dataBreak
op
ints
.
forEach
(
dbp
=>
{
this
.
dataBreak
po
ints
.
forEach
(
dbp
=>
{
if
(
dbp
.
enabled
!==
enable
)
{
changed
.
push
(
dbp
);
}
...
...
@@ -1379,18 +1379,18 @@ export class DebugModel implements IDebugModel {
addDataBreakpoint
(
label
:
string
,
dataId
:
string
,
canPersist
:
boolean
,
accessTypes
:
DebugProtocol
.
DataBreakpointAccessType
[]
|
undefined
,
accessType
:
DebugProtocol
.
DataBreakpointAccessType
):
void
{
const
newDataBreakpoint
=
new
DataBreakpoint
(
label
,
dataId
,
canPersist
,
true
,
undefined
,
undefined
,
undefined
,
accessTypes
,
accessType
);
this
.
dataBreak
op
ints
.
push
(
newDataBreakpoint
);
this
.
dataBreak
po
ints
.
push
(
newDataBreakpoint
);
this
.
_onDidChangeBreakpoints
.
fire
({
added
:
[
newDataBreakpoint
],
sessionOnly
:
false
});
}
removeDataBreakpoints
(
id
?:
string
):
void
{
let
removed
:
DataBreakpoint
[];
if
(
id
)
{
removed
=
this
.
dataBreak
op
ints
.
filter
(
fbp
=>
fbp
.
getId
()
===
id
);
this
.
dataBreak
opints
=
this
.
dataBreakop
ints
.
filter
(
fbp
=>
fbp
.
getId
()
!==
id
);
removed
=
this
.
dataBreak
po
ints
.
filter
(
fbp
=>
fbp
.
getId
()
===
id
);
this
.
dataBreak
points
=
this
.
dataBreakpo
ints
.
filter
(
fbp
=>
fbp
.
getId
()
!==
id
);
}
else
{
removed
=
this
.
dataBreak
op
ints
;
this
.
dataBreak
op
ints
=
[];
removed
=
this
.
dataBreak
po
ints
;
this
.
dataBreak
po
ints
=
[];
}
this
.
_onDidChangeBreakpoints
.
fire
({
removed
,
sessionOnly
:
false
});
}
...
...
src/vs/workbench/contrib/debug/test/browser/callStack.test.ts
浏览文件 @
12c5f274
...
...
@@ -366,7 +366,7 @@ suite('Debug - CallStack', () => {
assert
.
strictEqual
(
contributedContext
,
session
.
getId
());
});
test
(
'
focusStackFrameThreadAndSesion
'
,
()
=>
{
test
(
'
focusStackFrameThreadAndSes
s
ion
'
,
()
=>
{
const
threadId1
=
1
;
const
threadName1
=
'
firstThread
'
;
const
threadId2
=
2
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录