Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
vscode
提交
1cc1f166
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,体验更适合开发者的 AI 搜索 >>
提交
1cc1f166
编写于
12月 08, 2020
作者:
R
Rachel Macfarlane
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use uriIdentityService to compare uris, fixes #107779
上级
9ee7e1e8
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
5 addition
and
2 deletion
+5
-2
src/vs/workbench/contrib/comments/browser/commentsView.ts
src/vs/workbench/contrib/comments/browser/commentsView.ts
+5
-2
未找到文件。
src/vs/workbench/contrib/comments/browser/commentsView.ts
浏览文件 @
1cc1f166
...
...
@@ -6,7 +6,7 @@
import
'
vs/css!./media/panel
'
;
import
*
as
nls
from
'
vs/nls
'
;
import
*
as
dom
from
'
vs/base/browser/dom
'
;
import
{
basename
,
isEqual
}
from
'
vs/base/common/resources
'
;
import
{
basename
}
from
'
vs/base/common/resources
'
;
import
{
IAction
,
Action
}
from
'
vs/base/common/actions
'
;
import
{
CollapseAllAction
}
from
'
vs/base/browser/ui/tree/treeDefaults
'
;
import
{
isCodeEditor
}
from
'
vs/editor/browser/editorBrowser
'
;
...
...
@@ -28,6 +28,8 @@ import { IContextMenuService } from 'vs/platform/contextview/browser/contextView
import
{
IKeybindingService
}
from
'
vs/platform/keybinding/common/keybinding
'
;
import
{
IOpenerService
}
from
'
vs/platform/opener/common/opener
'
;
import
{
ITelemetryService
}
from
'
vs/platform/telemetry/common/telemetry
'
;
import
{
IUriIdentityService
}
from
'
vs/workbench/services/uriIdentity/common/uriIdentity
'
;
import
{
UriIdentityService
}
from
'
vs/workbench/services/uriIdentity/common/uriIdentityService
'
;
export
class
CommentsPanel
extends
ViewPane
{
private
treeLabels
!
:
ResourceLabels
;
...
...
@@ -52,6 +54,7 @@ export class CommentsPanel extends ViewPane {
@
IThemeService
themeService
:
IThemeService
,
@
ICommentService
private
readonly
commentService
:
ICommentService
,
@
ITelemetryService
telemetryService
:
ITelemetryService
,
@
IUriIdentityService
private
readonly
uriIdentityService
:
IUriIdentityService
)
{
super
(
options
,
keybindingService
,
contextMenuService
,
configurationService
,
contextKeyService
,
viewDescriptorService
,
instantiationService
,
openerService
,
themeService
,
telemetryService
);
}
...
...
@@ -206,7 +209,7 @@ export class CommentsPanel extends ViewPane {
const
activeEditor
=
this
.
editorService
.
activeEditor
;
let
currentActiveResource
=
activeEditor
?
activeEditor
.
resource
:
undefined
;
if
(
currentActiveResource
&&
isEqual
(
currentActiveResource
,
element
.
r
esource
))
{
if
(
this
.
uriIdentityService
.
extUri
.
isEqual
(
element
.
resource
,
currentActiveR
esource
))
{
const
threadToReveal
=
element
instanceof
ResourceWithCommentThreads
?
element
.
commentThreads
[
0
].
threadId
:
element
.
threadId
;
const
commentToReveal
=
element
instanceof
ResourceWithCommentThreads
?
element
.
commentThreads
[
0
].
comment
.
uniqueIdInThread
:
element
.
comment
.
uniqueIdInThread
;
const
control
=
this
.
editorService
.
activeTextEditorControl
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录