Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
d669936d
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,发现更多精彩内容 >>
提交
d669936d
编写于
11月 22, 2018
作者:
J
Johannes Rieken
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
use editor mouse listener instead of multiple listeners #63467
上级
2448fa4d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
27 addition
and
34 deletion
+27
-34
src/vs/editor/contrib/codelens/codelensController.ts
src/vs/editor/contrib/codelens/codelensController.ts
+13
-2
src/vs/editor/contrib/codelens/codelensWidget.ts
src/vs/editor/contrib/codelens/codelensWidget.ts
+14
-32
未找到文件。
src/vs/editor/contrib/codelens/codelensController.ts
浏览文件 @
d669936d
...
...
@@ -186,6 +186,17 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
}
}
}));
this
.
_localToDispose
.
push
(
this
.
_editor
.
onMouseUp
(
e
=>
{
if
(
e
.
target
.
type
===
editorBrowser
.
MouseTargetType
.
CONTENT_WIDGET
&&
e
.
target
.
element
.
tagName
===
'
A
'
)
{
for
(
const
lens
of
this
.
_lenses
)
{
let
command
=
lens
.
getCommand
(
e
.
target
.
element
as
HTMLLinkElement
);
if
(
command
)
{
this
.
_commandService
.
executeCommand
(
command
.
id
,
...
command
.
arguments
).
catch
(
err
=>
this
.
_notificationService
.
error
(
err
));
break
;
}
}
}
}));
scheduler
.
schedule
();
}
...
...
@@ -242,7 +253,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
groupsIndex
++
;
codeLensIndex
++
;
}
else
{
this
.
_lenses
.
splice
(
codeLensIndex
,
0
,
new
CodeLens
(
groups
[
groupsIndex
],
this
.
_editor
,
helper
,
accessor
,
this
.
_commandService
,
this
.
_notificationService
,
()
=>
this
.
_detectVisibleLenses
.
schedule
()));
this
.
_lenses
.
splice
(
codeLensIndex
,
0
,
new
CodeLens
(
groups
[
groupsIndex
],
this
.
_editor
,
helper
,
accessor
,
()
=>
this
.
_detectVisibleLenses
.
schedule
()));
codeLensIndex
++
;
groupsIndex
++
;
}
...
...
@@ -256,7 +267,7 @@ export class CodeLensContribution implements editorCommon.IEditorContribution {
// Create extra symbols
while
(
groupsIndex
<
groups
.
length
)
{
this
.
_lenses
.
push
(
new
CodeLens
(
groups
[
groupsIndex
],
this
.
_editor
,
helper
,
accessor
,
this
.
_commandService
,
this
.
_notificationService
,
()
=>
this
.
_detectVisibleLenses
.
schedule
()));
this
.
_lenses
.
push
(
new
CodeLens
(
groups
[
groupsIndex
],
this
.
_editor
,
helper
,
accessor
,
()
=>
this
.
_detectVisibleLenses
.
schedule
()));
groupsIndex
++
;
}
...
...
src/vs/editor/contrib/codelens/codelensWidget.ts
浏览文件 @
d669936d
...
...
@@ -6,7 +6,6 @@
import
'
vs/css!./codelensWidget
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
coalesce
,
isFalsyOrEmpty
}
from
'
vs/base/common/arrays
'
;
import
{
IDisposable
}
from
'
vs/base/common/lifecycle
'
;
import
{
escape
,
format
}
from
'
vs/base/common/strings
'
;
import
*
as
editorBrowser
from
'
vs/editor/browser/editorBrowser
'
;
import
{
Range
}
from
'
vs/editor/common/core/range
'
;
...
...
@@ -15,8 +14,6 @@ import { ModelDecorationOptions } from 'vs/editor/common/model/textModel';
import
{
Command
,
ICodeLensSymbol
}
from
'
vs/editor/common/modes
'
;
import
{
editorCodeLensForeground
}
from
'
vs/editor/common/view/editorColorRegistry
'
;
import
{
ICodeLensData
}
from
'
vs/editor/contrib/codelens/codelens
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
INotificationService
}
from
'
vs/platform/notification/common/notification
'
;
import
{
editorActiveLinkForeground
}
from
'
vs/platform/theme/common/colorRegistry
'
;
import
{
registerThemingParticipant
}
from
'
vs/platform/theme/common/themeService
'
;
...
...
@@ -60,7 +57,6 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
private
readonly
_id
:
string
;
private
readonly
_domNode
:
HTMLElement
;
private
readonly
_disposable
:
IDisposable
;
private
readonly
_editor
:
editorBrowser
.
ICodeEditor
;
private
_widgetPosition
:
editorBrowser
.
IContentWidgetPosition
;
...
...
@@ -68,11 +64,8 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
constructor
(
editor
:
editorBrowser
.
ICodeEditor
,
symbolRange
:
Range
,
commandService
:
ICommandService
,
notificationService
:
INotificationService
symbolRange
:
Range
)
{
this
.
_id
=
'
codeLensWidget
'
+
(
++
CodeLensContentWidget
.
_idPool
);
this
.
_editor
=
editor
;
...
...
@@ -83,27 +76,9 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
dom
.
addClass
(
this
.
_domNode
,
'
codelens-decoration
'
);
dom
.
addClass
(
this
.
_domNode
,
'
invisible-cl
'
);
this
.
updateHeight
();
this
.
_disposable
=
dom
.
addDisposableListener
(
this
.
_domNode
,
'
click
'
,
e
=>
{
let
element
=
<
HTMLElement
>
e
.
target
;
if
(
element
.
tagName
===
'
A
'
&&
element
.
id
)
{
let
command
=
this
.
_commands
[
element
.
id
];
if
(
command
)
{
editor
.
focus
();
commandService
.
executeCommand
(
command
.
id
,
...
command
.
arguments
).
then
(
undefined
,
err
=>
{
notificationService
.
error
(
err
);
});
}
}
});
this
.
updateVisibility
();
}
dispose
():
void
{
this
.
_disposable
.
dispose
();
}
updateHeight
():
void
{
const
{
fontInfo
,
lineHeight
}
=
this
.
_editor
.
getConfiguration
();
this
.
_domNode
.
style
.
height
=
`
${
Math
.
round
(
lineHeight
*
1.1
)}
px`
;
...
...
@@ -146,6 +121,12 @@ class CodeLensContentWidget implements editorBrowser.IContentWidget {
this
.
_editor
.
layoutContentWidget
(
this
);
}
getCommand
(
link
:
HTMLLinkElement
):
Command
|
undefined
{
return
link
.
parentElement
===
this
.
_domNode
?
this
.
_commands
[
link
.
id
]
:
undefined
;
}
getId
():
string
{
return
this
.
_id
;
}
...
...
@@ -219,8 +200,7 @@ export class CodeLens {
editor
:
editorBrowser
.
ICodeEditor
,
helper
:
CodeLensHelper
,
viewZoneChangeAccessor
:
editorBrowser
.
IViewZoneChangeAccessor
,
commandService
:
ICommandService
,
notificationService
:
INotificationService
,
updateCallabck
:
Function
updateCallback
:
Function
)
{
this
.
_editor
=
editor
;
this
.
_data
=
data
;
...
...
@@ -242,8 +222,8 @@ export class CodeLens {
}
});
this
.
_contentWidget
=
new
CodeLensContentWidget
(
editor
,
range
,
commandService
,
notificationService
);
this
.
_viewZone
=
new
CodeLensViewZone
(
range
.
startLineNumber
-
1
,
updateCall
ab
ck
);
this
.
_contentWidget
=
new
CodeLensContentWidget
(
editor
,
range
);
this
.
_viewZone
=
new
CodeLensViewZone
(
range
.
startLineNumber
-
1
,
updateCall
ba
ck
);
this
.
_viewZoneId
=
viewZoneChangeAccessor
.
addZone
(
this
.
_viewZone
);
this
.
_editor
.
addContentWidget
(
this
.
_contentWidget
);
...
...
@@ -257,8 +237,6 @@ export class CodeLens {
viewZoneChangeAccessor
.
removeZone
(
this
.
_viewZoneId
);
}
this
.
_editor
.
removeContentWidget
(
this
.
_contentWidget
);
this
.
_contentWidget
.
dispose
();
}
isValid
():
boolean
{
...
...
@@ -304,6 +282,10 @@ export class CodeLens {
this
.
_contentWidget
.
updateHeight
();
}
getCommand
(
link
:
HTMLLinkElement
):
Command
|
undefined
{
return
this
.
_contentWidget
.
getCommand
(
link
);
}
getLineNumber
():
number
{
const
range
=
this
.
_editor
.
getModel
().
getDecorationRange
(
this
.
_decorationIds
[
0
]);
if
(
range
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录