Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
54f4e4a2
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,发现更多精彩内容 >>
提交
54f4e4a2
编写于
6月 11, 2019
作者:
J
Jason Malinowski
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add nullability support to use local function
Fixes
https://github.com/dotnet/roslyn/issues/30322
上级
9cdc1fb5
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
38 addition
and
7 deletion
+38
-7
src/EditorFeatures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
...ures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
+29
-0
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
...UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
+1
-1
src/Workspaces/CSharp/Portable/Extensions/TypeSyntaxExtensions.cs
...spaces/CSharp/Portable/Extensions/TypeSyntaxExtensions.cs
+5
-3
src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationAbstractMethodSymbol.cs
...eGeneration/Symbols/CodeGenerationAbstractMethodSymbol.cs
+3
-3
未找到文件。
src/EditorFeatures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
浏览文件 @
54f4e4a2
...
...
@@ -3,6 +3,7 @@
using
System.Threading.Tasks
;
using
Microsoft.CodeAnalysis.CodeFixes
;
using
Microsoft.CodeAnalysis.CSharp
;
using
Microsoft.CodeAnalysis.CSharp.Test.Utilities
;
using
Microsoft.CodeAnalysis.CSharp.UseLocalFunction
;
using
Microsoft.CodeAnalysis.Diagnostics
;
using
Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.Diagnostics
;
...
...
@@ -3660,5 +3661,33 @@ void M()
}
}"
,
parseOptions
:
CSharp8ParseOptions
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestWithNullableParameterAndReturn
()
{
await
TestInRegularAndScriptAsync
(
@"#nullable enable
using System;
class Program
{
static void Main(string[] args)
{
Func<string?, string?> [||]f = s => s;
}
}"
,
@"#nullable enable
using System;
class Program
{
static void Main(string[] args)
{
static string? f(string? s) => s;
}
}"
,
parseOptions
:
TestOptions
.
Regular8WithNullableAnalysis
);
}
}
}
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
浏览文件 @
54f4e4a2
...
...
@@ -245,7 +245,7 @@ ParameterSyntax PromoteParameter(ParameterSyntax parameterNode, IParameterSymbol
if
(
parameterNode
.
Type
==
null
)
{
parameterNode
=
parameterNode
.
WithType
(
delegateParameter
?.
Type
.
GenerateTypeSyntax
()
??
s_objectType
);
parameterNode
=
parameterNode
.
WithType
(
delegateParameter
?.
Type
.
WithNullability
(
delegateParameter
.
NullableAnnotation
).
GenerateTypeSyntax
()
??
s_objectType
);
}
if
(
delegateParameter
?.
HasExplicitDefaultValue
==
true
)
...
...
src/Workspaces/CSharp/Portable/Extensions/TypeSyntaxExtensions.cs
浏览文件 @
54f4e4a2
...
...
@@ -93,17 +93,19 @@ public static bool IsTypeInferred(this TypeSyntax typeSyntax, SemanticModel sema
public
static
TypeSyntax
GenerateReturnTypeSyntax
(
this
IMethodSymbol
method
)
{
var
returnType
=
method
.
ReturnType
.
WithNullability
(
method
.
ReturnNullableAnnotation
);
if
(
method
.
ReturnsByRef
)
{
return
method
.
R
eturnType
.
GenerateRefTypeSyntax
();
return
r
eturnType
.
GenerateRefTypeSyntax
();
}
else
if
(
method
.
ReturnsByRefReadonly
)
{
return
method
.
R
eturnType
.
GenerateRefReadOnlyTypeSyntax
();
return
r
eturnType
.
GenerateRefReadOnlyTypeSyntax
();
}
else
{
return
method
.
R
eturnType
.
GenerateTypeSyntax
();
return
r
eturnType
.
GenerateTypeSyntax
();
}
}
...
...
src/Workspaces/Core/Portable/CodeGeneration/Symbols/CodeGenerationAbstractMethodSymbol.cs
浏览文件 @
54f4e4a2
...
...
@@ -48,9 +48,9 @@ public virtual ImmutableArray<AttributeData> GetReturnTypeAttributes()
public
abstract
IMethodSymbol
PartialDefinitionPart
{
get
;
}
public
abstract
IMethodSymbol
PartialImplementationPart
{
get
;
}
public
NullableAnnotation
ReceiverNullableAnnotation
=>
throw
new
NotImplementedException
();
public
NullableAnnotation
ReturnNullableAnnotation
=>
throw
new
NotImplementedException
();
public
ImmutableArray
<
NullableAnnotation
>
TypeArgumentsNullableAnnotations
=>
throw
new
NotImplementedException
(
);
public
NullableAnnotation
ReceiverNullableAnnotation
=>
ReceiverType
.
GetNullability
();
public
NullableAnnotation
ReturnNullableAnnotation
=>
ReturnType
.
GetNullability
();
public
ImmutableArray
<
NullableAnnotation
>
TypeArgumentsNullableAnnotations
=>
TypeArguments
.
SelectAsArray
(
a
=>
a
.
GetNullability
()
);
public
virtual
ITypeSymbol
ReceiverType
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录