Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
掘金者说
vscode
提交
a4d87f73
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,发现更多精彩内容 >>
提交
a4d87f73
编写于
11月 09, 2018
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: do not report cancled error message
fixes #60488
上级
9e447b03
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
10 deletion
+11
-10
src/vs/workbench/parts/debug/electron-browser/debugSession.ts
...vs/workbench/parts/debug/electron-browser/debugSession.ts
+5
-4
src/vs/workbench/parts/debug/test/electron-browser/debugModel.test.ts
...ench/parts/debug/test/electron-browser/debugModel.test.ts
+6
-6
未找到文件。
src/vs/workbench/parts/debug/electron-browser/debugSession.ts
浏览文件 @
a4d87f73
...
...
@@ -18,7 +18,6 @@ import { mixin } from 'vs/base/common/objects';
import
{
Thread
,
ExpressionContainer
,
DebugModel
}
from
'
vs/workbench/parts/debug/common/debugModel
'
;
import
{
RawDebugSession
}
from
'
vs/workbench/parts/debug/electron-browser/rawDebugSession
'
;
import
product
from
'
vs/platform/node/product
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
IWorkspaceFolder
,
IWorkspaceContextService
}
from
'
vs/platform/workspace/common/workspace
'
;
import
{
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
...
...
@@ -31,6 +30,7 @@ import { Range } from 'vs/editor/common/core/range';
import
{
IConfigurationService
}
from
'
vs/platform/configuration/common/configuration
'
;
import
{
IViewletService
}
from
'
vs/workbench/services/viewlet/browser/viewlet
'
;
import
{
ReplModel
}
from
'
vs/workbench/parts/debug/common/replModel
'
;
import
{
onUnexpectedError
}
from
'
vs/base/common/errors
'
;
export
class
DebugSession
implements
IDebugSession
{
private
id
:
string
;
...
...
@@ -54,7 +54,6 @@ export class DebugSession implements IDebugSession {
private
_configuration
:
{
resolved
:
IConfig
,
unresolved
:
IConfig
},
public
root
:
IWorkspaceFolder
,
private
model
:
DebugModel
,
@
INotificationService
private
notificationService
:
INotificationService
,
@
IDebugService
private
debugService
:
IDebugService
,
@
ITelemetryService
private
telemetryService
:
ITelemetryService
,
@
IOutputService
private
outputService
:
IOutputService
,
...
...
@@ -589,7 +588,9 @@ export class DebugSession implements IDebugSession {
if
(
this
.
raw
)
{
this
.
raw
.
disconnect
();
}
this
.
notificationService
.
error
(
e
.
message
);
if
(
e
.
command
!==
'
canceled
'
&&
e
.
message
!==
'
canceled
'
)
{
onUnexpectedError
(
e
);
}
});
}
...
...
@@ -642,7 +643,7 @@ export class DebugSession implements IDebugSession {
this
.
rawListeners
.
push
(
this
.
raw
.
onDidTerminateDebugee
(
event
=>
{
aria
.
status
(
nls
.
localize
(
'
debuggingStopped
'
,
"
Debugging stopped.
"
));
if
(
event
.
body
&&
event
.
body
.
restart
)
{
this
.
debugService
.
restartSession
(
this
,
event
.
body
.
restart
).
then
(
null
,
err
=>
this
.
notificationService
.
error
(
err
.
message
)
);
this
.
debugService
.
restartSession
(
this
,
event
.
body
.
restart
).
then
(
null
,
onUnexpectedError
);
}
else
{
this
.
raw
.
disconnect
();
}
...
...
src/vs/workbench/parts/debug/test/electron-browser/debugModel.test.ts
浏览文件 @
a4d87f73
...
...
@@ -110,7 +110,7 @@ suite('Debug - Model', () => {
test
(
'
threads simple
'
,
()
=>
{
const
threadId
=
1
;
const
threadName
=
'
firstThread
'
;
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
model
.
addSession
(
session
);
assert
.
equal
(
model
.
getSessions
(
true
).
length
,
1
);
...
...
@@ -138,7 +138,7 @@ suite('Debug - Model', () => {
const
stoppedReason
=
'
breakpoint
'
;
// Add the threads
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
model
.
addSession
(
session
);
session
[
'
raw
'
]
=
<
any
>
rawSession
;
...
...
@@ -225,7 +225,7 @@ suite('Debug - Model', () => {
const
runningThreadId
=
2
;
const
runningThreadName
=
'
runningThread
'
;
const
stoppedReason
=
'
breakpoint
'
;
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
model
.
addSession
(
session
);
session
[
'
raw
'
]
=
<
any
>
rawSession
;
...
...
@@ -338,7 +338,7 @@ suite('Debug - Model', () => {
});
test
(
'
repl expressions
'
,
()
=>
{
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
assert
.
equal
(
session
.
getReplElements
().
length
,
0
);
model
.
addSession
(
session
);
...
...
@@ -362,7 +362,7 @@ suite('Debug - Model', () => {
});
test
(
'
stack frame get specific source name
'
,
()
=>
{
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
model
.
addSession
(
session
);
let
firstStackFrame
:
StackFrame
;
...
...
@@ -393,7 +393,7 @@ suite('Debug - Model', () => {
// Repl output
test
(
'
repl output
'
,
()
=>
{
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
session
=
new
DebugSession
({
resolved
:
{
name
:
'
mockSession
'
,
type
:
'
node
'
,
request
:
'
launch
'
},
unresolved
:
undefined
},
undefined
,
model
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
,
undefined
);
const
repl
=
new
ReplModel
(
session
);
repl
.
appendToRepl
(
'
first line
\n
'
,
severity
.
Error
);
repl
.
appendToRepl
(
'
second line
'
,
severity
.
Error
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录