Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
01a30990
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,发现更多精彩内容 >>
提交
01a30990
编写于
10月 09, 2016
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Use expression bodied constructors if desired.
上级
495658b9
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
34 addition
and
4 deletion
+34
-4
src/Workspaces/CSharp/Portable/CodeGeneration/CSharpCodeGenerationService.cs
...rp/Portable/CodeGeneration/CSharpCodeGenerationService.cs
+4
-2
src/Workspaces/CSharp/Portable/CodeGeneration/ConstructorGenerator.cs
...es/CSharp/Portable/CodeGeneration/ConstructorGenerator.cs
+30
-2
未找到文件。
src/Workspaces/CSharp/Portable/CodeGeneration/CSharpCodeGenerationService.cs
浏览文件 @
01a30990
...
...
@@ -143,7 +143,8 @@ protected override TDeclarationNode AddMethod<TDeclarationNode>(TDeclarationNode
{
if
(
method
.
IsConstructor
())
{
return
Cast
<
TDeclarationNode
>(
ConstructorGenerator
.
AddConstructorTo
(
typeDeclaration
,
method
,
options
,
availableIndices
));
return
Cast
<
TDeclarationNode
>(
ConstructorGenerator
.
AddConstructorTo
(
typeDeclaration
,
method
,
Workspace
,
options
,
availableIndices
));
}
if
(
method
.
IsDestructor
())
...
...
@@ -616,7 +617,8 @@ public override SyntaxNode CreateFieldDeclaration(IFieldSymbol field, CodeGenera
if
(
method
.
IsConstructor
())
{
return
ConstructorGenerator
.
GenerateConstructorDeclaration
(
method
,
destination
,
options
);
return
ConstructorGenerator
.
GenerateConstructorDeclaration
(
method
,
destination
,
Workspace
,
options
);
}
else
if
(
method
.
IsDestructor
())
{
...
...
src/Workspaces/CSharp/Portable/CodeGeneration/ConstructorGenerator.cs
浏览文件 @
01a30990
// Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
Microsoft.CodeAnalysis.CodeGeneration
;
using
Microsoft.CodeAnalysis.CSharp.CodeStyle
;
using
Microsoft.CodeAnalysis.CSharp.Extensions
;
using
Microsoft.CodeAnalysis.CSharp.Syntax
;
...
...
@@ -21,10 +23,12 @@ private static MemberDeclarationSyntax LastConstructorOrField(SyntaxList<MemberD
internal
static
TypeDeclarationSyntax
AddConstructorTo
(
TypeDeclarationSyntax
destination
,
IMethodSymbol
constructor
,
Workspace
workspace
,
CodeGenerationOptions
options
,
IList
<
bool
>
availableIndices
)
{
var
constructorDeclaration
=
GenerateConstructorDeclaration
(
constructor
,
GetDestination
(
destination
),
options
);
var
constructorDeclaration
=
GenerateConstructorDeclaration
(
constructor
,
GetDestination
(
destination
),
workspace
,
options
);
// Generate after the last constructor, or after the last field, or at the start of the
// type.
...
...
@@ -35,7 +39,8 @@ private static MemberDeclarationSyntax LastConstructorOrField(SyntaxList<MemberD
}
internal
static
ConstructorDeclarationSyntax
GenerateConstructorDeclaration
(
IMethodSymbol
constructor
,
CodeGenerationDestination
destination
,
CodeGenerationOptions
options
)
IMethodSymbol
constructor
,
CodeGenerationDestination
destination
,
Workspace
workspace
,
CodeGenerationOptions
options
)
{
options
=
options
??
CodeGenerationOptions
.
Default
;
...
...
@@ -56,10 +61,33 @@ private static MemberDeclarationSyntax LastConstructorOrField(SyntaxList<MemberD
body
:
hasNoBody
?
null
:
GenerateBlock
(
constructor
),
semicolonToken
:
hasNoBody
?
SyntaxFactory
.
Token
(
SyntaxKind
.
SemicolonToken
)
:
default
(
SyntaxToken
));
declaration
=
UseExpressionBodyIfDesired
(
workspace
,
declaration
);
return
AddCleanupAnnotationsTo
(
ConditionallyAddDocumentationCommentTo
(
declaration
,
constructor
,
options
));
}
private
static
ConstructorDeclarationSyntax
UseExpressionBodyIfDesired
(
Workspace
workspace
,
ConstructorDeclarationSyntax
declaration
)
{
if
(
declaration
.
ExpressionBody
==
null
)
{
var
preferExpressionBody
=
workspace
.
Options
.
GetOption
(
CSharpCodeStyleOptions
.
PreferExpressionBodiedConstructors
).
Value
;
if
(
preferExpressionBody
)
{
var
expressionBody
=
CodeGenerationHelpers
.
TryConvertToExpressionBody
(
declaration
.
Body
);
if
(
expressionBody
!=
null
)
{
return
declaration
.
WithBody
(
null
)
.
WithExpressionBody
(
expressionBody
)
.
WithSemicolonToken
(
SyntaxFactory
.
Token
(
SyntaxKind
.
SemicolonToken
));
}
}
}
return
declaration
;
}
private
static
ConstructorInitializerSyntax
GenerateConstructorInitializer
(
IMethodSymbol
constructor
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录