Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
27ca195e
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,发现更多精彩内容 >>
提交
27ca195e
编写于
3月 22, 2017
作者:
I
Isidor Nikolic
提交者:
GitHub
3月 22, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #22948 from michelkaporin/exception-widget
Surfacing new Exception DAP in UI
上级
54c463d2
e53980cf
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
92 addition
and
15 deletion
+92
-15
src/vs/workbench/parts/debug/browser/exceptionWidget.ts
src/vs/workbench/parts/debug/browser/exceptionWidget.ts
+32
-9
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+13
-0
src/vs/workbench/parts/debug/common/debugModel.ts
src/vs/workbench/parts/debug/common/debugModel.ts
+25
-1
src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
...h/parts/debug/electron-browser/debugEditorContribution.ts
+9
-5
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
...workbench/parts/debug/electron-browser/rawDebugSession.ts
+4
-0
src/vs/workbench/parts/debug/test/common/mockDebug.ts
src/vs/workbench/parts/debug/test/common/mockDebug.ts
+9
-0
未找到文件。
src/vs/workbench/parts/debug/browser/exceptionWidget.ts
浏览文件 @
27ca195e
...
@@ -9,13 +9,13 @@ import * as dom from 'vs/base/browser/dom';
...
@@ -9,13 +9,13 @@ import * as dom from 'vs/base/browser/dom';
import
{
ZoneWidget
}
from
'
vs/editor/contrib/zoneWidget/browser/zoneWidget
'
;
import
{
ZoneWidget
}
from
'
vs/editor/contrib/zoneWidget/browser/zoneWidget
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextViewService
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IDebugService
}
from
'
vs/workbench/parts/debug/common/debug
'
;
import
{
IDebugService
,
IExceptionInfo
}
from
'
vs/workbench/parts/debug/common/debug
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
import
{
RunOnceScheduler
}
from
'
vs/base/common/async
'
;
const
$
=
dom
.
$
;
const
$
=
dom
.
$
;
export
class
ExceptionWidget
extends
ZoneWidget
{
export
class
ExceptionWidget
extends
ZoneWidget
{
constructor
(
editor
:
ICodeEditor
,
private
lineNumber
:
number
,
constructor
(
editor
:
ICodeEditor
,
private
exceptionInfo
:
IExceptionInfo
,
private
lineNumber
:
number
,
@
IContextViewService
private
contextViewService
:
IContextViewService
,
@
IContextViewService
private
contextViewService
:
IContextViewService
,
@
IDebugService
private
debugService
:
IDebugService
@
IDebugService
private
debugService
:
IDebugService
)
{
)
{
...
@@ -35,15 +35,38 @@ export class ExceptionWidget extends ZoneWidget {
...
@@ -35,15 +35,38 @@ export class ExceptionWidget extends ZoneWidget {
this
.
container
.
style
.
lineHeight
=
`
${
fontInfo
.
lineHeight
}
px`
;
this
.
container
.
style
.
lineHeight
=
`
${
fontInfo
.
lineHeight
}
px`
;
let
title
=
$
(
'
.title
'
);
let
title
=
$
(
'
.title
'
);
title
.
textContent
=
nls
.
localize
(
'
exceptionThrown
'
,
'
Exception occurred
'
);
dom
.
append
(
container
,
title
);
const
thread
=
this
.
debugService
.
getViewModel
().
focusedThread
;
if
(
thread
&&
thread
.
stoppedDetails
)
{
let
msg
=
$
(
'
.message
'
);
let
msg
=
$
(
'
.message
'
);
msg
.
textContent
=
thread
.
stoppedDetails
.
text
;
const
defaultConditionMessage
=
nls
.
localize
(
'
exceptionThrown
'
,
'
Exception has occurred.
'
);
dom
.
append
(
container
,
msg
);
if
(
this
.
exceptionInfo
.
breakMode
)
{
let
conditionMessage
;
switch
(
this
.
exceptionInfo
.
breakMode
)
{
case
'
never
'
:
conditionMessage
=
nls
.
localize
(
'
neverException
'
,
'
User-handled exception has occurred.
'
);
break
;
case
'
always
'
:
conditionMessage
=
nls
.
localize
(
'
alwaysException
'
,
'
Always-breaking exception has occurred.
'
);
break
;
case
'
unhandled
'
:
conditionMessage
=
nls
.
localize
(
'
unhandledException
'
,
'
Unhandled exception has occurred.
'
);
break
;
case
'
userUnhandled
'
:
conditionMessage
=
nls
.
localize
(
'
userUnhandledException
'
,
'
User-unhandled exception has occurred.
'
);
break
;
default
:
conditionMessage
=
defaultConditionMessage
;
break
;
}
}
title
.
textContent
=
`
${
conditionMessage
}
${
this
.
exceptionInfo
.
description
}
`
;
msg
.
textContent
=
this
.
exceptionInfo
.
details
.
stackTrace
;
}
else
{
title
.
textContent
=
defaultConditionMessage
;
msg
.
textContent
=
this
.
exceptionInfo
.
description
;
}
dom
.
append
(
container
,
title
);
dom
.
append
(
container
,
msg
);
}
}
protected
_doLayout
(
heightInPixel
:
number
,
widthInPixel
:
number
):
void
{
protected
_doLayout
(
heightInPixel
:
number
,
widthInPixel
:
number
):
void
{
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
27ca195e
...
@@ -77,6 +77,7 @@ export interface IExpression extends ITreeElement, IExpressionContainer {
...
@@ -77,6 +77,7 @@ export interface IExpression extends ITreeElement, IExpressionContainer {
export
interface
ISession
{
export
interface
ISession
{
stackTrace
(
args
:
DebugProtocol
.
StackTraceArguments
):
TPromise
<
DebugProtocol
.
StackTraceResponse
>
;
stackTrace
(
args
:
DebugProtocol
.
StackTraceArguments
):
TPromise
<
DebugProtocol
.
StackTraceResponse
>
;
exceptionInfo
(
args
:
DebugProtocol
.
ExceptionInfoArguments
):
TPromise
<
DebugProtocol
.
ExceptionInfoResponse
>
;
scopes
(
args
:
DebugProtocol
.
ScopesArguments
):
TPromise
<
DebugProtocol
.
ScopesResponse
>
;
scopes
(
args
:
DebugProtocol
.
ScopesArguments
):
TPromise
<
DebugProtocol
.
ScopesResponse
>
;
variables
(
args
:
DebugProtocol
.
VariablesArguments
):
TPromise
<
DebugProtocol
.
VariablesResponse
>
;
variables
(
args
:
DebugProtocol
.
VariablesArguments
):
TPromise
<
DebugProtocol
.
VariablesResponse
>
;
evaluate
(
args
:
DebugProtocol
.
EvaluateArguments
):
TPromise
<
DebugProtocol
.
EvaluateResponse
>
;
evaluate
(
args
:
DebugProtocol
.
EvaluateArguments
):
TPromise
<
DebugProtocol
.
EvaluateResponse
>
;
...
@@ -133,6 +134,11 @@ export interface IThread extends ITreeElement {
...
@@ -133,6 +134,11 @@ export interface IThread extends ITreeElement {
*/
*/
stoppedDetails
:
IRawStoppedDetails
;
stoppedDetails
:
IRawStoppedDetails
;
/**
* Information about the exception if an 'exception' stopped event raised and DA supports the 'exceptionInfo' request, otherwise null.
*/
exceptionInfo
:
TPromise
<
IExceptionInfo
>
;
/**
/**
* Gets the callstack if it has already been received from the debug
* Gets the callstack if it has already been received from the debug
* adapter, otherwise it returns null.
* adapter, otherwise it returns null.
...
@@ -214,6 +220,13 @@ export interface IExceptionBreakpoint extends IEnablement {
...
@@ -214,6 +220,13 @@ export interface IExceptionBreakpoint extends IEnablement {
label
:
string
;
label
:
string
;
}
}
export
interface
IExceptionInfo
{
id
?:
string
;
description
?:
string
;
breakMode
:
string
;
details
?:
DebugProtocol
.
ExceptionDetails
;
}
// model interfaces
// model interfaces
export
interface
IViewModel
extends
ITreeElement
{
export
interface
IViewModel
extends
ITreeElement
{
...
...
src/vs/workbench/parts/debug/common/debugModel.ts
浏览文件 @
27ca195e
...
@@ -19,7 +19,7 @@ import { ISuggestion } from 'vs/editor/common/modes';
...
@@ -19,7 +19,7 @@ import { ISuggestion } from 'vs/editor/common/modes';
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
Position
}
from
'
vs/editor/common/core/position
'
;
import
{
import
{
ITreeElement
,
IExpression
,
IExpressionContainer
,
IProcess
,
IStackFrame
,
IExceptionBreakpoint
,
IBreakpoint
,
IFunctionBreakpoint
,
IModel
,
ITreeElement
,
IExpression
,
IExpressionContainer
,
IProcess
,
IStackFrame
,
IExceptionBreakpoint
,
IBreakpoint
,
IFunctionBreakpoint
,
IModel
,
IConfig
,
ISession
,
IThread
,
IRawModelUpdate
,
IScope
,
IRawStoppedDetails
,
IEnablement
,
IRawBreakpoint
IConfig
,
ISession
,
IThread
,
IRawModelUpdate
,
IScope
,
IRawStoppedDetails
,
IEnablement
,
IRawBreakpoint
,
IExceptionInfo
}
from
'
vs/workbench/parts/debug/common/debug
'
;
}
from
'
vs/workbench/parts/debug/common/debug
'
;
import
{
Source
}
from
'
vs/workbench/parts/debug/common/debugSource
'
;
import
{
Source
}
from
'
vs/workbench/parts/debug/common/debugSource
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
import
{
IWorkbenchEditorService
}
from
'
vs/workbench/services/editor/common/editorService
'
;
...
@@ -490,6 +490,30 @@ export class Thread implements IThread {
...
@@ -490,6 +490,30 @@ export class Thread implements IThread {
});
});
}
}
/**
* Returns exception info promise if the exception was thrown, otherwise null
*/
public
get
exceptionInfo
():
TPromise
<
IExceptionInfo
>
{
const
session
=
this
.
process
.
session
;
if
(
this
.
stoppedDetails
&&
this
.
stoppedDetails
.
reason
===
'
exception
'
)
{
if
(
!
session
.
capabilities
.
supportsExceptionInfoRequest
)
{
return
TPromise
.
as
({
description
:
this
.
stoppedDetails
.
text
,
breakMode
:
null
});
}
return
session
.
exceptionInfo
({
threadId
:
this
.
threadId
}).
then
(
exception
=>
({
id
:
exception
.
body
.
exceptionId
,
description
:
exception
.
body
.
description
,
breakMode
:
exception
.
body
.
breakMode
,
details
:
exception
.
body
.
details
}));
}
return
TPromise
.
as
(
null
);
}
public
next
():
TPromise
<
any
>
{
public
next
():
TPromise
<
any
>
{
return
this
.
process
.
session
.
next
({
threadId
:
this
.
threadId
});
return
this
.
process
.
session
.
next
({
threadId
:
this
.
threadId
});
}
}
...
...
src/vs/workbench/parts/debug/electron-browser/debugEditorContribution.ts
浏览文件 @
27ca195e
...
@@ -30,7 +30,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
...
@@ -30,7 +30,7 @@ import { IContextKeyService, IContextKey } from 'vs/platform/contextkey/common/c
import
{
IContextMenuService
,
ContextSubMenu
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
IContextMenuService
,
ContextSubMenu
}
from
'
vs/platform/contextview/browser/contextView
'
;
import
{
DebugHoverWidget
}
from
'
vs/workbench/parts/debug/electron-browser/debugHover
'
;
import
{
DebugHoverWidget
}
from
'
vs/workbench/parts/debug/electron-browser/debugHover
'
;
import
{
RemoveBreakpointAction
,
EditConditionalBreakpointAction
,
EnableBreakpointAction
,
DisableBreakpointAction
,
AddConditionalBreakpointAction
}
from
'
vs/workbench/parts/debug/browser/debugActions
'
;
import
{
RemoveBreakpointAction
,
EditConditionalBreakpointAction
,
EnableBreakpointAction
,
DisableBreakpointAction
,
AddConditionalBreakpointAction
}
from
'
vs/workbench/parts/debug/browser/debugActions
'
;
import
{
IDebugEditorContribution
,
IDebugService
,
State
,
IBreakpoint
,
EDITOR_CONTRIBUTION_ID
,
CONTEXT_BREAKPOINT_WIDGET_VISIBLE
,
IStackFrame
,
IDebugConfiguration
,
IExpression
}
from
'
vs/workbench/parts/debug/common/debug
'
;
import
{
IDebugEditorContribution
,
IDebugService
,
State
,
IBreakpoint
,
EDITOR_CONTRIBUTION_ID
,
CONTEXT_BREAKPOINT_WIDGET_VISIBLE
,
IStackFrame
,
IDebugConfiguration
,
IExpression
,
IExceptionInfo
}
from
'
vs/workbench/parts/debug/common/debug
'
;
import
{
BreakpointWidget
}
from
'
vs/workbench/parts/debug/browser/breakpointWidget
'
;
import
{
BreakpointWidget
}
from
'
vs/workbench/parts/debug/browser/breakpointWidget
'
;
import
{
ExceptionWidget
}
from
'
vs/workbench/parts/debug/browser/exceptionWidget
'
;
import
{
ExceptionWidget
}
from
'
vs/workbench/parts/debug/browser/exceptionWidget
'
;
import
{
FloatingClickWidget
}
from
'
vs/workbench/parts/preferences/browser/preferencesWidgets
'
;
import
{
FloatingClickWidget
}
from
'
vs/workbench/parts/preferences/browser/preferencesWidgets
'
;
...
@@ -360,17 +360,21 @@ export class DebugEditorContribution implements IDebugEditorContribution {
...
@@ -360,17 +360,21 @@ export class DebugEditorContribution implements IDebugEditorContribution {
const
sameUri
=
exceptionSf
.
source
.
uri
.
toString
()
===
model
.
uri
.
toString
();
const
sameUri
=
exceptionSf
.
source
.
uri
.
toString
()
===
model
.
uri
.
toString
();
if
(
this
.
exceptionWidget
&&
!
sameUri
)
{
if
(
this
.
exceptionWidget
&&
!
sameUri
)
{
this
.
closeExceptionWidget
();
this
.
closeExceptionWidget
();
}
else
if
(
sameUri
&&
focusedSf
.
thread
.
stoppedDetails
&&
focusedSf
.
thread
.
stoppedDetails
.
reason
===
'
exception
'
)
{
}
else
if
(
sameUri
)
{
this
.
showExceptionWidget
(
exceptionSf
.
lineNumber
,
exceptionSf
.
column
);
focusedSf
.
thread
.
exceptionInfo
.
then
(
exceptionInfo
=>
{
if
(
exceptionInfo
)
{
this
.
showExceptionWidget
(
exceptionInfo
,
exceptionSf
.
lineNumber
,
exceptionSf
.
column
);
}
});
}
}
}
}
private
showExceptionWidget
(
lineNumber
:
number
,
column
:
number
):
void
{
private
showExceptionWidget
(
exceptionInfo
:
IExceptionInfo
,
lineNumber
:
number
,
column
:
number
):
void
{
if
(
this
.
exceptionWidget
)
{
if
(
this
.
exceptionWidget
)
{
this
.
exceptionWidget
.
dispose
();
this
.
exceptionWidget
.
dispose
();
}
}
this
.
exceptionWidget
=
this
.
instantiationService
.
createInstance
(
ExceptionWidget
,
this
.
editor
,
lineNumber
);
this
.
exceptionWidget
=
this
.
instantiationService
.
createInstance
(
ExceptionWidget
,
this
.
editor
,
exceptionInfo
,
lineNumber
);
this
.
exceptionWidget
.
show
({
lineNumber
,
column
},
0
);
this
.
exceptionWidget
.
show
({
lineNumber
,
column
},
0
);
}
}
...
...
src/vs/workbench/parts/debug/electron-browser/rawDebugSession.ts
浏览文件 @
27ca195e
...
@@ -323,6 +323,10 @@ export class RawDebugSession extends v8.V8Protocol implements debug.ISession {
...
@@ -323,6 +323,10 @@ export class RawDebugSession extends v8.V8Protocol implements debug.ISession {
return
this
.
send
(
'
stackTrace
'
,
args
);
return
this
.
send
(
'
stackTrace
'
,
args
);
}
}
public
exceptionInfo
(
args
:
DebugProtocol
.
ExceptionInfoArguments
):
TPromise
<
DebugProtocol
.
ExceptionInfoResponse
>
{
return
this
.
send
(
'
exceptionInfo
'
,
args
);
}
public
scopes
(
args
:
DebugProtocol
.
ScopesArguments
):
TPromise
<
DebugProtocol
.
ScopesResponse
>
{
public
scopes
(
args
:
DebugProtocol
.
ScopesArguments
):
TPromise
<
DebugProtocol
.
ScopesResponse
>
{
return
this
.
send
(
'
scopes
'
,
args
);
return
this
.
send
(
'
scopes
'
,
args
);
}
}
...
...
src/vs/workbench/parts/debug/test/common/mockDebug.ts
浏览文件 @
27ca195e
...
@@ -120,6 +120,15 @@ export class MockSession implements debug.ISession {
...
@@ -120,6 +120,15 @@ export class MockSession implements debug.ISession {
});
});
}
}
public
exceptionInfo
(
args
:
DebugProtocol
.
ExceptionInfoArguments
):
TPromise
<
DebugProtocol
.
ExceptionInfoResponse
>
{
return
TPromise
.
as
({
body
:
{
exceptionId
:
'
mockExceptionId
'
,
breakMode
:
'
unhandled
'
}
});
}
public
attach
(
args
:
DebugProtocol
.
AttachRequestArguments
):
TPromise
<
DebugProtocol
.
AttachResponse
>
{
public
attach
(
args
:
DebugProtocol
.
AttachRequestArguments
):
TPromise
<
DebugProtocol
.
AttachResponse
>
{
return
TPromise
.
as
(
null
);
return
TPromise
.
as
(
null
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录