Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
e32ef2d2
R
roslyn
项目概览
lwm1986
/
roslyn
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roslyn
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
e32ef2d2
编写于
5月 30, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix crash in DocHighlights when delegating to a different language.
上级
8d1d7ae2
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
19 addition
and
10 deletion
+19
-10
src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs
...DocumentHighlighting/AbstractDocumentHighlightsService.cs
+19
-10
未找到文件。
src/Features/Core/Portable/DocumentHighlighting/AbstractDocumentHighlightsService.cs
浏览文件 @
e32ef2d2
...
...
@@ -76,8 +76,8 @@ internal abstract partial class AbstractDocumentHighlightsService : IDocumentHig
// Get unique tags for referenced symbols
return
await
GetTagsForReferencedSymbolAsync
(
new
SymbolAndProjectId
(
symbol
,
document
.
Project
.
Id
),
documentsToSearch
,
solution
,
cancellationToken
).
ConfigureAwait
(
false
);
new
SymbolAndProjectId
(
symbol
,
document
.
Project
.
Id
),
document
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
}
private
static
async
Task
<
ISymbol
>
GetSymbolToSearchAsync
(
Document
document
,
int
position
,
SemanticModel
semanticModel
,
ISymbol
symbol
,
CancellationToken
cancellationToken
)
...
...
@@ -95,8 +95,8 @@ private static async Task<ISymbol> GetSymbolToSearchAsync(Document document, int
private
async
Task
<
ImmutableArray
<
DocumentHighlights
>>
GetTagsForReferencedSymbolAsync
(
SymbolAndProjectId
symbolAndProjectId
,
Document
document
,
IImmutableSet
<
Document
>
documentsToSearch
,
Solution
solution
,
CancellationToken
cancellationToken
)
{
var
symbol
=
symbolAndProjectId
.
Symbol
;
...
...
@@ -106,11 +106,11 @@ private static async Task<ISymbol> GetSymbolToSearchAsync(Document document, int
var
progress
=
new
StreamingProgressCollector
(
StreamingFindReferencesProgress
.
Instance
);
await
SymbolFinder
.
FindReferencesAsync
(
symbolAndProjectId
,
s
olution
,
progress
,
symbolAndProjectId
,
document
.
Project
.
S
olution
,
progress
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
FilterAndCreateSpansAsync
(
progress
.
GetReferencedSymbols
(),
solution
,
documentsToSearch
,
progress
.
GetReferencedSymbols
(),
document
,
documentsToSearch
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
@@ -142,10 +142,12 @@ private static bool ShouldConsiderSymbol(ISymbol symbol)
}
private
async
Task
<
ImmutableArray
<
DocumentHighlights
>>
FilterAndCreateSpansAsync
(
IEnumerable
<
ReferencedSymbol
>
references
,
Solution
solution
,
IImmutableSet
<
Document
>
documentsToSearch
,
ISymbol
symbol
,
IEnumerable
<
ReferencedSymbol
>
references
,
Document
document
,
IImmutableSet
<
Document
>
documentsToSearch
,
ISymbol
symbol
,
CancellationToken
cancellationToken
)
{
var
solution
=
document
.
Project
.
Solution
;
references
=
references
.
FilterToItemsToShow
();
references
=
references
.
FilterNonMatchingMethodNames
(
solution
,
symbol
);
references
=
references
.
FilterToAliasMatches
(
symbol
as
IAliasSymbol
);
...
...
@@ -157,13 +159,20 @@ private static bool ShouldConsiderSymbol(ISymbol symbol)
var
additionalReferences
=
new
List
<
Location
>();
foreach
(
var
d
ocument
in
documentsToSearch
)
foreach
(
var
additionalD
ocument
in
documentsToSearch
)
{
additionalReferences
.
AddRange
(
await
GetAdditionalReferencesAsync
(
document
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
));
// 'documentsToSearch' may contain documents from languages other than our own
// (for example cshtml files when we're searching the cs document). Since we're
// delegating to a virtual method for this language type, we have to make sure
// we only process the document if it's also our language.
if
(
additionalDocument
.
Project
.
Language
==
document
.
Project
.
Language
)
{
additionalReferences
.
AddRange
(
await
GetAdditionalReferencesAsync
(
document
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
));
}
}
return
await
CreateSpansAsync
(
solution
,
symbol
,
references
,
additionalReferences
,
solution
,
symbol
,
references
,
additionalReferences
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录