Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
f91cdf99
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,发现更多精彩内容 >>
提交
f91cdf99
编写于
2月 09, 2017
作者:
C
CyrusNajmabadi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
better support for params-constructors.
上级
806a34a0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
78 addition
and
10 deletion
+78
-10
src/EditorFeatures/CSharpTest/AddParameter/AddParameterTests.cs
...itorFeatures/CSharpTest/AddParameter/AddParameterTests.cs
+51
-0
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
...table/AddParameter/AbstractAddParameterCodeFixProvider.cs
+27
-10
未找到文件。
src/EditorFeatures/CSharpTest/AddParameter/AddParameterTests.cs
浏览文件 @
f91cdf99
...
@@ -181,6 +181,57 @@ void M()
...
@@ -181,6 +181,57 @@ void M()
{
{
new C(1, true);
new C(1, true);
}
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddParameter
)]
public
async
Task
TestParams1
()
{
await
TestAsync
(
@"
class C
{
public C(params int[] i) { }
}
class D
{
void M()
{
new C([|true|], 1);
}
}"
,
@"
class C
{
public C(bool v, params int[] i) { }
}
class D
{
void M()
{
new C(true, 1);
}
}"
);
}
[
Fact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
CodeActionsAddParameter
)]
public
async
Task
TestParams2
()
{
await
TestMissingAsync
(
@"
class C
{
public C(params int[] i) { }
}
class D
{
void M()
{
new [|C|](1, true);
}
}"
);
}"
);
}
}
}
}
...
...
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
浏览文件 @
f91cdf99
...
@@ -91,7 +91,7 @@ private Task HandleInvocationExpressionAsync(CodeFixContext context, TInvocation
...
@@ -91,7 +91,7 @@ private Task HandleInvocationExpressionAsync(CodeFixContext context, TInvocation
foreach
(
var
constructor
in
type
.
InstanceConstructors
.
OrderBy
(
m
=>
m
.
Parameters
.
Length
))
foreach
(
var
constructor
in
type
.
InstanceConstructors
.
OrderBy
(
m
=>
m
.
Parameters
.
Length
))
{
{
if
(
IsInSource
(
constructor
)
&&
if
(
IsInSource
(
constructor
)
&&
constructor
.
Parameters
.
Length
<
arguments
.
Count
)
NonParamsParameterCount
(
constructor
)
<
arguments
.
Count
)
{
{
var
argumentToAdd
=
DetermineFirstArgumentToAdd
(
var
argumentToAdd
=
DetermineFirstArgumentToAdd
(
semanticModel
,
syntaxFacts
,
comparer
,
constructor
,
arguments
);
semanticModel
,
syntaxFacts
,
comparer
,
constructor
,
arguments
);
...
@@ -111,6 +111,9 @@ private Task HandleInvocationExpressionAsync(CodeFixContext context, TInvocation
...
@@ -111,6 +111,9 @@ private Task HandleInvocationExpressionAsync(CodeFixContext context, TInvocation
}
}
}
}
private
int
NonParamsParameterCount
(
IMethodSymbol
method
)
=>
method
.
IsParams
()
?
method
.
Parameters
.
Length
-
1
:
method
.
Parameters
.
Length
;
private
bool
IsInSource
(
ISymbol
symbol
)
private
bool
IsInSource
(
ISymbol
symbol
)
=>
!
symbol
.
IsImplicitlyDeclared
&&
=>
!
symbol
.
IsImplicitlyDeclared
&&
symbol
.
DeclaringSyntaxReferences
.
Length
>
0
&&
symbol
.
DeclaringSyntaxReferences
.
Length
>
0
&&
...
@@ -188,11 +191,11 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
...
@@ -188,11 +191,11 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
miscellaneousOptions
:
SymbolDisplayMiscellaneousOptions
.
UseSpecialTypes
);
miscellaneousOptions
:
SymbolDisplayMiscellaneousOptions
.
UseSpecialTypes
);
private
TArgumentSyntax
DetermineFirstArgumentToAdd
(
private
TArgumentSyntax
DetermineFirstArgumentToAdd
(
SemanticModel
semanticModel
,
SemanticModel
semanticModel
,
ISyntaxFactsService
syntaxFacts
,
ISyntaxFactsService
syntaxFacts
,
StringComparer
comparer
,
StringComparer
comparer
,
IMethodSymbol
method
,
IMethodSymbol
method
,
SeparatedSyntaxList
<
TArgumentSyntax
>
arguments
)
SeparatedSyntaxList
<
TArgumentSyntax
>
arguments
)
{
{
var
methodParameterNames
=
new
HashSet
<
string
>(
comparer
);
var
methodParameterNames
=
new
HashSet
<
string
>(
comparer
);
methodParameterNames
.
AddRange
(
method
.
Parameters
.
Select
(
p
=>
p
.
Name
));
methodParameterNames
.
AddRange
(
method
.
Parameters
.
Select
(
p
=>
p
.
Name
));
...
@@ -217,17 +220,28 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
...
@@ -217,17 +220,28 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
// then this definitely is an argument we could add.
// then this definitely is an argument we could add.
if
(
i
>=
method
.
Parameters
.
Length
)
if
(
i
>=
method
.
Parameters
.
Length
)
{
{
if
(
method
.
Parameters
.
LastOrDefault
()?.
IsParams
==
true
)
{
// Last parameter is a params. We can't place any parameters past it.
return
null
;
}
return
argument
;
return
argument
;
}
}
var
argumentTypeInfo
=
semanticModel
.
GetTypeInfo
(
syntaxFacts
.
GetExpressionOfArgument
(
argument
));
var
argumentTypeInfo
=
semanticModel
.
GetTypeInfo
(
syntaxFacts
.
GetExpressionOfArgument
(
argument
));
var
parameter
=
method
.
Parameters
[
i
];
var
parameter
=
method
.
Parameters
[
i
];
// If this argument already matches the method's parameter, then we don't want
if
(!
TypeInfoMatchesType
(
argumentTypeInfo
,
parameter
.
Type
))
// to add it.
if
(!
parameter
.
Type
.
Equals
(
argumentTypeInfo
.
Type
)
&&
!
parameter
.
Type
.
Equals
(
argumentTypeInfo
.
ConvertedType
))
{
{
if
(
parameter
.
IsParams
&&
parameter
.
Type
is
IArrayTypeSymbol
arrayType
)
{
if
(
TypeInfoMatchesType
(
argumentTypeInfo
,
arrayType
.
ElementType
))
{
return
null
;
}
}
return
argument
;
return
argument
;
}
}
}
}
...
@@ -236,6 +250,9 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
...
@@ -236,6 +250,9 @@ private static SyntaxNode GetNewMethodDeclaration(IMethodSymbol method, TArgumen
return
null
;
return
null
;
}
}
private
bool
TypeInfoMatchesType
(
TypeInfo
argumentTypeInfo
,
ITypeSymbol
type
)
=>
type
.
Equals
(
argumentTypeInfo
.
Type
)
||
type
.
Equals
(
argumentTypeInfo
.
ConvertedType
);
private
class
MyCodeAction
:
CodeAction
.
DocumentChangeAction
private
class
MyCodeAction
:
CodeAction
.
DocumentChangeAction
{
{
public
MyCodeAction
(
public
MyCodeAction
(
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录