Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
6437112f
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,发现更多精彩内容 >>
提交
6437112f
编写于
2月 01, 2016
作者:
I
isidor
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
debug: respect supportsEvaluateForHovers capability
fixes #2012
上级
d12d295c
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
38 addition
and
23 deletion
+38
-23
src/vs/workbench/parts/debug/browser/debugHover.ts
src/vs/workbench/parts/debug/browser/debugHover.ts
+37
-23
src/vs/workbench/parts/debug/common/debug.ts
src/vs/workbench/parts/debug/common/debug.ts
+1
-0
未找到文件。
src/vs/workbench/parts/debug/browser/debugHover.ts
浏览文件 @
6437112f
...
...
@@ -3,6 +3,7 @@
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import
{
TPromise
}
from
'
vs/base/common/winjs.base
'
;
import
errors
=
require
(
'
vs/base/common/errors
'
);
import
dom
=
require
(
'
vs/base/browser/dom
'
);
import
*
as
nls
from
'
vs/nls
'
;
...
...
@@ -13,6 +14,7 @@ import editorbrowser = require('vs/editor/browser/editorBrowser');
import
editorcommon
=
require
(
'
vs/editor/common/editorCommon
'
);
import
{
IInstantiationService
}
from
'
vs/platform/instantiation/common/instantiation
'
;
import
debug
=
require
(
'
vs/workbench/parts/debug/common/debug
'
);
import
{
evaluateExpression
,
Expression
}
from
'
vs/workbench/parts/debug/common/debugModel
'
;
import
viewer
=
require
(
'
vs/workbench/parts/debug/browser/debugViewer
'
);
const
$
=
dom
.
emmet
;
...
...
@@ -88,9 +90,40 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
.
split
(
'
.
'
).
map
(
word
=>
word
.
trim
()).
filter
(
word
=>
!!
word
);
namesToFind
.
push
(
hoveringOver
);
namesToFind
[
0
]
=
namesToFind
[
0
].
substring
(
namesToFind
[
0
].
lastIndexOf
(
'
'
)
+
1
);
const
variables
:
debug
.
IExpression
[]
=
[];
focusedStackFrame
.
getScopes
(
this
.
debugService
).
done
(
scopes
=>
{
this
.
getExpression
(
namesToFind
).
done
(
expression
=>
{
if
(
!
expression
)
{
this
.
hide
();
return
;
}
// show it
this
.
highlightDecorations
=
this
.
editor
.
deltaDecorations
(
this
.
highlightDecorations
,
[{
range
:
{
startLineNumber
:
pos
.
lineNumber
,
endLineNumber
:
pos
.
lineNumber
,
startColumn
:
wordAtPosition
.
startColumn
,
endColumn
:
wordAtPosition
.
endColumn
},
options
:
{
className
:
'
hoverHighlight
'
}
}]);
this
.
lastHoveringOver
=
hoveringOver
;
this
.
doShow
(
pos
,
expression
);
},
errors
.
onUnexpectedError
);
}
private
getExpression
(
namesToFind
:
string
[]):
TPromise
<
debug
.
IExpression
>
{
const
session
=
this
.
debugService
.
getActiveSession
();
const
focusedStackFrame
=
this
.
debugService
.
getViewModel
().
getFocusedStackFrame
();
if
(
session
.
capablities
.
supportsEvaluateForHovers
)
{
return
evaluateExpression
(
session
,
focusedStackFrame
,
new
Expression
(
namesToFind
.
join
(
'
.
'
),
true
),
'
hover
'
);
}
const
variables
:
debug
.
IExpression
[]
=
[];
return
focusedStackFrame
.
getScopes
(
this
.
debugService
).
then
(
scopes
=>
{
// flatten out scopes lists
return
scopes
.
reduce
((
accum
,
scopes
)
=>
{
return
accum
.
concat
(
scopes
);
},
[])
...
...
@@ -116,28 +149,9 @@ export class DebugHoverWidget implements editorbrowser.IContentWidget {
}
}
},
errors
.
onUnexpectedError
));
},
errors
.
onUnexpectedError
);
// don't show if there are duplicates across scopes
if
(
variables
.
length
!==
1
)
{
this
.
hide
();
return
;
}
// show it
this
.
highlightDecorations
=
this
.
editor
.
deltaDecorations
(
this
.
highlightDecorations
,
[{
range
:
{
startLineNumber
:
pos
.
lineNumber
,
endLineNumber
:
pos
.
lineNumber
,
startColumn
:
wordAtPosition
.
startColumn
,
endColumn
:
wordAtPosition
.
endColumn
},
options
:
{
className
:
'
hoverHighlight
'
}
}]);
this
.
lastHoveringOver
=
hoveringOver
;
this
.
doShow
(
pos
,
variables
[
0
]);
// only show if there are no duplicates across scopes
}).
then
(()
=>
variables
.
length
===
1
?
TPromise
.
as
(
variables
[
0
])
:
TPromise
.
as
(
null
));
}
private
doShow
(
position
:
editorcommon
.
IEditorPosition
,
expression
:
debug
.
IExpression
,
forceValueHover
=
false
):
void
{
...
...
src/vs/workbench/parts/debug/common/debug.ts
浏览文件 @
6437112f
...
...
@@ -199,6 +199,7 @@ export interface IRawAdapter extends IRawEnvAdapter {
export
interface
IRawDebugSession
extends
ee
.
EventEmitter
{
getType
():
string
;
isAttach
:
boolean
;
capablities
:
DebugProtocol
.
Capabilites
;
disconnect
(
restart
?:
boolean
,
force
?:
boolean
):
TPromise
<
DebugProtocol
.
DisconnectResponse
>
;
next
(
args
:
DebugProtocol
.
NextArguments
):
TPromise
<
DebugProtocol
.
NextResponse
>
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录