Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
4ad275b7
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,发现更多精彩内容 >>
提交
4ad275b7
编写于
5月 29, 2017
作者:
C
CyrusNajmabadi
提交者:
GitHub
5月 29, 2017
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19851 from CyrusNajmabadi/addImportRefactoring
Simplify metadata reference searching in Add-Import.
上级
fe98ddab
e54a8ea4
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
29 addition
and
21 deletion
+29
-21
src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
...re/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
+29
-21
未找到文件。
src/Features/Core/Portable/AddImport/AbstractAddImportCodeFixProvider.cs
浏览文件 @
4ad275b7
...
...
@@ -19,7 +19,7 @@
namespace
Microsoft.CodeAnalysis.CodeFixes.AddImport
{
internal
abstract
partial
class
AbstractAddImportCodeFixProvider
<
TSimpleNameSyntax
>
:
CodeFixProvider
,
IEqualityComparer
<
(
ProjectId
,
PortableExecutableReference
)
>
:
CodeFixProvider
,
IEqualityComparer
<
PortableExecutableReference
>
where
TSimpleNameSyntax
:
SyntaxNode
{
private
const
int
MaxResults
=
3
;
...
...
@@ -250,8 +250,8 @@ private static bool IsHostOrTestWorkspace(Project project)
// Keep track of the references we've seen (so that we don't process them multiple times
// across many sibling projects). Prepopulate it with our own metadata references since
// we know we don't need to search in that.
var
seenReferences
=
new
HashSet
<
(
ProjectId
,
PortableExecutableReference
)
>(
comparer
:
this
);
seenReferences
.
AddAll
(
project
.
MetadataReferences
.
OfType
<
PortableExecutableReference
>()
.
Select
(
r
=>
(
project
.
Id
,
r
))
);
var
seenReferences
=
new
HashSet
<
PortableExecutableReference
>(
comparer
:
this
);
seenReferences
.
AddAll
(
project
.
MetadataReferences
.
OfType
<
PortableExecutableReference
>());
var
newReferences
=
GetUnreferencedMetadataReferences
(
project
,
seenReferences
);
...
...
@@ -288,15 +288,30 @@ private static bool IsHostOrTestWorkspace(Project project)
/// for the project we found the pe-reference in.
/// </summary>
private
ImmutableArray
<(
ProjectId
,
PortableExecutableReference
)>
GetUnreferencedMetadataReferences
(
Project
project
,
HashSet
<
(
ProjectId
,
PortableExecutableReference
)
>
seenReferences
)
Project
project
,
HashSet
<
PortableExecutableReference
>
seenReferences
)
{
var
result
=
ArrayBuilder
<(
ProjectId
,
PortableExecutableReference
)>.
GetInstance
();
var
solution
=
project
.
Solution
;
return
solution
.
Projects
.
Where
(
p
=>
p
!=
project
)
.
SelectMany
(
p
=>
p
.
MetadataReferences
.
OfType
<
PortableExecutableReference
>().
Select
(
pe
=>
(
p
.
Id
,
reference
:
pe
)))
.
Distinct
(
comparer
:
this
)
.
Where
(
t
=>
!
seenReferences
.
Contains
(
t
))
.
Where
(
t
=>
!
IsInPackagesDirectory
(
t
.
Item2
))
.
ToImmutableArray
();
foreach
(
var
p
in
solution
.
Projects
)
{
if
(
p
==
project
)
{
continue
;
}
foreach
(
var
reference
in
p
.
MetadataReferences
)
{
if
(
reference
is
PortableExecutableReference
peReference
&&
!
IsInPackagesDirectory
(
peReference
)
&&
seenReferences
.
Add
(
peReference
))
{
result
.
Add
((
p
.
Id
,
peReference
));
}
}
}
return
result
.
ToImmutableAndFree
();
}
private
async
Task
WaitForTasksAsync
(
...
...
@@ -378,18 +393,11 @@ private Compilation CreateCompilation(Project project, PortableExecutableReferen
}
bool
IEqualityComparer
<(
ProjectId
,
PortableExecutableReference
)>.
Equals
(
(
ProjectId
,
PortableExecutableReference
)
x
,
(
ProjectId
,
PortableExecutableReference
)
y
)
{
return
StringComparer
.
OrdinalIgnoreCase
.
Equals
(
x
.
Item2
.
FilePath
??
x
.
Item2
.
Display
,
y
.
Item2
.
FilePath
??
y
.
Item2
.
Display
);
}
bool
IEqualityComparer
<
PortableExecutableReference
>.
Equals
(
PortableExecutableReference
x
,
PortableExecutableReference
y
)
=>
StringComparer
.
OrdinalIgnoreCase
.
Equals
(
x
.
FilePath
??
x
.
Display
,
y
.
FilePath
??
y
.
Display
);
int
IEqualityComparer
<(
ProjectId
,
PortableExecutableReference
)>.
GetHashCode
((
ProjectId
,
PortableExecutableReference
)
obj
)
{
return
StringComparer
.
OrdinalIgnoreCase
.
GetHashCode
(
obj
.
Item2
.
FilePath
??
obj
.
Item2
.
Display
);
}
int
IEqualityComparer
<
PortableExecutableReference
>.
GetHashCode
(
PortableExecutableReference
obj
)
=>
StringComparer
.
OrdinalIgnoreCase
.
GetHashCode
(
obj
.
FilePath
??
obj
.
Display
);
private
static
HashSet
<
Project
>
GetViableUnreferencedProjects
(
Project
project
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录