Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
d40bb861
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,发现更多精彩内容 >>
提交
d40bb861
编写于
3月 19, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Share more code.
上级
e13ee7ab
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
48 addition
and
49 deletion
+48
-49
src/Features/Core/Portable/GenerateConstructorFromMembers/ConstructorDelegatingCodeAction.cs
...ConstructorFromMembers/ConstructorDelegatingCodeAction.cs
+9
-30
src/Workspaces/Core/Portable/Shared/Extensions/ICodeDefinitionFactoryExtensions.cs
...ble/Shared/Extensions/ICodeDefinitionFactoryExtensions.cs
+39
-19
未找到文件。
src/Features/Core/Portable/GenerateConstructorFromMembers/ConstructorDelegatingCodeAction.cs
浏览文件 @
d40bb861
...
...
@@ -64,36 +64,15 @@ protected override async Task<Document> GetChangedDocumentAsync(CancellationToke
{
var
symbolName
=
_state
.
SelectedMembers
[
i
].
Name
;
var
parameter
=
_state
.
Parameters
[
i
];
var
parameterName
=
parameter
.
Name
;
var
shouldAddNullCheck
=
_addNullChecks
&&
parameter
.
Type
.
CanAddNullCheck
();
if
(
shouldAddNullCheck
&&
useThrowExpressions
)
{
// Generate 'this.a = a ?? throw...
assignStatements
.
Add
(
factory
.
CreateAssignWithNullCheckStatement
(
compilation
,
parameter
,
fieldAccess
:
factory
.
MemberAccessExpression
(
factory
.
ThisExpression
(),
factory
.
IdentifierName
(
symbolName
))));
}
else
{
if
(
shouldAddNullCheck
)
{
// generate: if (p == null) throw ...
nullCheckStatements
.
Add
(
factory
.
CreateIfNullThrowStatement
(
compilation
,
parameter
));
}
// generate: this.p = p;
assignStatements
.
Add
(
factory
.
ExpressionStatement
(
factory
.
AssignmentStatement
(
factory
.
MemberAccessExpression
(
factory
.
ThisExpression
(),
factory
.
IdentifierName
(
symbolName
)),
factory
.
IdentifierName
(
parameterName
))));
}
var
fieldAccess
=
factory
.
MemberAccessExpression
(
factory
.
ThisExpression
(),
factory
.
IdentifierName
(
symbolName
));
factory
.
AddAssignmentStatements
(
compilation
,
parameter
,
fieldAccess
,
_addNullChecks
,
useThrowExpressions
,
nullCheckStatements
,
assignStatements
);
}
var
syntaxTree
=
await
_document
.
GetSyntaxTreeAsync
(
cancellationToken
).
ConfigureAwait
(
false
);
...
...
src/Workspaces/Core/Portable/Shared/Extensions/ICodeDefinitionFactoryExtensions.cs
浏览文件 @
d40bb861
...
...
@@ -233,25 +233,10 @@ private static bool TryGetValue(IDictionary<string, ISymbol> dictionary, string
var
fieldAccess
=
factory
.
MemberAccessExpression
(
factory
.
ThisExpression
(),
factory
.
IdentifierName
(
fieldName
))
.
WithAdditionalAnnotations
(
Simplifier
.
Annotation
);
var
shouldAddNullCheck
=
addNullChecks
&&
parameterType
.
CanAddNullCheck
();
if
(
shouldAddNullCheck
&&
preferThrowExpression
)
{
var
statement
=
CreateAssignWithNullCheckStatement
(
factory
,
compilation
,
parameter
,
fieldAccess
);
assignStatements
.
Add
(
statement
);
}
else
{
if
(
shouldAddNullCheck
)
{
nullCheckStatements
.
Add
(
factory
.
CreateIfNullThrowStatement
(
compilation
,
parameter
));
}
var
assignExpression
=
factory
.
AssignmentStatement
(
fieldAccess
,
factory
.
IdentifierName
(
parameterName
));
var
statement
=
factory
.
ExpressionStatement
(
assignExpression
);
assignStatements
.
Add
(
statement
);
}
factory
.
AddAssignmentStatements
(
compilation
,
parameter
,
fieldAccess
,
addNullChecks
,
preferThrowExpression
,
nullCheckStatements
,
assignStatements
);
}
}
}
...
...
@@ -259,6 +244,41 @@ private static bool TryGetValue(IDictionary<string, ISymbol> dictionary, string
return
nullCheckStatements
.
ToImmutableAndFree
().
Concat
(
assignStatements
.
ToImmutableAndFree
());
}
public
static
void
AddAssignmentStatements
(
this
SyntaxGenerator
factory
,
Compilation
compilation
,
IParameterSymbol
parameter
,
SyntaxNode
fieldAccess
,
bool
addNullChecks
,
bool
preferThrowExpression
,
ArrayBuilder
<
SyntaxNode
>
nullCheckStatements
,
ArrayBuilder
<
SyntaxNode
>
assignStatements
)
{
var
shouldAddNullCheck
=
addNullChecks
&&
parameter
.
Type
.
CanAddNullCheck
();
if
(
shouldAddNullCheck
&&
preferThrowExpression
)
{
// Generate: this.x = x ?? throw ...
assignStatements
.
Add
(
CreateAssignWithNullCheckStatement
(
factory
,
compilation
,
parameter
,
fieldAccess
));
}
else
{
if
(
shouldAddNullCheck
)
{
// generate: if (x == null) throw ...
nullCheckStatements
.
Add
(
factory
.
CreateIfNullThrowStatement
(
compilation
,
parameter
));
}
// generate: this.x = x;
assignStatements
.
Add
(
factory
.
ExpressionStatement
(
factory
.
AssignmentStatement
(
fieldAccess
,
factory
.
IdentifierName
(
parameter
.
Name
))));
}
}
public
static
SyntaxNode
CreateAssignWithNullCheckStatement
(
this
SyntaxGenerator
factory
,
Compilation
compilation
,
IParameterSymbol
parameter
,
SyntaxNode
fieldAccess
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录