Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
992ebecf
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,发现更多精彩内容 >>
提交
992ebecf
编写于
9月 30, 2018
作者:
Š
Šimon Koníček
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix to unwrap Task in async expression bodied methods
Fixes #27647
上级
037b68fe
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
95 addition
and
25 deletion
+95
-25
src/EditorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
...itorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
+71
-0
src/Workspaces/CSharp/Portable/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
...nguageServices/CSharpTypeInferenceService.TypeInferrer.cs
+24
-25
未找到文件。
src/EditorFeatures/CSharpTest/TypeInferrer/TypeInferrerTests.cs
浏览文件 @
992ebecf
...
...
@@ -740,6 +740,77 @@ async System.Threading.Tasks.Task<int> F()
}"
,
"global::System.Int32"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedConstructor
()
{
await
TestInClassAsync
(
@"C() => [|Goo()|];"
,
"void"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedMethod
()
{
await
TestInClassAsync
(
@"int M() => [|Goo()|];"
,
"global::System.Int32"
);
}
[
WorkItem
(
27647
,
"https://github.com/dotnet/roslyn/issues/27647"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedAsyncMethod
()
{
await
TestInClassAsync
(
@"async System.Threading.Tasks.Task<int> M() => [|Goo()|];"
,
"global::System.Int32"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedVoidMethod
()
{
await
TestInClassAsync
(
@"void M() => [|Goo()|];"
,
"void"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedProperty
()
{
await
TestInClassAsync
(
@"int P => [|Goo()|];"
,
"global::System.Int32"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedPropertyGetter
()
{
await
TestInClassAsync
(
@"int P { get => [|Goo()|]; }"
,
"global::System.Int32"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedPropertySetter
()
{
await
TestInClassAsync
(
@"int P { set => [|Goo()|]; }"
,
"void"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedLocalFunction
()
{
await
TestInClassAsync
(
@"void M()
{
int F() => [|Goo()|];
}"
,
"global::System.Int32"
);
}
[
WorkItem
(
27647
,
"https://github.com/dotnet/roslyn/issues/27647"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestExpressionBodiedAsyncLocalFunction
()
{
await
TestInClassAsync
(
@"void M()
{
async System.Threading.Tasks.Task<int> F() => [|Goo()|];
}"
,
"global::System.Int32"
);
}
[
WorkItem
(
827897
,
"http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/827897"
)]
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
TypeInferenceService
)]
public
async
Task
TestYieldReturnInMethod
()
...
...
src/Workspaces/CSharp/Portable/LanguageServices/CSharpTypeInferenceService.TypeInferrer.cs
浏览文件 @
992ebecf
...
...
@@ -173,16 +173,6 @@ private IEnumerable<TypeInferenceInfo> GetTypesSimple(ExpressionSyntax expressio
}
}
private
IEnumerable
<
TypeInferenceInfo
>
InferTypeInArrowExpressionClause
(
ArrowExpressionClauseSyntax
arrowClause
)
{
var
parentSymbol
=
SemanticModel
.
GetDeclaredSymbol
(
arrowClause
.
Parent
,
CancellationToken
);
var
parentMemberType
=
GetMemberType
(
parentSymbol
);
return
parentMemberType
!=
null
?
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
parentMemberType
))
:
SpecializedCollections
.
EmptyEnumerable
<
TypeInferenceInfo
>();
}
protected
override
IEnumerable
<
TypeInferenceInfo
>
InferTypesWorker_DoNotCallDirectly
(
int
position
)
{
var
syntaxTree
=
SemanticModel
.
SyntaxTree
;
...
...
@@ -1784,7 +1774,7 @@ private IEnumerable<TypeInferenceInfo> InferTypeInYieldStatement(YieldStatementS
var
declaration
=
yieldStatement
.
FirstAncestorOrSelf
<
SyntaxNode
>(
e
=>
e
is
LocalFunctionStatementSyntax
||
e
is
MemberDeclarationSyntax
);
var
memberSymbol
=
GetDeclaredMemberSymbolFromOriginalSemanticModel
(
declaration
);
var
memberType
=
GetMemberType
(
memberSymbol
);
var
memberType
=
GetMemberType
(
memberSymbol
,
out
_
);
if
(
memberType
is
INamedTypeSymbol
namedType
)
{
...
...
@@ -1798,12 +1788,19 @@ private IEnumerable<TypeInferenceInfo> InferTypeInYieldStatement(YieldStatementS
return
SpecializedCollections
.
EmptyEnumerable
<
TypeInferenceInfo
>();
}
private
static
ITypeSymbol
GetMemberType
(
ISymbol
memberSymbol
)
private
static
ITypeSymbol
GetMemberType
(
ISymbol
memberSymbol
,
out
bool
isAsync
)
{
isAsync
=
false
;
switch
(
memberSymbol
)
{
case
IMethodSymbol
method
:
return
method
.
ReturnType
;
case
IPropertySymbol
property
:
return
property
.
Type
;
case
IMethodSymbol
method
:
isAsync
=
method
.
IsAsync
;
return
method
.
ReturnType
;
case
IPropertySymbol
property
:
return
property
.
Type
;
case
IFieldSymbol
field
:
return
field
.
Type
;
}
return
null
;
...
...
@@ -1841,19 +1838,21 @@ private ITypeSymbol UnwrapTaskLike(ITypeSymbol type, bool isAsync)
}
var
symbol
=
GetDeclaredMemberSymbolFromOriginalSemanticModel
(
ancestor
);
var
type
=
GetMemberType
(
symbol
,
out
var
isAsync
);
switch
(
symbol
)
{
case
IMethodSymbol
method
:
return
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
UnwrapTaskLike
(
method
.
ReturnType
,
method
.
IsAsync
)));
case
IPropertySymbol
property
:
return
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
property
.
Type
));
case
IFieldSymbol
field
:
return
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
field
.
Type
));
}
return
type
!=
null
?
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
UnwrapTaskLike
(
type
,
isAsync
)))
:
SpecializedCollections
.
EmptyEnumerable
<
TypeInferenceInfo
>();
}
return
SpecializedCollections
.
EmptyEnumerable
<
TypeInferenceInfo
>();
private
IEnumerable
<
TypeInferenceInfo
>
InferTypeInArrowExpressionClause
(
ArrowExpressionClauseSyntax
arrowClause
)
{
var
symbol
=
GetDeclaredMemberSymbolFromOriginalSemanticModel
(
arrowClause
.
Parent
);
var
type
=
GetMemberType
(
symbol
,
out
var
isAsync
);
return
type
!=
null
?
SpecializedCollections
.
SingletonEnumerable
(
new
TypeInferenceInfo
(
UnwrapTaskLike
(
type
,
isAsync
)))
:
SpecializedCollections
.
EmptyEnumerable
<
TypeInferenceInfo
>();
}
private
ISymbol
GetDeclaredMemberSymbolFromOriginalSemanticModel
(
SyntaxNode
declarationInCurrentTree
)
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录