Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
204d33e2
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,发现更多精彩内容 >>
提交
204d33e2
编写于
7月 15, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Support the casted form.
上级
140fa0d4
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
230 addition
and
2 deletion
+230
-2
src/EditorFeatures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
...ures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
+210
-0
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
...UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
+19
-0
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs
...LocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs
+1
-2
未找到文件。
src/EditorFeatures/CSharpTest/UseLocalFunction/UseLocalFunctionTests.cs
浏览文件 @
204d33e2
...
...
@@ -351,6 +351,216 @@ void M()
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v) =>
v <= 1
? 1
: fibonacci(v - 1, v - 2);
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_SimpleLambda_Block
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)(v =>
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
});
}
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v)
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
}
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_ParenLambdaNoType_Block
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)((v) =>
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
});
}
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v)
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
}
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_ParenLambdaWithType_Block
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)((int v) =>
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
});
}
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v)
{
if (v <= 1)
{
return 1;
}
return fibonacci(v - 1, v - 2);
}
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_SimpleLambda_ExprBody
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)(v =>
v <= 1
? 1
: fibonacci(v - 1, v - 2));
}
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v) =>
v <= 1
? 1
: fibonacci(v - 1, v - 2);
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_ParenLambdaNoType_ExprBody
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)((v) =>
v <= 1
? 1
: fibonacci(v - 1, v - 2));
}
}"
,
@"using System;
class C
{
void M()
{
int fibonacci(int v) =>
v <= 1
? 1
: fibonacci(v - 1, v - 2);
}
}"
,
ignoreTrivia
:
false
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsUseLocalFunction
)]
public
async
Task
TestCastInitialization_ParenLambdaWithType_ExprBody
()
{
await
TestInRegularAndScriptAsync
(
@"using System;
class C
{
void M()
{
var [||]fibonacci = (Func<int, int>)((int v) =>
v <= 1
? 1
: fibonacci(v - 1, v - 2));
}
}"
,
@"using System;
class C
{
void M()
...
...
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionCodeFixProvider.cs
浏览文件 @
204d33e2
...
...
@@ -76,6 +76,10 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
ReplaceSimpleLocalDeclaration
(
semanticModel
,
editor
,
localDeclaration
,
anonymousFunction
,
cancellationToken
);
return
;
case
CSharpUseLocalFunctionDiagnosticAnalyzer
.
CastedLocalDeclarationForm
:
ReplaceCastedLocalDeclaration
(
semanticModel
,
editor
,
localDeclaration
,
anonymousFunction
,
cancellationToken
);
return
;
default
:
throw
ExceptionUtilities
.
UnexpectedValue
(
form
);
}
...
...
@@ -96,6 +100,21 @@ public override Task RegisterCodeFixesAsync(CodeFixContext context)
editor
.
ReplaceNode
(
localDeclaration
,
localFunctionStatement
);
}
private
void
ReplaceCastedLocalDeclaration
(
SemanticModel
semanticModel
,
SyntaxEditor
editor
,
LocalDeclarationStatementSyntax
localDeclaration
,
LambdaExpressionSyntax
anonymousFunction
,
CancellationToken
cancellationToken
)
{
// var t = (Type)(<anonymous function>);
var
localFunctionStatement
=
CreateLocalFunctionStatement
(
semanticModel
,
localDeclaration
,
anonymousFunction
,
cancellationToken
);
localFunctionStatement
=
localFunctionStatement
.
WithTriviaFrom
(
localDeclaration
)
.
WithAdditionalAnnotations
(
Formatter
.
Annotation
);
editor
.
ReplaceNode
(
localDeclaration
,
localFunctionStatement
);
}
private
LocalFunctionStatementSyntax
CreateLocalFunctionStatement
(
SemanticModel
semanticModel
,
LocalDeclarationStatementSyntax
localDeclaration
,
...
...
src/Features/CSharp/Portable/UseLocalFunction/CSharpUseLocalFunctionDiagnosticAnalyzer.cs
浏览文件 @
204d33e2
...
...
@@ -93,13 +93,12 @@ private void SyntaxNodeAction(SyntaxNodeAnalysisContext syntaxContext)
return
;
}
if
(!(
localDeclaration
.
Parent
is
BlockSyntax
block
))
{
return
;
}
var
local
=
semanticModel
.
GetDeclaredSymbol
(
anonymousFunction
.
Parent
.
Parent
,
cancellationToken
);
var
local
=
semanticModel
.
GetDeclaredSymbol
(
localDeclaration
.
Declaration
.
Variables
[
0
]
,
cancellationToken
);
if
(
local
==
null
)
{
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录