Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
24f2c076
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,发现更多精彩内容 >>
提交
24f2c076
编写于
9月 28, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update HighlightReferences so it can run out of proc.
上级
d6cc9ca1
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
43 addition
and
25 deletion
+43
-25
src/EditorFeatures/Core/Implementation/ReferenceHighlighting/AbstractDocumentHighlightsService.cs
...eferenceHighlighting/AbstractDocumentHighlightsService.cs
+38
-22
src/EditorFeatures/Core/Implementation/ReferenceHighlighting/IDocumentHighlightsService.cs
...ation/ReferenceHighlighting/IDocumentHighlightsService.cs
+5
-3
未找到文件。
src/EditorFeatures/Core/Implementation/ReferenceHighlighting/AbstractDocumentHighlightsService.cs
浏览文件 @
24f2c076
...
...
@@ -18,26 +18,31 @@ namespace Microsoft.CodeAnalysis.Editor.Implementation.ReferenceHighlighting
{
internal
abstract
class
AbstractDocumentHighlightsService
:
IDocumentHighlightsService
{
public
async
Task
<
IEnumerable
<
DocumentHighlights
>>
GetDocumentHighlightsAsync
(
Document
document
,
int
position
,
IEnumerable
<
Document
>
documentsToSearch
,
CancellationToken
cancellationToken
)
public
async
Task
<
ImmutableArray
<
DocumentHighlights
>>
GetDocumentHighlightsAsync
(
Document
document
,
int
position
,
IImmutableSet
<
Document
>
documentsToSearch
,
CancellationToken
cancellationToken
)
{
// use speculative semantic model to see whether we are on a symbol we can do HR
var
span
=
new
TextSpan
(
position
,
0
);
var
solution
=
document
.
Project
.
Solution
;
var
semanticModel
=
await
document
.
GetSemanticModelForSpanAsync
(
span
,
cancellationToken
).
ConfigureAwait
(
false
);
var
symbol
=
await
SymbolFinder
.
FindSymbolAtPositionAsync
(
semanticModel
,
position
,
solution
.
Workspace
,
cancellationToken
).
ConfigureAwait
(
false
);
var
symbol
=
await
SymbolFinder
.
FindSymbolAtPositionAsync
(
semanticModel
,
position
,
solution
.
Workspace
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
symbol
==
null
)
{
return
SpecializedCollections
.
EmptyEnumerable
<
DocumentHighlights
>()
;
return
ImmutableArray
<
DocumentHighlights
>.
Empty
;
}
symbol
=
await
GetSymbolToSearchAsync
(
document
,
position
,
semanticModel
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
);
if
(
symbol
==
null
)
{
return
SpecializedCollections
.
EmptyEnumerable
<
DocumentHighlights
>()
;
return
ImmutableArray
<
DocumentHighlights
>.
Empty
;
}
// Get unique tags for referenced symbols
return
await
GetTagsForReferencedSymbolAsync
(
symbol
,
ImmutableHashSet
.
CreateRange
(
documentsToSearch
),
solution
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
GetTagsForReferencedSymbolAsync
(
new
SymbolAndProjectId
(
symbol
,
document
.
Project
.
Id
),
documentsToSearch
,
solution
,
cancellationToken
).
ConfigureAwait
(
false
);
}
private
async
Task
<
ISymbol
>
GetSymbolToSearchAsync
(
Document
document
,
int
position
,
SemanticModel
semanticModel
,
ISymbol
symbol
,
CancellationToken
cancellationToken
)
...
...
@@ -53,22 +58,28 @@ private async Task<ISymbol> GetSymbolToSearchAsync(Document document, int positi
return
await
SymbolFinder
.
FindSymbolAtPositionAsync
(
currentSemanticModel
,
position
,
document
.
Project
.
Solution
.
Workspace
,
cancellationToken
).
ConfigureAwait
(
false
);
}
private
async
Task
<
I
Enumerable
<
DocumentHighlights
>>
GetTagsForReferencedSymbolAsync
(
ISymbol
symbol
,
private
async
Task
<
I
mmutableArray
<
DocumentHighlights
>>
GetTagsForReferencedSymbolAsync
(
SymbolAndProjectId
symbolAndProjectId
,
IImmutableSet
<
Document
>
documentsToSearch
,
Solution
solution
,
CancellationToken
cancellationToken
)
{
var
symbol
=
symbolAndProjectId
.
Symbol
;
Contract
.
ThrowIfNull
(
symbol
);
if
(
ShouldConsiderSymbol
(
symbol
))
{
var
references
=
await
SymbolFinder
.
FindReferencesAsync
(
symbol
,
solution
,
progress
:
null
,
documents
:
documentsToSearch
,
cancellationToken
:
cancellationToken
).
ConfigureAwait
(
false
);
return
await
FilterAndCreateSpansAsync
(
references
,
solution
,
documentsToSearch
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
);
var
progress
=
new
StreamingProgressCollector
(
StreamingFindReferencesProgress
.
Instance
);
await
SymbolFinder
.
FindReferencesAsync
(
symbolAndProjectId
,
solution
,
progress
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
FilterAndCreateSpansAsync
(
progress
.
GetReferencedSymbols
(),
solution
,
documentsToSearch
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
);
}
return
SpecializedCollections
.
EmptyEnumerable
<
DocumentHighlights
>()
;
return
ImmutableArray
<
DocumentHighlights
>.
Empty
;
}
private
bool
ShouldConsiderSymbol
(
ISymbol
symbol
)
...
...
@@ -95,8 +106,10 @@ private bool ShouldConsiderSymbol(ISymbol symbol)
}
}
private
async
Task
<
IEnumerable
<
DocumentHighlights
>>
FilterAndCreateSpansAsync
(
IEnumerable
<
ReferencedSymbol
>
references
,
Solution
solution
,
IImmutableSet
<
Document
>
documentsToSearch
,
ISymbol
symbol
,
CancellationToken
cancellationToken
)
private
async
Task
<
ImmutableArray
<
DocumentHighlights
>>
FilterAndCreateSpansAsync
(
IEnumerable
<
ReferencedSymbol
>
references
,
Solution
solution
,
IImmutableSet
<
Document
>
documentsToSearch
,
ISymbol
symbol
,
CancellationToken
cancellationToken
)
{
references
=
references
.
FilterToItemsToShow
();
references
=
references
.
FilterNonMatchingMethodNames
(
solution
,
symbol
);
...
...
@@ -114,7 +127,9 @@ private bool ShouldConsiderSymbol(ISymbol symbol)
additionalReferences
.
AddRange
(
await
GetAdditionalReferencesAsync
(
document
,
symbol
,
cancellationToken
).
ConfigureAwait
(
false
));
}
return
await
CreateSpansAsync
(
solution
,
symbol
,
references
,
additionalReferences
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
return
await
CreateSpansAsync
(
solution
,
symbol
,
references
,
additionalReferences
,
documentsToSearch
,
cancellationToken
).
ConfigureAwait
(
false
);
}
private
Task
<
IEnumerable
<
Location
>>
GetAdditionalReferencesAsync
(
...
...
@@ -129,7 +144,7 @@ private bool ShouldConsiderSymbol(ISymbol symbol)
return
Task
.
FromResult
(
SpecializedCollections
.
EmptyEnumerable
<
Location
>());
}
private
async
Task
<
I
Enumerable
<
DocumentHighlights
>>
CreateSpansAsync
(
private
async
Task
<
I
mmutableArray
<
DocumentHighlights
>>
CreateSpansAsync
(
Solution
solution
,
ISymbol
symbol
,
IEnumerable
<
ReferencedSymbol
>
references
,
...
...
@@ -196,19 +211,19 @@ private bool ShouldConsiderSymbol(ISymbol symbol)
await
AddLocationSpan
(
location
,
solution
,
spanSet
,
tagMap
,
HighlightSpanKind
.
Reference
,
cancellationToken
).
ConfigureAwait
(
false
);
}
var
list
=
new
List
<
DocumentHighlights
>
(
tagMap
.
Count
);
var
list
=
ArrayBuilder
<
DocumentHighlights
>.
GetInstance
(
tagMap
.
Count
);
foreach
(
var
kvp
in
tagMap
)
{
var
spans
=
new
List
<
HighlightSpan
>
(
kvp
.
Value
.
Count
);
var
spans
=
ArrayBuilder
<
HighlightSpan
>.
GetInstance
(
kvp
.
Value
.
Count
);
foreach
(
var
span
in
kvp
.
Value
)
{
spans
.
Add
(
span
);
}
list
.
Add
(
new
DocumentHighlights
(
kvp
.
Key
,
spans
));
list
.
Add
(
new
DocumentHighlights
(
kvp
.
Key
,
spans
.
ToImmutableAndFree
()
));
}
return
list
;
return
list
.
ToImmutableAndFree
()
;
}
private
static
bool
ShouldIncludeDefinition
(
ISymbol
symbol
)
...
...
@@ -247,7 +262,8 @@ private async Task AddLocationSpan(Location location, Solution solution, HashSet
}
}
private
async
Task
<
ValueTuple
<
Document
,
TextSpan
>?>
GetLocationSpanAsync
(
Solution
solution
,
Location
location
,
CancellationToken
cancellationToken
)
private
async
Task
<
ValueTuple
<
Document
,
TextSpan
>?>
GetLocationSpanAsync
(
Solution
solution
,
Location
location
,
CancellationToken
cancellationToken
)
{
try
{
...
...
@@ -284,4 +300,4 @@ private async Task AddLocationSpan(Location location, Solution solution, HashSet
return
null
;
}
}
}
}
\ No newline at end of file
src/EditorFeatures/Core/Implementation/ReferenceHighlighting/IDocumentHighlightsService.cs
浏览文件 @
24f2c076
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System.Collections.Generic
;
using
System.Collections.Immutable
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Host
;
...
...
@@ -31,9 +32,9 @@ public HighlightSpan(TextSpan textSpan, HighlightSpanKind kind) : this()
internal
struct
DocumentHighlights
{
public
Document
Document
{
get
;
}
public
I
List
<
HighlightSpan
>
HighlightSpans
{
get
;
}
public
I
mmutableArray
<
HighlightSpan
>
HighlightSpans
{
get
;
}
public
DocumentHighlights
(
Document
document
,
I
List
<
HighlightSpan
>
highlightSpans
)
:
this
(
)
public
DocumentHighlights
(
Document
document
,
I
mmutableArray
<
HighlightSpan
>
highlightSpans
)
{
this
.
Document
=
document
;
this
.
HighlightSpans
=
highlightSpans
;
...
...
@@ -42,6 +43,7 @@ public DocumentHighlights(Document document, IList<HighlightSpan> highlightSpans
internal
interface
IDocumentHighlightsService
:
ILanguageService
{
Task
<
IEnumerable
<
DocumentHighlights
>>
GetDocumentHighlightsAsync
(
Document
document
,
int
position
,
IEnumerable
<
Document
>
documentsToSearch
,
CancellationToken
cancellationToken
);
Task
<
ImmutableArray
<
DocumentHighlights
>>
GetDocumentHighlightsAsync
(
Document
document
,
int
position
,
IImmutableSet
<
Document
>
documentsToSearch
,
CancellationToken
cancellationToken
);
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录