Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lwm1986
roslyn
提交
5fdfc33f
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,发现更多精彩内容 >>
提交
5fdfc33f
编写于
1月 03, 2020
作者:
I
Ivan Basov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
existing change signature service tests fixed
上级
f07ea360
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
33 addition
and
9 deletion
+33
-9
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.InvocationErrors.vb
...est/ChangeSignature/ReorderParameters.InvocationErrors.vb
+2
-2
src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs
.../Portable/ChangeSignature/CSharpChangeSignatureService.cs
+22
-2
src/Features/VisualBasic/Portable/ChangeSignature/VisualBasicChangeSignatureService.vb
...able/ChangeSignature/VisualBasicChangeSignatureService.vb
+9
-5
未找到文件。
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.InvocationErrors.vb
浏览文件 @
5fdfc33f
...
...
@@ -30,14 +30,14 @@ End Class]]></Text>.NormalizedValue()
End
Function
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
ChangeSignature
)
>
Public
Async
Function
TestReorderMethodParameters_
InsufficientParameters_None
()
As
Task
Public
Async
Function
TestReorderMethodParameters_
NoExistingParameters
()
As
Task
Dim
markup
=
<
Text
><
!
[
CDATA
[
Class
C
Sub
$$
M
()
End
Sub
End
Class
]]
></
Text
>
.
NormalizedValue
()
Await
TestChangeSignatureViaCommandAsync
(
LanguageNames
.
VisualBasic
,
markup
,
expectedSuccess
:
=
False
,
expectedErrorText
:
=
FeaturesResources
.
This_signature_does_not_contain_parameters_that_can_be_changed
)
Await
TestChangeSignatureViaCommandAsync
(
LanguageNames
.
VisualBasic
,
markup
,
expectedSuccess
:
=
True
)
End
Function
<
WpfFact
,
Trait
(
Traits
.
Feature
,
Traits
.
Features
.
ChangeSignature
)
>
...
...
src/Features/CSharp/Portable/ChangeSignature/CSharpChangeSignatureService.cs
浏览文件 @
5fdfc33f
...
...
@@ -448,9 +448,12 @@ private SyntaxNode GetNodeContainingTargetNode(SyntaxNode matchingNode)
return
null
;
}
private
SeparatedSyntaxList
<
ArgumentSyntax
>
AddNewArgumentsToList
(
SeparatedSyntaxList
<
ArgumentSyntax
>
newArguments
,
SignatureChange
signaturePermutation
)
private
SeparatedSyntaxList
<
ArgumentSyntax
>
AddNewArgumentsToList
(
SeparatedSyntaxList
<
ArgumentSyntax
>
newArguments
,
SignatureChange
signaturePermutation
)
{
List
<
ArgumentSyntax
>
fullList
=
new
List
<
ArgumentSyntax
>();
List
<
SyntaxToken
>
separators
=
new
List
<
SyntaxToken
>();
var
updatedParameters
=
signaturePermutation
.
UpdatedConfiguration
.
ToListOfParameters
();
...
...
@@ -468,6 +471,7 @@ private SeparatedSyntaxList<ArgumentSyntax> AddNewArgumentsToList(SeparatedSynta
seenNameEquals
?
SyntaxFactory
.
NameColon
(
addedParameter
.
Name
)
:
default
,
refKindKeyword
:
default
,
expression
:
SyntaxFactory
.
ParseExpression
(
addedParameter
.
CallsiteValue
)));
separators
.
Add
(
SyntaxFactory
.
Token
(
SyntaxKind
.
CommaToken
));
}
}
else
...
...
@@ -479,12 +483,28 @@ private SeparatedSyntaxList<ArgumentSyntax> AddNewArgumentsToList(SeparatedSynta
seenNameEquals
=
true
;
}
if
(
indexInExistingList
<
newArguments
.
SeparatorCount
)
{
separators
.
Add
(
newArguments
.
GetSeparator
(
indexInExistingList
));
}
fullList
.
Add
(
newArguments
[
indexInExistingList
++]);
}
}
}
return
SyntaxFactory
.
SeparatedList
(
fullList
);
// Add the rest of existing parameters, e.g. from the params argument.
while
(
indexInExistingList
<
newArguments
.
Count
)
{
if
(
indexInExistingList
<
newArguments
.
SeparatorCount
)
{
separators
.
Add
(
newArguments
.
GetSeparator
(
indexInExistingList
));
}
fullList
.
Add
(
newArguments
[
indexInExistingList
++]);
}
return
SyntaxFactory
.
SeparatedList
(
fullList
,
separators
);
}
private
SeparatedSyntaxList
<
T
>
PermuteDeclaration
<
T
>(
SeparatedSyntaxList
<
T
>
list
,
SignatureChange
updatedSignature
)
where
T
:
SyntaxNode
...
...
src/Features/VisualBasic/Portable/ChangeSignature/VisualBasicChangeSignatureService.vb
浏览文件 @
5fdfc33f
...
...
@@ -10,6 +10,7 @@ Imports Microsoft.CodeAnalysis.Formatting
Imports
Microsoft.CodeAnalysis.Host.Mef
Imports
Microsoft.CodeAnalysis.PooledObjects
Imports
System.Composition
Imports
Microsoft.CodeAnalysis.Utilities
Namespace
Microsoft.CodeAnalysis.VisualBasic.ChangeSignature
<
ExportLanguageService
(
GetType
(
AbstractChangeSignatureService
),
LanguageNames
.
VisualBasic
),
[
Shared
]
>
...
...
@@ -425,17 +426,20 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.ChangeSignature
End
Function
Private
Function
PermuteDeclaration
(
Of
T
As
SyntaxNode
)(
list
As
SeparatedSyntaxList
(
Of
T
),
updatedSignature
As
SignatureChange
)
As
SeparatedSyntaxList
(
Of
T
)
Dim
originalParameter
s
=
updatedSignature
.
OriginalConfiguration
.
ToListOfParameters
()
Dim
originalParameter
Symbols
=
updatedSignature
.
OriginalConfiguration
.
ToListOfParameters
().
Select
(
Function
(
p
)
p
.
Symbol
).
ToArray
()
Dim
reorderedParameters
=
updatedSignature
.
UpdatedConfiguration
.
ToListOfParameters
()
Dim
newParameters
=
New
List
(
Of
T
)
For
Each
newParam
In
reorderedParameters
Dim
pos
=
originalParameters
.
IndexOf
(
newParam
)
Dim
param
=
list
(
pos
)
newParameters
.
Add
(
param
)
Dim
existingParam
=
TryCast
(
newParam
,
ExistingParameter
)
If
existingParam
IsNot
Nothing
Then
Dim
pos
=
originalParameterSymbols
.
IndexOf
(
existingParam
.
Symbol
)
Dim
param
=
list
(
pos
)
newParameters
.
Add
(
param
)
End
If
Next
Dim
numSeparatorsToSkip
=
originalParameter
s
.
Count
-
reorderedParameters
.
Count
Dim
numSeparatorsToSkip
=
originalParameter
Symbols
.
Length
-
reorderedParameters
.
Count
Return
SyntaxFactory
.
SeparatedList
(
newParameters
,
GetSeparators
(
list
,
numSeparatorsToSkip
))
End
Function
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录