Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
f83a748a
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,发现更多精彩内容 >>
提交
f83a748a
编写于
6月 13, 2018
作者:
R
rebornix
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
show comments in diff view sidebyside.
上级
7e31284d
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
36 addition
and
16 deletion
+36
-16
src/vs/code/electron-main/window.ts
src/vs/code/electron-main/window.ts
+2
-1
src/vs/workbench/api/electron-browser/mainThreadComments.ts
src/vs/workbench/api/electron-browser/mainThreadComments.ts
+34
-15
未找到文件。
src/vs/code/electron-main/window.ts
浏览文件 @
f83a748a
...
...
@@ -141,7 +141,8 @@ export class CodeWindow implements ICodeWindow {
title
:
product
.
nameLong
,
webPreferences
:
{
'
backgroundThrottling
'
:
false
,
// by default if Code is in the background, intervals and timeouts get throttled,
disableBlinkFeatures
:
'
Auxclick
'
// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
disableBlinkFeatures
:
'
Auxclick
'
,
// disable auxclick events (see https://developers.google.com/web/updates/2016/10/auxclick)
experimentalFeatures
:
true
}
};
...
...
src/vs/workbench/api/electron-browser/mainThreadComments.ts
浏览文件 @
f83a748a
...
...
@@ -5,7 +5,7 @@
'
use strict
'
;
import
{
Disposable
,
IDisposable
,
dispose
}
from
'
vs/base/common/lifecycle
'
;
import
{
ICodeEditor
,
getCode
Editor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditor
,
isCodeEditor
,
isDiffEditor
,
getCodeEditor
,
IDiff
Editor
}
from
'
vs/editor/browser/editorBrowser
'
;
import
{
ICodeEditorService
}
from
'
vs/editor/browser/services/codeEditorService
'
;
import
*
as
modes
from
'
vs/editor/common/modes
'
;
import
{
extHostNamedCustomer
}
from
'
vs/workbench/api/electron-browser/extHostCustomers
'
;
...
...
@@ -37,23 +37,25 @@ export class MainThreadComments extends Disposable implements MainThreadComments
this
.
_disposables
=
[];
this
.
_proxy
=
extHostContext
.
getProxy
(
ExtHostContext
.
ExtHostComments
);
this
.
_disposables
.
push
(
this
.
_editorService
.
onDidActiveEditorChange
(
e
=>
{
const
outerEditor
=
this
.
getFocusedEditor
();
if
(
!
outerEditor
)
{
const
editors
=
this
.
getFocusedEditors
();
if
(
!
editors
||
!
editors
.
length
)
{
return
;
}
const
controller
=
ReviewController
.
get
(
outerEditor
);
if
(
!
controller
)
{
return
;
}
editors
.
forEach
(
editor
=>
{
const
controller
=
ReviewController
.
get
(
editor
);
if
(
!
controller
)
{
return
;
}
if
(
!
outerE
ditor
.
getModel
())
{
return
;
}
if
(
!
e
ditor
.
getModel
())
{
return
;
}
const
outerEditorURI
=
outerEditor
.
getModel
().
uri
;
this
.
provideDocumentComments
(
outerEditorURI
).
then
(
commentInfos
=>
{
this
.
_commentService
.
setDocumentComments
(
outerEditorURI
,
commentInfos
.
filter
(
info
=>
info
!==
null
));
const
outerEditorURI
=
editor
.
getModel
().
uri
;
this
.
provideDocumentComments
(
outerEditorURI
).
then
(
commentInfos
=>
{
this
.
_commentService
.
setDocumentComments
(
outerEditorURI
,
commentInfos
.
filter
(
info
=>
info
!==
null
));
});
});
}));
}
...
...
@@ -115,8 +117,25 @@ export class MainThreadComments extends Disposable implements MainThreadComments
this
.
_documentProviders
.
clear
();
}
getFocusedEditor
():
ICodeEditor
{
return
this
.
_codeEditorService
.
getFocusedCodeEditor
()
||
getCodeEditor
(
this
.
_editorService
.
activeControl
);
getFocusedEditors
():
ICodeEditor
[]
{
let
activeControl
=
this
.
_editorService
.
activeControl
;
if
(
activeControl
)
{
if
(
isCodeEditor
(
activeControl
.
getControl
()))
{
return
[
this
.
_editorService
.
activeControl
.
getControl
()
as
ICodeEditor
];
}
if
(
isDiffEditor
(
activeControl
.
getControl
()))
{
let
diffEditor
=
activeControl
.
getControl
()
as
IDiffEditor
;
return
[
diffEditor
.
getOriginalEditor
(),
diffEditor
.
getModifiedEditor
()];
}
}
let
editor
=
this
.
_codeEditorService
.
getFocusedCodeEditor
();
if
(
editor
)
{
return
[
editor
];
}
return
[];
}
async
provideWorkspaceComments
():
Promise
<
modes
.
CommentThread
[]
>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录