Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
7d5d6fcc
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,发现更多精彩内容 >>
提交
7d5d6fcc
编写于
9月 14, 2018
作者:
S
Sam Harwell
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify checks for showing properties in the object initializer syntax
上级
c7601c0f
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
17 addition
and
32 deletion
+17
-32
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.cs
...tionProviders/ObjectInitializerCompletionProviderTests.cs
+4
-3
src/Features/Core/Portable/Completion/Providers/AbstractObjectInitializerCompletionProvider.cs
.../Providers/AbstractObjectInitializerCompletionProvider.cs
+13
-29
未找到文件。
src/EditorFeatures/CSharpTest/Completion/CompletionProviders/ObjectInitializerCompletionProviderTests.cs
浏览文件 @
7d5d6fcc
...
...
@@ -698,8 +698,9 @@ static void Main(string[] args)
}
}"
;
await
VerifyItemIsAbsentAsync
(
markup
,
"S"
);
await
VerifyItemIsAbsentAsync
(
markup
,
"D"
);
// Can't use S={3}, but the object initializer syntax S={} is still valid
await
VerifyItemExistsAsync
(
markup
,
"S"
);
await
VerifyItemExistsAsync
(
markup
,
"D"
);
}
[
WorkItem
(
13158
,
"https://github.com/dotnet/roslyn/issues/13158"
)]
...
...
@@ -1015,7 +1016,7 @@ static void Main(string[] args)
}
}"
;
await
VerifyItem
IsAbsent
Async
(
markup
,
"PropB"
);
await
VerifyItem
Exists
Async
(
markup
,
"PropB"
);
}
private
async
Task
VerifyExclusiveAsync
(
string
markup
,
bool
exclusive
)
...
...
src/Features/Core/Portable/Completion/Providers/AbstractObjectInitializerCompletionProvider.cs
浏览文件 @
7d5d6fcc
...
...
@@ -3,11 +3,13 @@
using
System
;
using
System.Collections.Generic
;
using
System.Collections.Immutable
;
using
System.Diagnostics
;
using
System.Linq
;
using
System.Threading
;
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.Shared.Extensions
;
using
Microsoft.CodeAnalysis.Text
;
using
Roslyn.Utilities
;
namespace
Microsoft.CodeAnalysis.Completion.Providers
{
...
...
@@ -78,7 +80,10 @@ protected override Task<CompletionDescription> GetDescriptionWorkerAsync(Documen
protected
abstract
Task
<
bool
>
IsExclusiveAsync
(
Document
document
,
int
position
,
CancellationToken
cancellationToken
);
private
bool
IsLegalFieldOrProperty
(
ISymbol
symbol
,
ISymbol
within
)
=>
CanSupportCollectionInitializer
(
symbol
,
within
)
||
symbol
.
IsWriteableFieldOrProperty
()
||
CanSupportObjectInitializer
(
symbol
,
within
);
{
return
symbol
.
IsWriteableFieldOrProperty
()
||
CanSupportObjectInitializer
(
symbol
,
within
);
}
private
static
readonly
CompletionItemRules
s_rules
=
CompletionItemRules
.
Create
(
enterKeyRule
:
EnterKeyRule
.
Never
);
...
...
@@ -92,39 +97,18 @@ protected virtual bool IsInitializable(ISymbol member, INamedTypeSymbol containi
private
static
bool
CanSupportObjectInitializer
(
ISymbol
symbol
,
ISymbol
within
)
{
if
(
symbol
is
IPropertySymbol
propertySymbol
)
{
return
propertySymbol
.
GetMethod
!=
null
&&
!
propertySymbol
.
Type
.
IsStructType
()
&&
HasAccesseblePropertiesOrFields
(
propertySymbol
.
Type
,
within
);
}
Debug
.
Assert
(!
symbol
.
IsWriteableFieldOrProperty
(),
"Assertion failed - expected writable field/property check before calling this method."
);
return
false
;
}
private
static
bool
HasAccesseblePropertiesOrFields
(
ITypeSymbol
type
,
ISymbol
within
)
if
(
symbol
is
IFieldSymbol
fieldSymbol
)
{
var
types
=
new
HashSet
<
ITypeSymbol
>();
return
HasAccesseblePropertiesOrFields
(
type
,
types
);
bool
HasAccesseblePropertiesOrFields
(
ITypeSymbol
typeToCheck
,
HashSet
<
ITypeSymbol
>
alreadyCheckedTypes
)
{
if
(
alreadyCheckedTypes
.
Contains
(
typeToCheck
))
{
return
false
;
}
alreadyCheckedTypes
.
Add
(
typeToCheck
);
return
typeToCheck
.
GetBaseTypesAndThis
().
SelectMany
(
x
=>
x
.
GetMembers
())
.
Where
(
member
=>
member
is
IPropertySymbol
||
member
is
IFieldSymbol
)
.
Any
(
member
=>
member
.
IsWriteableFieldOrProperty
()
||
CanSupportCollectionInitializer
(
member
,
within
)
||
HasAccesseblePropertiesOrFields
(
member
.
GetMemberType
(),
alreadyCheckedTypes
));
return
!
fieldSymbol
.
Type
.
IsStructType
();
}
else
if
(
symbol
is
IPropertySymbol
propertySymbol
)
{
return
!
propertySymbol
.
Type
.
IsStructType
();
}
private
static
bool
CanSupportCollectionInitializer
(
ISymbol
symbol
,
ISymbol
within
)
{
var
type
=
symbol
.
GetMemberType
();
return
type
!=
null
&&
type
.
CanSupportCollectionInitializer
(
within
);
throw
ExceptionUtilities
.
Unreachable
;
}
}
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录