Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
a2b857fa
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,发现更多精彩内容 >>
提交
a2b857fa
编写于
7月 08, 2017
作者:
V
Victor Zaytsev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed #13158.
上级
9aa3c76c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
67 addition
and
4 deletion
+67
-4
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.cs
...tionProviders/ObjectInitializerCompletionProviderTests.cs
+52
-0
src/Workspaces/Core/Portable/Shared/Extensions/ITypeSymbolExtensions.cs
.../Core/Portable/Shared/Extensions/ITypeSymbolExtensions.cs
+15
-4
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.cs
浏览文件 @
a2b857fa
...
...
@@ -701,6 +701,58 @@ static void Main(string[] args)
await
VerifyItemIsAbsentAsync
(
markup
,
"D"
);
}
[
WorkItem
(
13158
,
"https://github.com/dotnet/roslyn/issues/13158"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
CollectionInitializerForInterfaceType1
()
{
var
markup
=
@"
using System.Collections.Generic;
public class Foo
{
public IList<int> Items { get; } = new List<int>();
public int Bar;
}
class Program
{
static void Main(string[] args)
{
var y = new Foo { $$ };
}
}"
;
await
VerifyItemExistsAsync
(
markup
,
"Items"
);
await
VerifyItemExistsAsync
(
markup
,
"Bar"
);
}
[
WorkItem
(
13158
,
"https://github.com/dotnet/roslyn/issues/13158"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
CollectionInitializerForInterfaceType2
()
{
var
markup
=
@"
using System.Collections.Generic;
public interface ICustomCollection<T> : ICollection<T> { }
public class Foo
{
public ICustomCollection<int> Items { get; } = new List<int>();
public int Bar;
}
class Program
{
static void Main(string[] args)
{
var y = new Foo { $$ };
}
}"
;
await
VerifyItemExistsAsync
(
markup
,
"Items"
);
await
VerifyItemExistsAsync
(
markup
,
"Bar"
);
}
[
WorkItem
(
4754
,
"https://github.com/dotnet/roslyn/issues/4754"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
Completion
)]
public
async
Task
CollectionInitializerPatternFromBaseTypeAccessible
()
...
...
src/Workspaces/Core/Portable/Shared/Extensions/ITypeSymbolExtensions.cs
浏览文件 @
a2b857fa
...
...
@@ -639,7 +639,10 @@ public static bool CanSupportCollectionInitializer(this ITypeSymbol typeSymbol,
{
return
typeSymbol
.
AllInterfaces
.
Any
(
i
=>
i
.
SpecialType
==
SpecialType
.
System_Collections_IEnumerable
)
&&
typeSymbol
.
GetAccessibleMembersInThisAndBaseTypes
<
IMethodSymbol
>(
within
??
typeSymbol
).
Where
(
s
=>
s
.
Name
==
WellKnownMemberNames
.
CollectionInitializerAddMethodName
)
typeSymbol
.
GetBaseTypesAndThis
()
.
Union
(
typeSymbol
.
GetOriginalInterfacesAndTheirBaseInterfaces
())
.
SelectAccessibleMembers
<
IMethodSymbol
>(
within
??
typeSymbol
)
.
Where
(
s
=>
s
.
Name
==
WellKnownMemberNames
.
CollectionInitializerAddMethodName
)
.
OfType
<
IMethodSymbol
>()
.
Any
(
m
=>
m
.
Parameters
.
Any
());
}
...
...
@@ -682,9 +685,7 @@ public static INamedTypeSymbol GetDelegateType(this ITypeSymbol typeSymbol, Comp
return
ImmutableArray
<
T
>.
Empty
;
}
var
types
=
containingType
.
GetBaseTypesAndThis
();
return
types
.
SelectMany
(
x
=>
x
.
GetMembers
().
OfType
<
T
>().
Where
(
m
=>
m
.
IsAccessibleWithin
(
within
)))
.
ToImmutableArray
();
return
containingType
.
GetBaseTypesAndThis
().
SelectAccessibleMembers
<
T
>(
within
).
ToImmutableArray
();
}
public
static
bool
?
AreMoreSpecificThan
(
this
IList
<
ITypeSymbol
>
t1
,
IList
<
ITypeSymbol
>
t2
)
...
...
@@ -722,6 +723,16 @@ public static INamedTypeSymbol GetDelegateType(this ITypeSymbol typeSymbol, Comp
return
result
;
}
private
static
IEnumerable
<
T
>
SelectAccessibleMembers
<
T
>(
this
IEnumerable
<
ITypeSymbol
>
types
,
ISymbol
within
)
where
T
:
class
,
ISymbol
{
if
(
types
==
null
)
{
return
ImmutableArray
<
T
>.
Empty
;
}
return
types
.
SelectMany
(
x
=>
x
.
GetMembers
().
OfType
<
T
>().
Where
(
m
=>
m
.
IsAccessibleWithin
(
within
)));
}
private
static
bool
?
IsMoreSpecificThan
(
this
ITypeSymbol
t1
,
ITypeSymbol
t2
)
{
// SPEC: A type parameter is less specific than a non-type parameter.
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录