Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
c8e55761
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,发现更多精彩内容 >>
提交
c8e55761
编写于
5月 14, 2018
作者:
P
Peng Lyu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
focus on comment and highlight
上级
4cd0afff
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
28 addition
and
4 deletion
+28
-4
src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
...ch/parts/comments/electron-browser/commentThreadWidget.ts
+13
-3
src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
...s/comments/electron-browser/commentsEditorContribution.ts
+15
-1
未找到文件。
src/vs/workbench/parts/comments/electron-browser/commentThreadWidget.ts
浏览文件 @
c8e55761
...
...
@@ -41,6 +41,7 @@ export class CommentNode {
private
_domNode
:
HTMLElement
;
private
_body
:
HTMLElement
;
private
_md
:
HTMLElement
;
private
_clearTimeout
:
any
;
public
get
domNode
():
HTMLElement
{
return
this
.
_domNode
;
}
...
...
@@ -57,6 +58,8 @@ export class CommentNode {
this
.
_body
=
$
(
'
comment-body
'
).
appendTo
(
commentDetailsContainer
).
getHTMLElement
();
this
.
_md
=
renderMarkdown
(
comment
.
body
);
this
.
_body
.
appendChild
(
this
.
_md
);
this
.
_clearTimeout
=
null
;
}
update
(
newComment
:
modes
.
Comment
)
{
...
...
@@ -68,6 +71,15 @@ export class CommentNode {
this
.
comment
=
newComment
;
}
focus
()
{
if
(
!
this
.
_clearTimeout
)
{
dom
.
addClass
(
this
.
domNode
,
'
focus
'
);
this
.
_clearTimeout
=
setTimeout
(()
=>
{
dom
.
removeClass
(
this
.
domNode
,
'
focus
'
);
},
3000
);
}
}
}
let
INMEM_MODEL_ID
=
0
;
...
...
@@ -81,7 +93,6 @@ export class ReviewZoneWidget extends ZoneWidget {
private
_commentEditor
:
ICodeEditor
;
private
_commentsElement
:
HTMLElement
;
private
_commentElements
:
CommentNode
[];
private
_focusedCommentElement
:
CommentNode
;
private
_resizeObserver
:
any
;
private
_onDidClose
=
new
Emitter
<
ReviewZoneWidget
>
();
private
_isCollapsed
;
...
...
@@ -151,9 +162,9 @@ export class ReviewZoneWidget extends ZoneWidget {
if
(
matchedNode
&&
matchedNode
.
length
)
{
const
commentThreadCoords
=
dom
.
getDomNodePagePosition
(
this
.
_commentElements
[
0
].
domNode
);
const
commentCoords
=
dom
.
getDomNodePagePosition
(
matchedNode
[
0
].
domNode
);
this
.
_focusedCommentElement
=
matchedNode
[
0
];
this
.
editor
.
setScrollTop
(
this
.
editor
.
getTopForLineNumber
(
this
.
_commentThread
.
range
.
startLineNumber
)
-
height
/
2
+
commentCoords
.
top
-
commentThreadCoords
.
top
);
matchedNode
[
0
].
focus
();
return
;
}
}
...
...
@@ -292,7 +303,6 @@ export class ReviewZoneWidget extends ZoneWidget {
this
.
_commentsElement
=
$
(
'
div.comments-container
'
).
appendTo
(
this
.
_bodyElement
).
getHTMLElement
();
this
.
_commentElements
=
[];
this
.
_focusedCommentElement
=
null
;
for
(
let
i
=
0
;
i
<
this
.
_commentThread
.
comments
.
length
;
i
++
)
{
let
newCommentNode
=
new
CommentNode
(
this
.
_commentThread
.
comments
[
i
]);
this
.
_commentElements
.
push
(
newCommentNode
);
...
...
src/vs/workbench/parts/comments/electron-browser/commentsEditorContribution.ts
浏览文件 @
c8e55761
...
...
@@ -16,7 +16,7 @@ import { IEditorContribution } from 'vs/editor/common/editorCommon';
import
{
IModelDeltaDecoration
,
TrackedRangeStickiness
}
from
'
vs/editor/common/model
'
;
import
{
ModelDecorationOptions
}
from
'
vs/editor/common/model/textModel
'
;
import
*
as
modes
from
'
vs/editor/common/modes
'
;
import
{
peekViewEditorBackground
,
peekViewResultsBackground
}
from
'
vs/editor/contrib/referenceSearch/referencesWidget
'
;
import
{
peekViewEditorBackground
,
peekViewResultsBackground
,
peekViewResultsSelectionBackground
}
from
'
vs/editor/contrib/referenceSearch/referencesWidget
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
{
ICommandService
}
from
'
vs/platform/commands/common/commands
'
;
import
{
IContextKey
,
IContextKeyService
,
RawContextKey
}
from
'
vs/platform/contextkey/common/contextkey
'
;
...
...
@@ -443,4 +443,18 @@ registerThemingParticipant((theme, collector) => {
`}`
);
}
let
selectionBackground
=
theme
.
getColor
(
peekViewResultsSelectionBackground
);
if
(
selectionBackground
)
{
collector
.
addRule
(
`@keyframes monaco-review-widget-focus {`
+
` 0% { background:
${
selectionBackground
}
; }`
+
` 100% { background: transparent; }`
+
`}`
+
`.monaco-editor .review-widget .body .review-comment.focus {`
+
` animation: monaco-review-widget-focus 3s ease 0s;`
+
`}`
);
}
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录