Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
60725ded
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,发现更多精彩内容 >>
提交
60725ded
编写于
3月 15, 2018
作者:
M
Martin Strecker
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
PR feedback: Small refactorings and code formatting.
上级
f86b9dbc
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
19 addition
and
13 deletion
+19
-13
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
...table/AddParameter/AbstractAddParameterCodeFixProvider.cs
+19
-13
未找到文件。
src/Features/Core/Portable/AddParameter/AbstractAddParameterCodeFixProvider.cs
浏览文件 @
60725ded
...
@@ -200,10 +200,11 @@ private int NonParamsParameterCount(IMethodSymbol method)
...
@@ -200,10 +200,11 @@ private int NonParamsParameterCount(IMethodSymbol method)
:
NestByCascading
();
:
NestByCascading
();
context
.
RegisterFixes
(
fixes
,
context
.
Diagnostics
);
context
.
RegisterFixes
(
fixes
,
context
.
Diagnostics
);
return
;
ImmutableArray
<
CodeAction
>
NestByOverload
()
ImmutableArray
<
CodeAction
>
NestByOverload
()
{
{
var
builder
=
ImmutableArray
.
CreateBuilder
<
CodeAction
>
(
codeFixData
.
Length
);
var
builder
=
ArrayBuilder
<
CodeAction
>.
GetInstance
(
codeFixData
.
Length
);
foreach
(
var
data
in
codeFixData
)
foreach
(
var
data
in
codeFixData
)
{
{
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
data
.
Method
,
includeParameters
:
true
);
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
data
.
Method
,
includeParameters
:
true
);
...
@@ -213,7 +214,8 @@ ImmutableArray<CodeAction> NestByOverload()
...
@@ -213,7 +214,8 @@ ImmutableArray<CodeAction> NestByOverload()
if
(
data
.
CreateChangedSolutionCascading
!=
null
)
if
(
data
.
CreateChangedSolutionCascading
!=
null
)
{
{
var
titleForNesting
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
data
.
Method
,
includeParameters
:
true
);
var
titleForNesting
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
data
.
Method
,
includeParameters
:
true
);
var
titleCascading
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0_and_overrides_implementations
,
data
.
Method
,
includeParameters
:
true
);
var
titleCascading
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0_and_overrides_implementations
,
data
.
Method
,
includeParameters
:
true
);
codeAction
=
new
CodeAction
.
CodeActionWithNestedActions
(
codeAction
=
new
CodeAction
.
CodeActionWithNestedActions
(
title
:
titleForNesting
,
title
:
titleForNesting
,
ImmutableArray
.
Create
(
ImmutableArray
.
Create
(
...
@@ -227,44 +229,48 @@ ImmutableArray<CodeAction> NestByOverload()
...
@@ -227,44 +229,48 @@ ImmutableArray<CodeAction> NestByOverload()
builder
.
Add
(
codeAction
);
builder
.
Add
(
codeAction
);
}
}
return
builder
.
ToImmutable
();
return
builder
.
ToImmutable
AndFree
();
}
}
ImmutableArray
<
CodeAction
>
NestByCascading
()
ImmutableArray
<
CodeAction
>
NestByCascading
()
{
{
var
builder
=
ImmutableArray
.
CreateBuilder
<
CodeAction
>
(
2
);
var
builder
=
ArrayBuilder
<
CodeAction
>.
GetInstance
(
2
);
var
nonCascadingActions
=
ImmutableArray
.
CreateRange
<
CodeAction
>(
codeFixData
.
Select
(
data
=>
var
nonCascadingActions
=
ImmutableArray
.
CreateRange
<
CodeAction
>(
codeFixData
.
Select
(
data
=>
{
{
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_to_0
,
data
.
Method
,
true
);
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_to_0
,
data
.
Method
,
includeParameters
:
true
);
return
new
MyCodeAction
(
title
:
title
,
data
.
CreateChangedSolutionNonCascading
);
return
new
MyCodeAction
(
title
:
title
,
data
.
CreateChangedSolutionNonCascading
);
}));
}));
var
cascading
=
codeFixData
.
Where
(
data
=>
data
.
CreateChangedSolutionCascading
!=
null
);
var
cascading
=
codeFixData
.
Where
(
data
=>
data
.
CreateChangedSolutionCascading
!=
null
);
var
cascadingActions
=
ImmutableArray
.
CreateRange
<
CodeAction
>(
cascading
.
Select
(
data
=>
var
cascadingActions
=
ImmutableArray
.
CreateRange
<
CodeAction
>(
cascading
.
Select
(
data
=>
{
{
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_to_0
,
data
.
Method
,
true
);
var
title
=
GetCodeFixTitle
(
FeaturesResources
.
Add_to_0
,
data
.
Method
,
includeParameters
:
true
);
return
new
MyCodeAction
(
title
:
title
,
data
.
CreateChangedSolutionCascading
);
return
new
MyCodeAction
(
title
:
title
,
data
.
CreateChangedSolutionCascading
);
}));
}));
var
aMethod
=
codeFixData
.
First
().
Method
;
var
aMethod
=
codeFixData
.
First
().
Method
;
var
nestedNonCascadingTitle
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
aMethod
,
false
);
var
nestedNonCascadingTitle
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0
,
aMethod
,
includeParameters
:
false
);
builder
.
Add
(
new
CodeAction
.
CodeActionWithNestedActions
(
nestedNonCascadingTitle
,
nonCascadingActions
,
isInlinable
:
false
));
builder
.
Add
(
new
CodeAction
.
CodeActionWithNestedActions
(
nestedNonCascadingTitle
,
nonCascadingActions
,
isInlinable
:
false
));
if
(
cascadingActions
.
Length
>
0
)
if
(
cascadingActions
.
Length
>
0
)
{
{
var
nestedCascadingTitle
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0_and_overrides_implementations
,
aMethod
,
false
);
var
nestedCascadingTitle
=
GetCodeFixTitle
(
FeaturesResources
.
Add_parameter_to_0_and_overrides_implementations
,
aMethod
,
includeParameters
:
false
);
builder
.
Add
(
new
CodeAction
.
CodeActionWithNestedActions
(
nestedCascadingTitle
,
cascadingActions
,
isInlinable
:
false
));
builder
.
Add
(
new
CodeAction
.
CodeActionWithNestedActions
(
nestedCascadingTitle
,
cascadingActions
,
isInlinable
:
false
));
}
}
return
builder
.
ToImmutable
();
return
builder
.
ToImmutable
AndFree
();
}
}
}
}
private
ImmutableArray
<
CodeFixData
>
PrepareCreationOfCodeActions
(
Document
document
,
SeparatedSyntaxList
<
TArgumentSyntax
>
arguments
,
ImmutableArray
<
ArgumentInsertPositionData
<
TArgumentSyntax
>>
methodsAndArgumentsToAdd
)
private
ImmutableArray
<
CodeFixData
>
PrepareCreationOfCodeActions
(
Document
document
,
SeparatedSyntaxList
<
TArgumentSyntax
>
arguments
,
ImmutableArray
<
ArgumentInsertPositionData
<
TArgumentSyntax
>>
methodsAndArgumentsToAdd
)
{
{
var
builder
=
ImmutableArray
.
CreateBuilder
<
CodeFixData
>
(
methodsAndArgumentsToAdd
.
Length
);
var
builder
=
ArrayBuilder
<
CodeFixData
>.
GetInstance
(
methodsAndArgumentsToAdd
.
Length
);
// Order by the furthest argument index to the nearest argument index. The ones with
// Order by the furthest argument index to the nearest argument index. The ones with
// larger argument indexes mean that we matched more earlier arguments (and thus are
// larger argument indexes mean that we matched more earlier arguments (and thus are
...
@@ -286,7 +292,7 @@ private ImmutableArray<CodeFixData> PrepareCreationOfCodeActions(Document docume
...
@@ -286,7 +292,7 @@ private ImmutableArray<CodeFixData> PrepareCreationOfCodeActions(Document docume
builder
.
Add
(
codeFixData
);
builder
.
Add
(
codeFixData
);
}
}
return
builder
.
ToImmutable
();
return
builder
.
ToImmutable
AndFree
();
}
}
/// <summary>
/// <summary>
...
@@ -422,8 +428,8 @@ private static string GetCodeFixTitle(string resourceString, IMethodSymbol metho
...
@@ -422,8 +428,8 @@ private static string GetCodeFixTitle(string resourceString, IMethodSymbol metho
AddParameter
(
AddParameter
(
syntaxFacts
,
editor
,
methodNode
,
argument
,
syntaxFacts
,
editor
,
methodNode
,
argument
,
insertionIndex
,
parameterDeclaration
,
cancellationToken
);
insertionIndex
,
parameterDeclaration
,
cancellationToken
);
}
}
var
newRoot
=
editor
.
GetChangedRoot
();
var
newRoot
=
editor
.
GetChangedRoot
();
solution
=
solution
.
WithDocumentSyntaxRoot
(
document
.
Id
,
newRoot
);
solution
=
solution
.
WithDocumentSyntaxRoot
(
document
.
Id
,
newRoot
);
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录