Skip to content

R
roslyn

lwm1986 / roslyn
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
R
roslyn

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

未验证 提交 e03e7a46 编写于 作者: D David 提交者： GitHub
浏览文件
操作

Merge pull request #47768 from dibarbet/async_change_sig 

Make change signature more async and remove UI dialogs from the service
上级 3237fbf5 2d7a49a8
隐藏空白更改
内联 并排
Showing with 645 addition and 574 deletion
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.AddImports.cs
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameterAddsAllImports()
{
var markup = @"
......@@ -48,7 +48,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameterAddsOnlyMissingImports()
{
var markup = @"
......@@ -82,7 +82,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameterAddsImportsOnCascading()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Cascading.cs
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToImplementedMethod()
{
var markup = @"
......@@ -50,7 +50,7 @@ public void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToImplementedMethod_WithTuples()
{
var markup = @"
......@@ -84,7 +84,7 @@ public void M((string a, string b) y, int newIntegerParameter, (int, int) x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToImplementingMethod()
{
var markup = @"
......@@ -118,7 +118,7 @@ public void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToOverriddenMethod()
{
var markup = @"
......@@ -154,7 +154,7 @@ public override void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToOverridingMethod()
{
var markup = @"
......@@ -190,7 +190,7 @@ public override void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToOverriddenMethod_Transitive()
{
var markup = @"
......@@ -238,7 +238,7 @@ public override void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToOverridingMethod_Transitive()
{
var markup = @"
......@@ -286,7 +286,7 @@ public override void M(string y, int newIntegerParameter, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToMethods_Complex()
{
//// B I I2
......@@ -323,7 +323,7 @@ class C : I3 { public void M(string y, int newIntegerParameter, int x) { } }";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Cascade_ToMethods_WithDifferentParameterNames()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Delegates.cs
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_ImplicitInvokeCalls()
{
var markup = @"
......@@ -50,7 +50,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_ExplicitInvokeCalls()
{
var markup = @"
......@@ -84,7 +84,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_BeginInvokeCalls()
{
var markup = @"
......@@ -118,7 +118,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 2);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_AnonymousMethods()
{
var markup = @"
......@@ -153,7 +153,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Lambdas()
{
var markup = @"
......@@ -186,7 +186,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Lambdas_RemovingOnlyParameterIntroducesParentheses()
{
var markup = @"
......@@ -221,7 +221,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughMethodGroups_AssignedToVariable()
{
var markup = @"
......@@ -264,7 +264,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughMethodGroups_DelegateConstructor()
{
var markup = @"
......@@ -305,7 +305,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughMethodGroups_PassedAsArgument()
{
var markup = @"
......@@ -350,7 +350,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughMethodGroups_ReturnValue()
{
var markup = @"
......@@ -399,7 +399,7 @@ private MyDelegate Result()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughMethodGroups_YieldReturnValue()
{
var markup = @"
......@@ -450,7 +450,7 @@ private IEnumerable<MyDelegate> Result()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_ReferencingLambdas_MethodArgument()
{
var markup = @"
......@@ -485,7 +485,7 @@ void M6()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_ReferencingLambdas_YieldReturn()
{
var markup = @"
......@@ -518,7 +518,7 @@ private IEnumerable<MyDelegate> Result3()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Recursive()
{
var markup = @"
......@@ -551,7 +551,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_DocComments()
{
var markup = @"
......@@ -614,7 +614,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_CascadeThroughEventAdd()
{
var markup = @"
......@@ -651,7 +651,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Generics1()
{
var markup = @"
......@@ -696,7 +696,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Generics2()
{
var markup = @"
......@@ -725,7 +725,7 @@ public class D17Test
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_GenericParams()
{
var markup = @"
......@@ -778,7 +778,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegates_Generic_RemoveArgumentAtReference()
{
var markup = @"public class CD<T>
......@@ -810,7 +810,7 @@ public void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Delegate_Generics_RemoveStaticArgument()
{
var markup = @"
......@@ -853,7 +853,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestAddParameter_Delegates_Relaxation_ParameterlessFunctionToFunction()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.Formatting.cs
浏览文件 @ e03e7a46
......@@ -17,7 +17,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_KeepCountsPerLine()
{
var markup = @"
......@@ -55,7 +55,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_KeepTrivia()
{
......@@ -95,7 +95,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_KeepTrivia_WithArgumentNames()
{
......@@ -135,7 +135,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_Method()
{
var markup = @"
......@@ -165,7 +165,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_Constructor()
{
var markup = @"
......@@ -195,7 +195,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_Indexer()
{
var markup = @"
......@@ -231,7 +231,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_Delegate()
{
var markup = @"
......@@ -269,7 +269,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_AnonymousMethod()
{
var markup = @"
......@@ -309,7 +309,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_ConstructorInitializers()
{
var markup = @"
......@@ -349,7 +349,7 @@ class D : B
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_Attribute()
{
var markup = @"
......@@ -373,7 +373,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_Attribute_KeepTrivia()
{
......@@ -397,7 +397,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_Attribute_KeepTrivia_RemovingSecond()
{
......@@ -421,7 +421,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_Attribute_KeepTrivia_RemovingBothAddingNew()
{
......@@ -444,7 +444,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task AddParameter_Formatting_Attribute_KeepTrivia_RemovingBeforeNewlineComma()
{
......@@ -469,7 +469,7 @@ class CustomAttribute : System.Attribute
}
[WorkItem(946220, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/946220")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_LambdaAsArgument()
{
var markup = @"class C
......@@ -493,7 +493,7 @@ void M(System.Action<int, int> f, byte bb)
}
[WorkItem(46595, "https://github.com/dotnet/roslyn/issues/46595")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_PreserveIndentBraces()
{
var markup =
......@@ -518,7 +518,7 @@ public void M(int a)
}
[WorkItem(46595, "https://github.com/dotnet/roslyn/issues/46595")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameter_Formatting_PreserveIndentBraces_Editorconfig()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.OptionalParameter.Infer.cs
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_NoOptions()
{
var markup = @"
......@@ -41,7 +41,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_SingleLocal()
{
var markup = @"
......@@ -68,7 +68,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_NotOnInaccessibleLocal()
{
var markup = @"
......@@ -95,7 +95,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_MultipleLocals()
{
var markup = @"
......@@ -124,7 +124,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_SingleParameter()
{
var markup = @"
......@@ -150,7 +150,7 @@ void M(int x, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_SingleField()
{
var markup = @"
......@@ -179,7 +179,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_SingleProperty()
{
var markup = @"
......@@ -208,7 +208,7 @@ void M(int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddOptionalParameter_CallsiteInferred_ImplicitlyConvertable()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/AddParameterTests.cs
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameters()
{
var markup = @"
......@@ -111,7 +111,7 @@ static void M(this object o, string b, int newIntegerParameter, string newString
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameterToParameterlessMethod()
{
var markup = @"
......@@ -136,7 +136,7 @@ static void M(int newIntegerParameter)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderLocalFunctionParametersAndArguments_OnDeclaration()
{
var markup = @"
......@@ -171,7 +171,7 @@ void Goo(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderLocalFunctionParametersAndArguments_OnInvocation()
{
var markup = @"
......@@ -206,7 +206,7 @@ void Goo(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderMethodParameters()
{
var markup = @"
......@@ -233,7 +233,7 @@ public void Goo(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderMethodParametersAndArguments()
{
var markup = @"
......@@ -262,7 +262,7 @@ public void Goo(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderMethodParametersAndArgumentsOfNestedCalls()
{
var markup = @"
......@@ -291,7 +291,7 @@ public int Goo(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderConstructorParametersAndArguments()
{
var markup = @"
......@@ -344,7 +344,7 @@ public MyClass(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderAttributeConstructorParametersAndArguments()
{
var markup = @"
......@@ -379,7 +379,7 @@ public MyAttribute(int y, byte b, string x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderExtensionMethodParametersAndArguments_StaticCall()
{
var markup = @"
......@@ -426,7 +426,7 @@ public static void M(this C goo, int y, int x, byte b, string c = ""test_c"", st
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderExtensionMethodParametersAndArguments_ExtensionCall()
{
var markup = @"
......@@ -470,7 +470,7 @@ public static void M(this C goo, int y, int x, byte b, string c = ""test_c"", st
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddParameterWithOmittedArgument_ParamsAsArray()
{
var markup = @"
......@@ -498,7 +498,7 @@ void M(int x, int y, int z = 3, params int[] p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamsMethodParametersAndArguments_ParamsAsArray()
{
var markup = @"
......@@ -526,7 +526,7 @@ void M(int y, int x, byte b, params int[] p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamsMethodParametersAndArguments_ParamsExpanded()
{
var markup = @"
......@@ -555,7 +555,7 @@ void M(int y, int x, byte b, params int[] p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderExtensionAndParamsMethodParametersAndArguments_VariedCallsites()
{
var markup = @"
......@@ -606,7 +606,7 @@ public static void M(this C goo, int y, int x, byte b, string c = ""test_c"", st
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderIndexerParametersAndArguments()
{
var markup = @"
......@@ -647,7 +647,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_SingleLineDocComments_OnIndividualLines()
{
var markup = @"
......@@ -682,7 +682,7 @@ void Goo(int c, int b, byte bb, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_SingleLineDocComments_OnSameLine()
{
var markup = @"
......@@ -713,7 +713,7 @@ void Goo(int c, int b, byte bb, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_SingleLineDocComments_MixedLineDistribution()
{
var markup = @"
......@@ -757,7 +757,7 @@ void Goo(int f, int e, int d, int c, byte bb, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_SingleLineDocComments_MixedWithRegularComments()
{
var markup = @"
......@@ -794,7 +794,7 @@ void Goo(int e, int d, int c, byte b, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_MultiLineDocComments_OnSeparateLines1()
{
var markup = @"
......@@ -831,7 +831,7 @@ static void M(int z, byte b, int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_MultiLineDocComments_OnSingleLine()
{
var markup = @"
......@@ -860,7 +860,7 @@ static void M(int z, byte b, int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_IncorrectOrder_MaintainsOrder()
{
var markup = @"
......@@ -893,7 +893,7 @@ void Goo(int c, byte bb, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_WrongNames_MaintainsOrder()
{
var markup = @"
......@@ -926,7 +926,7 @@ void Goo(int c, byte b, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_InsufficientTags_MaintainsOrder()
{
var markup = @"
......@@ -957,7 +957,7 @@ void Goo(int c, byte b, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_ExcessiveTags_MaintainsOrder()
{
var markup = @"
......@@ -992,7 +992,7 @@ void Goo(int c, byte bb, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_OnConstructors()
{
var markup = @"
......@@ -1026,7 +1026,7 @@ public C(int c, byte bb, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParamTagsInDocComments_OnIndexers()
{
var markup = @"
......@@ -1062,7 +1062,7 @@ public class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParametersInCrefs()
{
var markup = @"
......@@ -1091,7 +1091,7 @@ void M(string y, byte b, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParametersInMethodThatImplementsInterfaceMethodOnlyThroughADerivedType1()
{
var markup = @"
......@@ -1134,7 +1134,7 @@ class D : C, I
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task AddAndReorderParametersInMethodThatImplementsInterfaceMethodOnlyThroughADerivedType2()
{
var markup = @"
......@@ -1177,7 +1177,7 @@ class D : C, I
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(43664, "https://github.com/dotnet/roslyn/issues/43664")]
public async Task AddParameterOnUnparenthesizedLambda()
{
......@@ -1225,7 +1225,7 @@ static void M(string[] args)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(44126, "https://github.com/dotnet/roslyn/issues/44126")]
public async Task AddAndReorderImplicitObjectCreationParameter()
{
......
src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignatureTests.cs
浏览文件 @ e03e7a46
......@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WorkItem(8333, "https://github.com/dotnet/roslyn/issues/8333")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInExpressionBody()
{
var markup = @"
......@@ -28,7 +28,7 @@ class Ext
}
[WorkItem(1905, "https://github.com/dotnet/roslyn/issues/1905")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestAfterSemicolonForInvocationInExpressionStatement_ViaCommand()
{
var markup = @"
......@@ -65,7 +65,7 @@ static void Main(string[] args)
expectedUpdatedInvocationDocumentCode: expectedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestOnLambdaWithTwoDiscardParameters_ViaCommand()
{
var markup = @"
......@@ -92,7 +92,7 @@ static void M()
expectedUpdatedInvocationDocumentCode: expectedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestOnAnonymousMethodWithTwoParameters_ViaCommand()
{
var markup = @"
......@@ -106,7 +106,7 @@ static void M()
await TestMissingAsync(markup);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestOnAnonymousMethodWithTwoDiscardParameters_ViaCommand()
{
var markup = @"
......@@ -120,7 +120,7 @@ static void M()
await TestMissingAsync(markup);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestAfterSemicolonForInvocationInExpressionStatement_ViaCodeAction()
{
var markup = @"
......@@ -141,7 +141,7 @@ static void Main(string[] args)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingWhitespace()
{
var markup = @"
......@@ -157,7 +157,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingTrivia()
{
var markup = @"
......@@ -173,7 +173,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingTrivia2()
{
var markup = @"
......@@ -189,7 +189,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingDocComment()
{
var markup = @"
......@@ -205,7 +205,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingDocComment2()
{
var markup = @"
......@@ -221,7 +221,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingAttributes1()
{
var markup = @"
......@@ -237,7 +237,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingAttributes2()
{
var markup = @"
......@@ -253,7 +253,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInLeadingAttributes3()
{
var markup = @"
......@@ -269,7 +269,7 @@ void Goo(int a, int b)
}
[WorkItem(17309, "https://github.com/dotnet/roslyn/issues/17309")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task TestNotInConstraints()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignature_CheckAllSignatureChanges.cs
浏览文件 @ e03e7a46
......@@ -15,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfTheory, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Theory, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[MemberData(nameof(AbstractChangeSignatureTests.GetAllSignatureSpecificationsForTheory), new[] { 1, 3, 2, 1 }, MemberType = typeof(AbstractChangeSignatureTests))]
public async Task TestAllSignatureChanges_1This_3Regular_2Default_1Params(int totalParameters, int[] signature)
{
......@@ -70,7 +70,7 @@ static class Ext
verifyNoDiagnostics: true);
}
[WpfTheory, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Theory, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[MemberData(nameof(AbstractChangeSignatureTests.GetAllSignatureSpecificationsForTheory), new[] { 0, 3, 0, 0 }, MemberType = typeof(AbstractChangeSignatureTests))]
public async Task TestAllSignatureChanges_OnDelegate_3Regular(int totalParameters, int[] signature)
{
......
src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignature_Delegates.cs
浏览文件 @ e03e7a46
......@@ -23,7 +23,7 @@ protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspa
protected internal override string GetLanguage()
=> LanguageNames.CSharp;
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_ImplicitInvokeCalls()
{
var markup = @"
......@@ -53,7 +53,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_ExplicitInvokeCalls()
{
var markup = @"
......@@ -83,7 +83,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_BeginInvokeCalls()
{
var markup = @"
......@@ -113,7 +113,7 @@ void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 2);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_AnonymousMethods()
{
var markup = @"
......@@ -144,7 +144,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Lambdas()
{
var markup = @"
......@@ -173,7 +173,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Lambdas_RemovingOnlyParameterIntroducesParentheses()
{
var markup = @"
......@@ -206,7 +206,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughMethodGroups_AssignedToVariable()
{
var markup = @"
......@@ -245,7 +245,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughMethodGroups_DelegateConstructor()
{
var markup = @"
......@@ -282,7 +282,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughMethodGroups_PassedAsArgument()
{
var markup = @"
......@@ -323,7 +323,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughMethodGroups_ReturnValue()
{
var markup = @"
......@@ -368,7 +368,7 @@ private MyDelegate Result()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughMethodGroups_YieldReturnValue()
{
var markup = @"
......@@ -415,7 +415,7 @@ private IEnumerable<MyDelegate> Result()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_ReferencingLambdas_MethodArgument()
{
var markup = @"
......@@ -446,7 +446,7 @@ void M6()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_ReferencingLambdas_YieldReturn()
{
var markup = @"
......@@ -475,7 +475,7 @@ private IEnumerable<MyDelegate> Result3()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Recursive()
{
var markup = @"
......@@ -504,7 +504,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_DocComments()
{
var markup = @"
......@@ -563,7 +563,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_CascadeThroughEventAdd()
{
var markup = @"
......@@ -596,7 +596,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Generics1()
{
var markup = @"
......@@ -639,7 +639,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Generics2()
{
var markup = @"
......@@ -666,7 +666,7 @@ public class D17Test
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_GenericParams()
{
var markup = @"
......@@ -717,7 +717,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegates_Generic_RemoveArgumentAtReference()
{
var markup = @"public class CD<T>
......@@ -747,7 +747,7 @@ public void M()
expectedUpdatedInvocationDocumentCode: expectedUpdatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Delegate_Generics_RemoveStaticArgument()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/ChangeSignature_Formatting.cs
浏览文件 @ e03e7a46
......@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_KeepCountsPerLine()
{
var markup = @"
......@@ -45,7 +45,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_KeepTrivia()
{
......@@ -78,7 +78,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_KeepTrivia_WithArgumentNames()
{
......@@ -111,7 +111,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_Method()
{
var markup = @"
......@@ -138,7 +138,7 @@ class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_Constructor()
{
var markup = @"
......@@ -165,7 +165,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_Indexer()
{
var markup = @"
......@@ -198,7 +198,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_Delegate()
{
var markup = @"
......@@ -233,7 +233,7 @@ class SomeClass
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_AnonymousMethod()
{
var markup = @"
......@@ -270,7 +270,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_ConstructorInitializers()
{
var markup = @"
......@@ -307,7 +307,7 @@ class D : B
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_Attribute()
{
var markup = @"
......@@ -328,7 +328,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_Attribute_KeepTrivia()
{
......@@ -350,7 +350,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_Attribute_KeepTrivia_RemovingSecond()
{
......@@ -372,7 +372,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_Attribute_KeepTrivia_RemovingBoth()
{
......@@ -394,7 +394,7 @@ class CustomAttribute : System.Attribute
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: expectedUpdatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(28156, "https://github.com/dotnet/roslyn/issues/28156")]
public async Task ChangeSignature_Formatting_Attribute_KeepTrivia_RemovingBeforeNewlineComma()
{
......@@ -416,7 +416,7 @@ class CustomAttribute : System.Attribute
}
[WorkItem(946220, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/946220")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ChangeSignature_Formatting_LambdaAsArgument()
{
var markup = @"class C
......
src/EditorFeatures/CSharpTest/ChangeSignature/RemoveParametersTests.cs
浏览文件 @ e03e7a46
......@@ -25,7 +25,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task RemoveParameters1()
{
var markup = @"
......@@ -115,7 +115,7 @@ static void M(this object o, string b, string y = ""Zero"")
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task RemoveParameters_GenericParameterType()
{
var markup = @"
......@@ -185,7 +185,7 @@ void B()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: updatedSignature, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(1102830, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1102830")]
[WorkItem(784, "https://github.com/dotnet/roslyn/issues/784")]
public async Task RemoveParameters_ExtensionMethodInAnotherFile()
......@@ -248,10 +248,10 @@ void M()
using var testState = ChangeSignatureTestState.Create(XElement.Parse(workspaceXml));
testState.TestChangeSignatureOptionsService.UpdatedSignature = updatedSignature;
var result = testState.ChangeSignature();
var result = await testState.ChangeSignatureAsync().ConfigureAwait(false);
Assert.True(result.Succeeded);
Assert.Null(testState.ErrorMessage);
Assert.Null(result.ChangeSignatureFailureKind);
foreach (var updatedDocument in testState.Workspace.Documents.Select(d => result.UpdatedSolution.GetDocument(d.Id)))
{
......@@ -266,7 +266,7 @@ void M()
}
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[WorkItem(1102830, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/1102830")]
[WorkItem(784, "https://github.com/dotnet/roslyn/issues/784")]
public async Task AddRemoveParameters_ExtensionMethodInAnotherFile()
......@@ -330,10 +330,10 @@ void M()
using var testState = ChangeSignatureTestState.Create(XElement.Parse(workspaceXml));
testState.TestChangeSignatureOptionsService.UpdatedSignature = updatedSignature;
var result = testState.ChangeSignature();
var result = await testState.ChangeSignatureAsync().ConfigureAwait(false);
Assert.True(result.Succeeded);
Assert.Null(testState.ErrorMessage);
Assert.Null(result.ChangeSignatureFailureKind);
foreach (var updatedDocument in testState.Workspace.Documents.Select(d => result.UpdatedSolution.GetDocument(d.Id)))
{
......@@ -381,7 +381,7 @@ class C
}
[WorkItem(44126, "https://github.com/dotnet/roslyn/issues/44126")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task RemoveParameters_ImplicitObjectCreation()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/ReorderParametersTests.Cascading.cs
浏览文件 @ e03e7a46
......@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToImplementedMethod()
{
var markup = @"
......@@ -44,7 +44,7 @@ public void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToImplementedMethod_WithTuples()
{
var markup = @"
......@@ -74,7 +74,7 @@ public void M((string a, string b) y, (int, int) x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToImplementingMethod()
{
var markup = @"
......@@ -104,7 +104,7 @@ public void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToOverriddenMethod()
{
var markup = @"
......@@ -136,7 +136,7 @@ public override void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToOverridingMethod()
{
var markup = @"
......@@ -168,7 +168,7 @@ public override void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToOverriddenMethod_Transitive()
{
var markup = @"
......@@ -212,7 +212,7 @@ public override void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToOverridingMethod_Transitive()
{
var markup = @"
......@@ -256,7 +256,7 @@ public override void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToMethods_Complex()
{
//// B I I2
......@@ -289,7 +289,7 @@ class C : I3 { public void M(string y, int x) { } }";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParameters_Cascade_ToMethods_WithDifferentParameterNames()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/ReorderParametersTests.InvocationErrors.cs
浏览文件 @ e03e7a46
......@@ -5,6 +5,7 @@
#nullable disable
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.ChangeSignature;
using Microsoft.CodeAnalysis.Editor.UnitTests.ChangeSignature;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
......@@ -14,7 +15,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnClassName_ShouldFail()
{
var markup = @"
......@@ -26,10 +27,10 @@ public void Goo(int x, string y)
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.IncorrectKind);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnField_ShouldFail()
{
var markup = @"
......@@ -43,17 +44,17 @@ public void Goo(int x, string y)
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.IncorrectKind);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CanBeStartedEvenWithNoParameters()
{
var markup = @"class C { void $$M() { } }";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: true);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnOverloadedOperator_ShouldFail()
{
var markup = @"
......@@ -65,7 +66,7 @@ class C
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.IncorrectKind);
}
}
}
src/EditorFeatures/CSharpTest/ChangeSignature/ReorderParametersTests.InvocationLocation.cs
浏览文件 @ e03e7a46
......@@ -5,6 +5,7 @@
#nullable disable
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.ChangeSignature;
using Microsoft.CodeAnalysis.Editor.UnitTests.ChangeSignature;
using Microsoft.CodeAnalysis.Test.Utilities;
using Roslyn.Test.Utilities;
......@@ -16,7 +17,7 @@ public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
#region Methods
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeBeforeMethodName()
{
var markup = @"
......@@ -41,7 +42,7 @@ public void Goo(string y, int x)
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeInParameterList()
{
var markup = @"
......@@ -66,7 +67,7 @@ public void Goo(string y, int x)
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeAfterParameterList()
{
var markup = @"
......@@ -90,7 +91,7 @@ public void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeBeforeMethodDeclaration()
{
var markup = @"
......@@ -114,7 +115,7 @@ public void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnMetadataReference_InIdentifier_ShouldFail()
{
var markup = @"
......@@ -126,10 +127,10 @@ static void Main(string[] args)
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.The_member_is_defined_in_metadata);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.DefinedInMetadata);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnMetadataReference_AtBeginningOfInvocation_ShouldFail()
{
var markup = @"
......@@ -141,10 +142,10 @@ static void Main(string[] args)
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.The_member_is_defined_in_metadata);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.DefinedInMetadata);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnMetadataReference_InArgumentsOfInvocation_ShouldFail()
{
var markup = @"
......@@ -156,10 +157,10 @@ static void Main(string[] args)
}
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.The_member_is_defined_in_metadata);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.DefinedInMetadata);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnMetadataReference_AfterInvocation_ShouldFail()
{
var markup = @"
......@@ -168,10 +169,10 @@ class C
string s = ((System.IFormattable)null).ToString(""test"", null)$$;
}";
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedErrorText: FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate);
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, expectedSuccess: false, expectedFailureReason: ChangeSignatureFailureKind.IncorrectKind);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeInMethodBody_ViaCommand()
{
var markup = @"
......@@ -188,7 +189,7 @@ public void Goo(int x, string y)
LanguageNames.CSharp, markup, expectedSuccess: false);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeInMethodBody_ViaSmartTag()
{
var markup = @"
......@@ -204,7 +205,7 @@ public void Goo(int x, string y)
await TestMissingAsync(markup);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_BeginningOfIdentifier()
{
var markup = @"
......@@ -238,7 +239,7 @@ public void Bar(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_ArgumentList()
{
var markup = @"
......@@ -272,7 +273,7 @@ public void Bar(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_NestedCalls1()
{
var markup = @"
......@@ -316,7 +317,7 @@ public int Baz(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_NestedCalls2()
{
var markup = @"
......@@ -360,7 +361,7 @@ public int Baz(int x, string y)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_NestedCalls3()
{
var markup = @"
......@@ -404,7 +405,7 @@ public int Baz(int x, string y)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_Attribute()
{
var markup = @"
......@@ -432,7 +433,7 @@ public MyAttribute(int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_OnlyHasCandidateSymbols()
{
var markup = @"
......@@ -454,7 +455,7 @@ class Test
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_CallToOtherConstructor()
{
var markup = @"
......@@ -484,7 +485,7 @@ public Program(int z, int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_InvokeOnReference_CallToBaseConstructor()
{
var markup = @"
......@@ -524,7 +525,7 @@ public D(int x, int y) : base(2, 1)
#region Indexers
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InvokeAtBeginningOfDeclaration()
{
var markup = @"
......@@ -551,7 +552,7 @@ class Program
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InParameters()
{
var markup = @"
......@@ -578,7 +579,7 @@ class Program
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InvokeAtEndOfDeclaration()
{
var markup = @"
......@@ -605,7 +606,7 @@ class Program
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InvokeInAccessor()
{
var markup = @"
......@@ -631,7 +632,7 @@ class Program
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InvokeOnReference_BeforeTarget()
{
var markup = @"
......@@ -667,7 +668,7 @@ void M(Program p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParameters_InvokeOnReference_InArgumentList()
{
var markup = @"
......@@ -708,7 +709,7 @@ void M(Program p)
#region Delegates
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderDelegateParameters_ObjectCreation1()
{
var markup = @"
......@@ -737,7 +738,7 @@ void T()
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderDelegateParameters_ObjectCreation2()
{
var markup = @"
......@@ -772,7 +773,7 @@ public void M()
#endregion
#region CodeRefactoring
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_InvokeBeforeMethodName()
{
var markup = @"
......@@ -795,7 +796,7 @@ public void Goo(string y, int x)
await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction: true, updatedSignature: permutation, expectedCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_NotInMethodBody()
{
var markup = @"
......@@ -810,7 +811,7 @@ public void Goo(int x, string y)
await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction: false);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_InLambda()
{
var markup = @"
......@@ -833,7 +834,7 @@ void M(int x)
await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction: true, updatedSignature: permutation, expectedCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_NotInLambdaBody()
{
var markup = @"
......@@ -847,7 +848,7 @@ void M(int x)
await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction: false);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_AtCallSite_ViaCommand()
{
var markup = @"
......@@ -872,7 +873,7 @@ void M(int y, int x)
expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters_CodeRefactoring_AtCallSite_ViaCodeAction()
{
var markup = @"
......
src/EditorFeatures/CSharpTest/ChangeSignature/ReorderParametersTests.cs
浏览文件 @ e03e7a46
......@@ -14,7 +14,7 @@ namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.ChangeSignature
{
public partial class ChangeSignatureTests : AbstractChangeSignatureTests
{
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderLocalFunctionParametersAndArguments_OnDeclaration()
{
var markup = @"
......@@ -46,7 +46,7 @@ void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderLocalFunctionParametersAndArguments_OnInvocation()
{
var markup = @"
......@@ -78,7 +78,7 @@ void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParameters()
{
var markup = @"
......@@ -102,7 +102,7 @@ public void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParametersAndArguments()
{
var markup = @"
......@@ -128,7 +128,7 @@ public void Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderMethodParametersAndArgumentsOfNestedCalls()
{
var markup = @"
......@@ -154,7 +154,7 @@ public int Goo(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderConstructorParametersAndArguments()
{
var markup = @"
......@@ -205,7 +205,7 @@ public MyClass(string y, int x)
}
[WorkItem(44126, "https://github.com/dotnet/roslyn/issues/44126")]
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderConstructorParametersAndArguments_ImplicitObjectCreation()
{
var markup = @"
......@@ -255,7 +255,7 @@ public MyClass(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderAttributeConstructorParametersAndArguments()
{
var markup = @"
......@@ -287,7 +287,7 @@ public MyAttribute(int y, string x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderExtensionMethodParametersAndArguments_StaticCall()
{
var markup = @"
......@@ -326,7 +326,7 @@ public static void M(this C goo, int y, int x, string c = ""test_c"", string b =
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderExtensionMethodParametersAndArguments_ExtensionCall()
{
var markup = @"
......@@ -363,7 +363,7 @@ public static void M(this C goo, int y, int x, string c = ""test_c"", string b =
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 1);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamsMethodParametersAndArguments_ParamsAsArray()
{
var markup = @"
......@@ -387,7 +387,7 @@ void M(int y, int x, params int[] p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamsMethodParametersAndArguments_ParamsExpanded()
{
var markup = @"
......@@ -411,7 +411,7 @@ void M(int y, int x, params int[] p)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderExtensionAndParamsMethodParametersAndArguments_VariedCallsites()
{
var markup = @"
......@@ -454,7 +454,7 @@ public static void M(this C goo, int y, int x, string c = ""test_c"", string b =
expectedUpdatedInvocationDocumentCode: updatedCode, expectedSelectedIndex: 0);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderIndexerParametersAndArguments()
{
var markup = @"
......@@ -492,7 +492,7 @@ void M()
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_SingleLineDocComments_OnIndividualLines()
{
var markup = @"
......@@ -522,7 +522,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_SingleLineDocComments_OnSameLine()
{
var markup = @"
......@@ -548,7 +548,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_SingleLineDocComments_MixedLineDistribution()
{
var markup = @"
......@@ -584,7 +584,7 @@ void Goo(int f, int e, int d, int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_SingleLineDocComments_MixedWithRegularComments()
{
var markup = @"
......@@ -614,7 +614,7 @@ void Goo(int e, int d, int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_MultiLineDocComments_OnSeparateLines1()
{
var markup = @"
......@@ -646,7 +646,7 @@ static void M(int z, int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_MultiLineDocComments_OnSingleLine()
{
var markup = @"
......@@ -670,7 +670,7 @@ static void M(int z, int y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_IncorrectOrder_MaintainsOrder()
{
var markup = @"
......@@ -699,7 +699,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_WrongNames_MaintainsOrder()
{
var markup = @"
......@@ -728,7 +728,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_InsufficientTags_MaintainsOrder()
{
var markup = @"
......@@ -755,7 +755,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_ExcessiveTags_MaintainsOrder()
{
var markup = @"
......@@ -786,7 +786,7 @@ void Goo(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_OnConstructors()
{
var markup = @"
......@@ -815,7 +815,7 @@ public C(int c, int b, int a)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParamTagsInDocComments_OnIndexers()
{
var markup = @"
......@@ -846,7 +846,7 @@ public class C
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParametersInCrefs()
{
var markup = @"
......@@ -872,7 +872,7 @@ void M(string y, int x)
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParametersInMethodThatImplementsInterfaceMethodOnlyThroughADerivedType1()
{
var markup = @"
......@@ -912,7 +912,7 @@ class D : C, I
await TestChangeSignatureViaCommandAsync(LanguageNames.CSharp, markup, updatedSignature: permutation, expectedUpdatedInvocationDocumentCode: updatedCode);
}
[WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
[Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)]
public async Task ReorderParametersInMethodThatImplementsInterfaceMethodOnlyThroughADerivedType2()
{
var markup = @"
......
src/EditorFeatures/Core/Implementation/ChangeSignature/AbstractChangeSignatureCommandHandler.cs
浏览文件 @ e03e7a46
......@@ -2,8 +2,7 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
#nullable disable
using System.Diagnostics.CodeAnalysis;
using Microsoft.CodeAnalysis.ChangeSignature;
using Microsoft.CodeAnalysis.Editor.Host;
using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
......@@ -15,6 +14,8 @@
using Microsoft.VisualStudio.Text;
using Microsoft.VisualStudio.Text.Editor;
using Microsoft.VisualStudio.Text.Editor.Commanding.Commands;
using Microsoft.VisualStudio.Utilities;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.Editor.Implementation.ChangeSignature
{
......@@ -43,7 +44,7 @@ public bool ExecuteCommand(RemoveParametersCommandArgs args, CommandExecutionCon
public bool ExecuteCommand(ReorderParametersCommandArgs args, CommandExecutionContext context)
=> ExecuteCommand(args.TextView, args.SubjectBuffer, context);
private static bool IsAvailable(ITextBuffer subjectBuffer, out Workspace workspace)
private static bool IsAvailable(ITextBuffer subjectBuffer, [NotNullWhen(true)] out Workspace? workspace)
=> subjectBuffer.TryGetWorkspace(out workspace) &&
workspace.CanApplyChange(ApplyChangesKind.ChangeDocument) &&
subjectBuffer.SupportsRefactorings();
......@@ -70,62 +71,98 @@ private bool ExecuteCommand(ITextView textView, ITextBuffer subjectBuffer, Comma
return false;
}
var reorderParametersService = document.GetLanguageService<AbstractChangeSignatureService>();
var result = reorderParametersService.ChangeSignature(
var changeSignatureService = document.GetRequiredLanguageService<AbstractChangeSignatureService>();
var cancellationToken = context.OperationContext.UserCancellationToken;
// Async operation to determine the change signature
var changeSignatureContext = changeSignatureService.GetChangeSignatureContextAsync(
document,
caretPoint.Value.Position,
(errorMessage, severity) =>
{
// We are about to show a modal UI dialog so we should take over the command execution
// wait context. That means the command system won't attempt to show its own wait dialog
// and also will take it into consideration when measuring command handling duration.
context.OperationContext.TakeOwnership();
workspace.Services.GetService<INotificationService>().SendNotification(errorMessage, severity: severity);
},
context.OperationContext.UserCancellationToken);
if (result == null || !result.Succeeded)
{
return true;
}
restrictToDeclarations: false,
cancellationToken).WaitAndGetResult(context.OperationContext.UserCancellationToken);
var finalSolution = result.UpdatedSolution;
// UI thread bound operation to show the change signature dialog.
var changeSignatureOptions = AbstractChangeSignatureService.GetChangeSignatureOptions(changeSignatureContext);
var previewService = workspace.Services.GetService<IPreviewDialogService>();
if (previewService != null && result.PreviewChanges)
{
// We are about to show a modal UI dialog so we should take over the command execution
// wait context. That means the command system won't attempt to show its own wait dialog
// and also will take it into consideration when measuring command handling duration.
context.OperationContext.TakeOwnership();
finalSolution = previewService.PreviewChanges(
string.Format(EditorFeaturesResources.Preview_Changes_0, EditorFeaturesResources.Change_Signature),
"vs.csharp.refactoring.preview",
EditorFeaturesResources.Change_Signature_colon,
result.Name,
result.Glyph.GetValueOrDefault(),
result.UpdatedSolution,
document.Project.Solution);
}
// Async operation to compute the new solution created from the specified options.
var result = changeSignatureService.ChangeSignatureWithContextAsync(changeSignatureContext, changeSignatureOptions, cancellationToken).WaitAndGetResult(cancellationToken);
// UI thread bound operation to show preview changes dialog / show error message, then apply the solution changes (if applicable).
HandleResult(result, document.Project.Solution, workspace, context);
if (finalSolution == null)
return true;
}
}
private static void HandleResult(ChangeSignatureResult result, Solution oldSolution, Workspace workspace, CommandExecutionContext context)
{
var notificationService = workspace.Services.GetRequiredService<INotificationService>();
if (!result.Succeeded)
{
if (result.ChangeSignatureFailureKind != null)
{
// User clicked cancel.
return true;
ShowError(result.ChangeSignatureFailureKind.Value, context.OperationContext, notificationService);
}
using (var workspaceUndoTransaction = workspace.OpenGlobalUndoTransaction(FeaturesResources.Change_signature))
{
if (!workspace.TryApplyChanges(finalSolution))
{
// TODO: handle failure
return true;
}
return;
}
workspaceUndoTransaction.Commit();
}
if (result.ConfirmationMessage != null && !notificationService.ConfirmMessageBox(result.ConfirmationMessage, severity: NotificationSeverity.Warning))
{
return;
}
return true;
var finalSolution = result.UpdatedSolution;
var previewService = workspace.Services.GetService<IPreviewDialogService>();
if (previewService != null && result.PreviewChanges)
{
// We are about to show a modal UI dialog so we should take over the command execution
// wait context. That means the command system won't attempt to show its own wait dialog
// and also will take it into consideration when measuring command handling duration.
context.OperationContext.TakeOwnership();
finalSolution = previewService.PreviewChanges(
string.Format(EditorFeaturesResources.Preview_Changes_0, EditorFeaturesResources.Change_Signature),
"vs.csharp.refactoring.preview",
EditorFeaturesResources.Change_Signature_colon,
result.Name,
result.Glyph.GetValueOrDefault(),
result.UpdatedSolution,
oldSolution);
}
if (finalSolution == null)
{
// User clicked cancel.
return;
}
using var workspaceUndoTransaction = workspace.OpenGlobalUndoTransaction(FeaturesResources.Change_signature);
if (workspace.TryApplyChanges(finalSolution))
{
workspaceUndoTransaction.Commit();
}
// TODO: handle failure
}
private static void ShowError(ChangeSignatureFailureKind reason, IUIThreadOperationContext operationContext, INotificationService notificationService)
{
switch (reason)
{
case ChangeSignatureFailureKind.DefinedInMetadata:
ShowMessage(FeaturesResources.The_member_is_defined_in_metadata, NotificationSeverity.Error, operationContext, notificationService);
break;
case ChangeSignatureFailureKind.IncorrectKind:
ShowMessage(FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate, NotificationSeverity.Error, operationContext, notificationService);
break;
}
static void ShowMessage(string errorMessage, NotificationSeverity severity, IUIThreadOperationContext operationContext, INotificationService notificationService)
{
operationContext.TakeOwnership();
notificationService.SendNotification(errorMessage, severity: severity);
}
}
}
......
src/EditorFeatures/DiagnosticsTestUtilities/ChangeSignature/AbstractChangeSignatureTests.cs
浏览文件 @ e03e7a46
......@@ -74,7 +74,7 @@ protected override TestComposition GetComposition()
bool expectedSuccess = true,
int[] updatedSignature = null,
string expectedUpdatedInvocationDocumentCode = null,
string expectedErrorText = null,
ChangeSignatureFailureKind? expectedFailureReason = null,
int? totalParameters = null,
bool verifyNoDiagnostics = false,
ParseOptions parseOptions = null,
......@@ -83,7 +83,7 @@ protected override TestComposition GetComposition()
=> await TestChangeSignatureViaCommandAsync(languageName, markup,
updatedSignature?.Select(i => new AddedParameterOrExistingIndex(i)).ToArray(),
expectedSuccess, expectedUpdatedInvocationDocumentCode,
expectedErrorText,
expectedFailureReason,
totalParameters,
verifyNoDiagnostics,
parseOptions,
......@@ -96,7 +96,7 @@ protected override TestComposition GetComposition()
AddedParameterOrExistingIndex[] updatedSignature,
bool expectedSuccess = true,
string expectedUpdatedInvocationDocumentCode = null,
string expectedErrorText = null,
ChangeSignatureFailureKind? expectedFailureReason = null,
int? totalParameters = null,
bool verifyNoDiagnostics = false,
ParseOptions parseOptions = null,
......@@ -106,21 +106,20 @@ protected override TestComposition GetComposition()
using (var testState = ChangeSignatureTestState.Create(markup, languageName, parseOptions, options))
{
testState.TestChangeSignatureOptionsService.UpdatedSignature = updatedSignature;
var result = testState.ChangeSignature();
var result = await testState.ChangeSignatureAsync().ConfigureAwait(false);
if (expectedSuccess)
{
Assert.True(result.Succeeded);
Assert.Null(testState.ErrorMessage);
Assert.Null(result.ChangeSignatureFailureKind);
}
else
{
Assert.False(result.Succeeded);
if (expectedErrorText != null)
if (expectedFailureReason != null)
{
Assert.Equal(expectedErrorText, testState.ErrorMessage);
Assert.Equal(NotificationSeverity.Error, testState.ErrorSeverity);
Assert.Equal(expectedFailureReason, result.ChangeSignatureFailureKind);
}
}
......
src/EditorFeatures/DiagnosticsTestUtilities/ChangeSignature/ChangeSignatureTestState.cs
浏览文件 @ e03e7a46
......@@ -30,8 +30,6 @@ internal sealed class ChangeSignatureTestState : IDisposable
public TestWorkspace Workspace { get; }
public Document InvocationDocument { get; }
public AbstractChangeSignatureService ChangeSignatureService { get; }
public string ErrorMessage { get; private set; }
public NotificationSeverity ErrorSeverity { get; private set; }
public static ChangeSignatureTestState Create(string markup, string languageName, ParseOptions parseOptions = null, OptionsCollection options = null)
{
......@@ -79,26 +77,16 @@ public TestChangeSignatureOptionsService TestChangeSignatureOptionsService
}
}
public ChangeSignatureResult ChangeSignature()
public async Task<ChangeSignatureResult> ChangeSignatureAsync()
{
WpfTestRunner.RequireWpfFact($"{nameof(AbstractChangeSignatureService.ChangeSignature)} currently needs to run on a WPF Fact because it's factored in a way that tries popping up UI in some cases.");
return ChangeSignatureService.ChangeSignature(
InvocationDocument,
_testDocument.CursorPosition.Value,
(errorMessage, severity) =>
{
this.ErrorMessage = errorMessage;
this.ErrorSeverity = severity;
},
CancellationToken.None);
var context = await ChangeSignatureService.GetChangeSignatureContextAsync(InvocationDocument, _testDocument.CursorPosition.Value, restrictToDeclarations: false, CancellationToken.None).ConfigureAwait(false);
var options = AbstractChangeSignatureService.GetChangeSignatureOptions(context);
return await ChangeSignatureService.ChangeSignatureWithContextAsync(context, options, CancellationToken.None);
}
public async Task<ParameterConfiguration> GetParameterConfigurationAsync()
{
WpfTestRunner.RequireWpfFact($"{nameof(AbstractChangeSignatureService.ChangeSignature)} currently needs to run on a WPF Fact because it's factored in a way that tries popping up UI in some cases.");
var context = await ChangeSignatureService.GetContextAsync(InvocationDocument, _testDocument.CursorPosition.Value, restrictToDeclarations: false, CancellationToken.None);
var context = await ChangeSignatureService.GetChangeSignatureContextAsync(InvocationDocument, _testDocument.CursorPosition.Value, restrictToDeclarations: false, CancellationToken.None);
if (context is ChangeSignatureAnalysisSucceededContext changeSignatureAnalyzedSucceedContext)
{
return changeSignatureAnalyzedSucceedContext.ParameterConfiguration;
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.AddImports.vb
浏览文件 @ e03e7a46
......@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddParameterAddsAllImports() As Task
Dim markup = <Text><![CDATA[
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Cascading.vb
浏览文件 @ e03e7a46
......@@ -8,7 +8,7 @@ Imports Microsoft.CodeAnalysis.Test.Utilities.ChangeSignature
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToImplementedMethod() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -40,7 +40,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToImplementedMethod_WithTuples() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -72,7 +72,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToImplementingMethod() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -104,7 +104,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToOverriddenMethod() As Task
Dim markup = <Text><![CDATA[
Class B
......@@ -140,7 +140,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToOverridingMethod() As Task
Dim markup = <Text><![CDATA[
Class B
......@@ -176,7 +176,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToOverriddenMethod_Transitive() As Task
Dim markup = <Text><![CDATA[
......@@ -225,7 +225,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToOverridingMethod_Transitive() As Task
Dim markup = <Text><![CDATA[
......@@ -275,7 +275,7 @@ End Class]]></Text>.NormalizedValue()
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Cascade_ToMethods_Complex() As Task
' B I I2
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Delegates.vb
浏览文件 @ e03e7a46
......@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_ImplicitInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -41,7 +41,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_ExplicitInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub($$x As Integer, y As String, z As Boolean)
......@@ -71,7 +71,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_BeginInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub(x As Integer$$, y As String, z As Boolean)
......@@ -101,7 +101,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_SubLambdas() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub(x As Integer, $$y As String, z As Boolean)
......@@ -145,7 +145,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=1)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_FunctionLambdas() As Task
Dim markup = <Text><![CDATA[
Delegate Function MyFunc(x As Integer, y As String, $$z As Boolean) As Integer
......@@ -193,7 +193,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=2)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_ReferencingLambdas_MethodArgument() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As Integer
......@@ -228,7 +228,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_ReferencingLambdas_ReturnValue() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -265,7 +265,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_Recursive() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As MyFunc
......@@ -294,7 +294,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_DocComments() As Task
Dim markup = <Text><![CDATA[
''' <summary>
......@@ -353,7 +353,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_Relaxation_FunctionToSub() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -388,7 +388,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_Relaxation_ParameterlessFunctionToFunction() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As Integer
......@@ -423,7 +423,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_CascadeToEvents() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -472,7 +472,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Events_ReferencedBy_RaiseEvent() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -499,7 +499,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Events_ReferencedBy_AddHandler() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -532,7 +532,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Events_ReferencedBy_GeneratedDelegateTypeInvocations() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -565,7 +565,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Events_ReferencedBy_HandlesClause() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -590,7 +590,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_CustomEvents_ReferencedBy_RaiseEvent() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -633,7 +633,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_CustomEvents_ReferencedBy_AddHandler() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -682,7 +682,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_CustomEvents_ReferencedBy_Invocations() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -731,7 +731,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_CustomEvents_ReferencedBy_HandlesClause() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -772,7 +772,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Delegates_Generics() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MyDelegate(Of T)(t As T)
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.Formatting.vb
浏览文件 @ e03e7a46
......@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_KeepCountsPerLine() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -48,7 +48,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_SubMethods() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -75,7 +75,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_FunctionMethods() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -102,7 +102,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_Events() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -123,7 +123,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_CustomEvents() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -164,7 +164,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_Constructors() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -197,7 +197,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_Properties() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -244,7 +244,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_Attribute() As Task
Dim markup = <Text><![CDATA[
<Custom(1,
......@@ -271,7 +271,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_DelegateFunction() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -292,7 +292,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_MultilineSubLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -321,7 +321,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_MultilineFunctionLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -352,7 +352,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_SingleLineSubLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -379,7 +379,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Formatting_SingleLineFunctionLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.OptionalParameter.Infer.vb
浏览文件 @ e03e7a46
......@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_NoOptions() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -31,7 +31,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_SingleLocal() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -53,7 +53,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_MultipleLocals() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -77,7 +77,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_SingleParameter() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -98,7 +98,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_SingleField() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -122,7 +122,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_SingleProperty() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -146,7 +146,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function AddOptionalParameter_CallsiteInferred_ImplicitlyConvertable() As Task
Dim markup = <Text><![CDATA[
Class B
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/AddParameterTests.vb
浏览文件 @ e03e7a46
......@@ -11,7 +11,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddRemoveParameters() As Task
Dim markup = <Text><![CDATA[
......@@ -94,7 +94,7 @@ End Module
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameterToParameterlessMethod() As Task
Dim markup = <Text><![CDATA[
......@@ -119,7 +119,7 @@ End Module
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_Parameters() As Task
Dim markup = <Text><![CDATA[
......@@ -141,7 +141,7 @@ End Class]]></Text>.NormalizedValue()
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -164,7 +164,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ParametersAndArgumentsOfNestedCalls() As Task
Dim markup = <Text><![CDATA[
......@@ -187,7 +187,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderConstructorParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -234,7 +234,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderAttributeConstructorParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -261,7 +261,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ExtensionMethodParametersAndArguments_StaticCall() As Task
Dim markup = <Text><![CDATA[
......@@ -303,7 +303,7 @@ End Module]]></Text>.NormalizedValue()
expectedUpdatedInvocationDocumentCode:=updatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderExtensionMethodParametersAndArguments_ExtensionCall() As Task
Dim markup = <Text><![CDATA[
......@@ -344,7 +344,7 @@ End Module]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamsMethodParametersAndArguments_ParamsAsArray() As Task
Dim markup = <Text><![CDATA[
......@@ -368,7 +368,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamsMethodParametersAndArguments_ParamsExpanded() As Task
Dim markup = <Text><![CDATA[
......@@ -392,7 +392,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderExtensionAndParamsMethodParametersAndArguments_VariedCallsites() As Task
Dim markup = <Text><![CDATA[
......@@ -441,7 +441,7 @@ End Module]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderIndexerParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -484,7 +484,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OnIndividualLines() As Task
Dim markup = <Text><![CDATA[
......@@ -513,7 +513,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OnSameLine() As Task
Dim markup = <Text><![CDATA[
......@@ -538,7 +538,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OutOfOrder_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -566,7 +566,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_InsufficientTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -592,7 +592,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_ExcessiveTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -622,7 +622,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_IncorrectlyNamedTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -650,7 +650,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OnFunctions() As Task
Dim markup = <Text><![CDATA[
......@@ -681,7 +681,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OnConstructors() As Task
Dim markup = <Text><![CDATA[
......@@ -710,7 +710,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParamTagsInDocComments_OnProperties() As Task
Dim markup = <Text><![CDATA[
......@@ -749,7 +749,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestAddParameter_ReorderParametersInCrefs() As Task
Dim markup = <Text><![CDATA[
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignature_CheckAllSignatureChanges.vb
浏览文件 @ e03e7a46
......@@ -9,7 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfTheory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Theory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<MemberData(NameOf(AbstractChangeSignatureTests.GetAllSignatureSpecificationsForTheory), New Integer() {1, 3, 2, 0}, MemberType:=GetType(AbstractChangeSignatureTests))>
Public Async Function TestAllSignatureChanges_1This_3Regular_2Default(totalParameters As Integer, signature As Integer()) As Task
Dim markup = <Text><![CDATA[
......@@ -58,7 +58,7 @@ End Module
verifyNoDiagnostics:=True)
End Function
<WpfTheory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Theory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<MemberData(NameOf(AbstractChangeSignatureTests.GetAllSignatureSpecificationsForTheory), New Integer() {1, 3, 0, 1}, MemberType:=GetType(AbstractChangeSignatureTests))>
Public Async Function TestAllSignatureChanges_1This_3Regular_1ParamArray(totalParameters As Integer, signature As Integer()) As Task
Dim markup = <Text><![CDATA[
......@@ -90,7 +90,7 @@ End Module
verifyNoDiagnostics:=True)
End Function
<WpfTheory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Theory, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<MemberData(NameOf(AbstractChangeSignatureTests.GetAllSignatureSpecificationsForTheory), New Integer() {0, 3, 0, 0}, MemberType:=GetType(AbstractChangeSignatureTests))>
Public Async Function TestAllSignatureChanges_Delegate_3(totalParameters As Integer, signature As Integer()) As Task
Dim markup = <Text><![CDATA[
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignature_Delegates.vb
浏览文件 @ e03e7a46
......@@ -20,7 +20,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Return New ChangeSignatureCodeRefactoringProvider()
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_ImplicitInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -47,7 +47,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_ExplicitInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub($$x As Integer, y As String, z As Boolean)
......@@ -74,7 +74,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_BeginInvokeCalls() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub(x As Integer$$, y As String, z As Boolean)
......@@ -101,7 +101,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_SubLambdas() As Task
Dim markup = <Text><![CDATA[
Delegate Sub MySub(x As Integer, $$y As String, z As Boolean)
......@@ -142,7 +142,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=1)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_FunctionLambdas() As Task
Dim markup = <Text><![CDATA[
Delegate Function MyFunc(x As Integer, y As String, $$z As Boolean) As Integer
......@@ -187,7 +187,7 @@ End Class
expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode, expectedSelectedIndex:=2)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_ReferencingLambdas_MethodArgument() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As Integer
......@@ -219,7 +219,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_ReferencingLambdas_ReturnValue() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -253,7 +253,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_Recursive() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As MyFunc
......@@ -279,7 +279,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_DocComments() As Task
Dim markup = <Text><![CDATA[
''' <summary>
......@@ -335,7 +335,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_Relaxation_FunctionToSub() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MySub(x As Integer, y As String, z As Boolean)
......@@ -367,7 +367,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_Relaxation_ParameterlessFunctionToFunction() As Task
Dim markup = <Text><![CDATA[
Delegate Function $$MyFunc(x As Integer, y As String, z As Boolean) As Integer
......@@ -399,7 +399,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_CascadeToEvents() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -445,7 +445,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Events_ReferencedBy_RaiseEvent() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -469,7 +469,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Events_ReferencedBy_AddHandler() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -499,7 +499,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Events_ReferencedBy_GeneratedDelegateTypeInvocations() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -529,7 +529,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Events_ReferencedBy_HandlesClause() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -551,7 +551,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_CustomEvents_ReferencedBy_RaiseEvent() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -591,7 +591,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_CustomEvents_ReferencedBy_AddHandler() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -637,7 +637,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_CustomEvents_ReferencedBy_Invocations() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -683,7 +683,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_CustomEvents_ReferencedBy_HandlesClause() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -721,7 +721,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Delegates_Generics() As Task
Dim markup = <Text><![CDATA[
Delegate Sub $$MyDelegate(Of T)(t As T)
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ChangeSignature_Formatting.vb
浏览文件 @ e03e7a46
......@@ -9,7 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_KeepCountsPerLine() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -39,7 +39,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_SubMethods() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -63,7 +63,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_FunctionMethods() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -87,7 +87,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_Events() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -105,7 +105,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_CustomEvents() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -143,7 +143,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_Constructors() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -173,7 +173,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_Properties() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -217,7 +217,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_Attribute() As Task
Dim markup = <Text><![CDATA[
<Custom(1,
......@@ -241,7 +241,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_DelegateFunction() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -259,7 +259,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_MultilineSubLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -285,7 +285,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_MultilineFunctionLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -313,7 +313,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_SingleLineSubLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -337,7 +337,7 @@ End Class
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=updatedSignature, expectedUpdatedInvocationDocumentCode:=expectedUpdatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_Formatting_SingleLineFunctionLambda() As Task
Dim markup = <Text><![CDATA[
Class C
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/RemoveParametersTests.vb
浏览文件 @ e03e7a46
......@@ -16,7 +16,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestRemoveParameters1() As Task
Dim markup = <Text><![CDATA[
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.InvocationErrors.vb
浏览文件 @ e03e7a46
......@@ -2,11 +2,12 @@
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports Microsoft.CodeAnalysis.ChangeSignature
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnClassName_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C$$
......@@ -14,10 +15,10 @@ Class C$$
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.IncorrectKind)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnField_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -27,10 +28,10 @@ Class C
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.IncorrectKind)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_NoChangeableParameters() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -39,10 +40,10 @@ Class C
End Operator
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.IncorrectKind)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestChangeSignature_AllowedWithNoParameters() As Task
Dim markup = <Text><![CDATA[
Class C
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.InvocationLocations.vb
浏览文件 @ e03e7a46
......@@ -2,13 +2,14 @@
' The .NET Foundation licenses this file to you under the MIT license.
' See the LICENSE file in the project root for more information.
Imports Microsoft.CodeAnalysis.ChangeSignature
Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
#Region "Methods"
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeBeforeMethodName() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -25,7 +26,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeInParameterList() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -42,7 +43,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeAfterParameterList() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -59,7 +60,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeBeforeMethodDeclaration() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -76,7 +77,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnMetadataReference_InIdentifier_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -85,10 +86,10 @@ Class C
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.The_member_is_defined_in_metadata)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.DefinedInMetadata)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnMetadataReference_AtBeginningOfInvocation_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -97,10 +98,10 @@ Class C
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.The_member_is_defined_in_metadata)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.DefinedInMetadata)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnMetadataReference_InArgumentsOfInvocation_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -109,10 +110,10 @@ Class C
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.The_member_is_defined_in_metadata)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.DefinedInMetadata)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnMetadataReference_AfterInvocation_ShouldFail() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -121,10 +122,10 @@ Class C
End Sub
End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedErrorText:=FeaturesResources.The_member_is_defined_in_metadata)
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, expectedSuccess:=False, expectedFailureReason:=ChangeSignatureFailureKind.DefinedInMetadata)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeInMethodBody() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -143,7 +144,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_BeginningOfIdentifier() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -168,7 +169,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_ArgumentList() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -193,7 +194,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_NestedCalls1() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -226,7 +227,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_NestedCalls2() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -259,7 +260,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_NestedCalls3() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -292,7 +293,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeOnReference_OnlyCandidateSymbols() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -319,7 +320,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters_InvokeInConstructor() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -342,7 +343,7 @@ End Class]]></Text>.NormalizedValue()
#End Region
#Region "Properties"
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InvokeAtBeginningOfDeclaration() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -369,7 +370,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InParameters() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -396,7 +397,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InvokeAtEndOfDeclaration() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -423,7 +424,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InvokeInAccessor() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -450,7 +451,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InvokeOnReference_BeforeTarget() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -487,7 +488,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParameters_InvokeOnReference_InArgumentList() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -526,7 +527,7 @@ End Class]]></Text>.NormalizedValue()
#End Region
#Region "Delegates"
<WpfFact(Skip:="860578"), Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact(Skip:="860578"), Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderDelegateParameters_ObjectCreation1() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -551,7 +552,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact(Skip:="860578"), Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact(Skip:="860578"), Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderDelegateParameters_ObjectCreation2() As Task
Dim markup = <Text><![CDATA[
Class C(Of T)
......@@ -582,7 +583,7 @@ End Class]]></Text>.NormalizedValue()
#End Region
#Region "Code Refactoring"
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function ReorderIndexerParameters_CodeRefactoring_InMethodDeclaration() As Threading.Tasks.Task
Dim markup = <Text><![CDATA[
Class C
......@@ -599,7 +600,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=True, updatedSignature:=permutation, expectedCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function ReorderIndexerParameters_CodeRefactoring_NotInMethodBody() As Threading.Tasks.Task
Dim markup = <Text><![CDATA[
Class C
......@@ -611,7 +612,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCodeActionAsync(markup, expectedCodeAction:=False)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function ReorderIndexerParameters_CodeRefactoring_InCallSite_ViaCommand() As Task
Dim markup = <Text><![CDATA[
Class C
......@@ -632,7 +633,7 @@ End Class]]></Text>.NormalizedValue()
expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function ReorderIndexerParameters_CodeRefactoring_InCallSite_ViaCodeAction() As Threading.Tasks.Task
Dim markup = <Text><![CDATA[
Class C
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParameters.MultiFile.vb
浏览文件 @ e03e7a46
......@@ -54,7 +54,7 @@ class C
Using testState = ChangeSignatureTestState.Create(workspace)
Dim history = testState.Workspace.GetService(Of ITextUndoHistoryRegistry)().RegisterHistory(testState.Workspace.Documents.First().GetTextBuffer())
testState.TestChangeSignatureOptionsService.UpdatedSignature = permutation
Dim result = testState.ChangeSignature()
Dim result = Await testState.ChangeSignatureAsync().ConfigureAwait(False)
Dim vbdoc = result.UpdatedSolution.Projects.Single(Function(p) p.AssemblyName = "VBAssembly").Documents.Single()
Dim csdoc = result.UpdatedSolution.Projects.Single(Function(p) p.AssemblyName = "CSAssembly").Documents.Single()
......@@ -107,7 +107,7 @@ class C
Using testState = ChangeSignatureTestState.Create(workspace)
Dim history = testState.Workspace.GetService(Of ITextUndoHistoryRegistry)().RegisterHistory(testState.Workspace.Documents.First().GetTextBuffer())
testState.TestChangeSignatureOptionsService.UpdatedSignature = permutation
Dim result = testState.ChangeSignature()
Dim result = Await testState.ChangeSignatureAsync().ConfigureAwait(False)
Dim vbdoc = result.UpdatedSolution.Projects.Single(Function(p) p.AssemblyName = "VBAssembly").Documents.Single()
Dim csdoc = result.UpdatedSolution.Projects.Single(Function(p) p.AssemblyName = "CSAssembly").Documents.Single()
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParametersTests.Cascading.vb
浏览文件 @ e03e7a46
......@@ -6,7 +6,7 @@ Imports Microsoft.CodeAnalysis.Editor.UnitTests.Extensions
Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToImplementedMethod() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -35,7 +35,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToImplementedMethod_WithTuples() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -64,7 +64,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToImplementingMethod() As Task
Dim markup = <Text><![CDATA[
Interface I
......@@ -93,7 +93,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToOverriddenMethod() As Task
Dim markup = <Text><![CDATA[
Class B
......@@ -126,7 +126,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToOverridingMethod() As Task
Dim markup = <Text><![CDATA[
Class B
......@@ -159,7 +159,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToOverriddenMethod_Transitive() As Task
Dim markup = <Text><![CDATA[
......@@ -205,7 +205,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToOverridingMethod_Transitive() As Task
Dim markup = <Text><![CDATA[
......@@ -252,7 +252,7 @@ End Class]]></Text>.NormalizedValue()
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParameters_Cascade_ToMethods_Complex() As Task
' B I I2
......
src/EditorFeatures/VisualBasicTest/ChangeSignature/ReorderParametersTests.vb
浏览文件 @ e03e7a46
......@@ -9,7 +9,7 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.ChangeSignature
Partial Public Class ChangeSignatureTests
Inherits AbstractChangeSignatureTests
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParameters() As Task
Dim markup = <Text><![CDATA[
......@@ -28,7 +28,7 @@ End Class]]></Text>.NormalizedValue()
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -48,7 +48,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderMethodParametersAndArgumentsOfNestedCalls() As Task
Dim markup = <Text><![CDATA[
......@@ -68,7 +68,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderConstructorParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -112,7 +112,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderAttributeConstructorParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -136,7 +136,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderExtensionMethodParametersAndArguments_StaticCall() As Task
Dim markup = <Text><![CDATA[
......@@ -171,7 +171,7 @@ End Module]]></Text>.NormalizedValue()
expectedUpdatedInvocationDocumentCode:=updatedCode, expectedSelectedIndex:=0)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderExtensionMethodParametersAndArguments_ExtensionCall() As Task
Dim markup = <Text><![CDATA[
......@@ -205,7 +205,7 @@ End Module]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamsMethodParametersAndArguments_ParamsAsArray() As Task
Dim markup = <Text><![CDATA[
......@@ -225,7 +225,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamsMethodParametersAndArguments_ParamsExpanded() As Task
Dim markup = <Text><![CDATA[
......@@ -245,7 +245,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderExtensionAndParamsMethodParametersAndArguments_VariedCallsites() As Task
Dim markup = <Text><![CDATA[
......@@ -289,7 +289,7 @@ End Module]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderIndexerParametersAndArguments() As Task
Dim markup = <Text><![CDATA[
......@@ -329,7 +329,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OnIndividualLines() As Task
Dim markup = <Text><![CDATA[
......@@ -353,7 +353,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OnSameLine() As Task
Dim markup = <Text><![CDATA[
......@@ -373,7 +373,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OutOfOrder_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -397,7 +397,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_InsufficientTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -419,7 +419,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_ExcessiveTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -445,7 +445,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_IncorrectlyNamedTags_MaintainsOrder() As Task
Dim markup = <Text><![CDATA[
......@@ -469,7 +469,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OnFunctions() As Task
Dim markup = <Text><![CDATA[
......@@ -495,7 +495,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OnConstructors() As Task
Dim markup = <Text><![CDATA[
......@@ -519,7 +519,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParamTagsInDocComments_OnProperties() As Task
Dim markup = <Text><![CDATA[
......@@ -553,7 +553,7 @@ End Class]]></Text>.NormalizedValue()
Await TestChangeSignatureViaCommandAsync(LanguageNames.VisualBasic, markup, updatedSignature:=permutation, expectedUpdatedInvocationDocumentCode:=updatedCode)
End Function
<WpfFact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
<Fact, Trait(Traits.Feature, Traits.Features.ChangeSignature)>
Public Async Function TestReorderParametersInCrefs() As Task
Dim markup = <Text><![CDATA[
......
src/Features/Core/Portable/ChangeSignature/AbstractChangeSignatureService.cs
浏览文件 @ e03e7a46
......@@ -6,7 +6,6 @@
using System.Collections.Generic;
using System.Collections.Immutable;
using System.Diagnostics;
using System.Diagnostics.CodeAnalysis;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
......@@ -19,7 +18,6 @@
using Microsoft.CodeAnalysis.Host;
using Microsoft.CodeAnalysis.Internal.Log;
using Microsoft.CodeAnalysis.LanguageServices;
using Microsoft.CodeAnalysis.Notification;
using Microsoft.CodeAnalysis.PooledObjects;
using Microsoft.CodeAnalysis.Recommendations;
using Microsoft.CodeAnalysis.Shared.Extensions;
......@@ -81,39 +79,14 @@ internal abstract class AbstractChangeSignatureService : ILanguageService
public async Task<ImmutableArray<ChangeSignatureCodeAction>> GetChangeSignatureCodeActionAsync(Document document, TextSpan span, CancellationToken cancellationToken)
{
var context = await GetContextAsync(document, span.Start, restrictToDeclarations: true, cancellationToken: cancellationToken).ConfigureAwait(false);
var context = await GetChangeSignatureContextAsync(document, span.Start, restrictToDeclarations: true, cancellationToken: cancellationToken).ConfigureAwait(false);
return context is ChangeSignatureAnalysisSucceededContext changeSignatureAnalyzedSucceedContext
? ImmutableArray.Create(new ChangeSignatureCodeAction(this, changeSignatureAnalyzedSucceedContext))
: ImmutableArray<ChangeSignatureCodeAction>.Empty;
}
internal ChangeSignatureResult ChangeSignature(Document document, int position, Action<string, NotificationSeverity> errorHandler, CancellationToken cancellationToken)
{
var context = GetContextAsync(document, position, restrictToDeclarations: false, cancellationToken: cancellationToken).WaitAndGetResult_CanCallOnBackground(cancellationToken);
switch (context)
{
case ChangeSignatureAnalysisSucceededContext changeSignatureAnalyzedSucceedContext:
return ChangeSignatureWithContext(changeSignatureAnalyzedSucceedContext, cancellationToken);
case CannotChangeSignatureAnalyzedContext cannotChangeSignatureAnalyzedContext:
switch (cannotChangeSignatureAnalyzedContext.CannotChangeSignatureReason)
{
case CannotChangeSignatureReason.DefinedInMetadata:
errorHandler(FeaturesResources.The_member_is_defined_in_metadata, NotificationSeverity.Error);
break;
case CannotChangeSignatureReason.IncorrectKind:
errorHandler(FeaturesResources.You_can_only_change_the_signature_of_a_constructor_indexer_method_or_delegate, NotificationSeverity.Error);
break;
}
break;
}
return new ChangeSignatureResult(succeeded: false);
}
internal async Task<ChangeSignatureAnalyzedContext> GetContextAsync(
internal async Task<ChangeSignatureAnalyzedContext> GetChangeSignatureContextAsync(
Document document, int position, bool restrictToDeclarations, CancellationToken cancellationToken)
{
var (symbol, selectedIndex) = await GetInvocationSymbolAsync(
......@@ -124,7 +97,7 @@ internal ChangeSignatureResult ChangeSignature(Document document, int position,
if (symbol == null)
{
return new CannotChangeSignatureAnalyzedContext(CannotChangeSignatureReason.IncorrectKind);
return new CannotChangeSignatureAnalyzedContext(ChangeSignatureFailureKind.IncorrectKind);
}
if (symbol is IMethodSymbol method)
......@@ -155,19 +128,19 @@ internal ChangeSignatureResult ChangeSignature(Document document, int position,
if (!symbol.MatchesKind(SymbolKind.Method, SymbolKind.Property))
{
return new CannotChangeSignatureAnalyzedContext(CannotChangeSignatureReason.IncorrectKind);
return new CannotChangeSignatureAnalyzedContext(ChangeSignatureFailureKind.IncorrectKind);
}
if (symbol.Locations.Any(loc => loc.IsInMetadata))
{
return new CannotChangeSignatureAnalyzedContext(CannotChangeSignatureReason.DefinedInMetadata);
return new CannotChangeSignatureAnalyzedContext(ChangeSignatureFailureKind.DefinedInMetadata);
}
// This should be called after the metadata check above to avoid looking for nodes in metadata.
var declarationLocation = symbol.Locations.FirstOrDefault();
if (declarationLocation == null)
{
return new CannotChangeSignatureAnalyzedContext(CannotChangeSignatureReason.DefinedInMetadata);
return new CannotChangeSignatureAnalyzedContext(ChangeSignatureFailureKind.DefinedInMetadata);
}
var solution = document.Project.Solution;
......@@ -198,30 +171,39 @@ internal ChangeSignatureResult ChangeSignature(Document document, int position,
declarationDocument, positionForTypeBinding, symbol, parameterConfiguration);
}
private ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysisSucceededContext context, CancellationToken cancellationToken)
internal async Task<ChangeSignatureResult> ChangeSignatureWithContextAsync(ChangeSignatureAnalyzedContext context, ChangeSignatureOptionsResult? options, CancellationToken cancellationToken)
{
var options = GetChangeSignatureOptions(context);
if (options == null)
return context switch
{
return new ChangeSignatureResult(succeeded: false);
}
ChangeSignatureAnalysisSucceededContext changeSignatureAnalyzedSucceedContext => await GetChangeSignatureResultAsync(changeSignatureAnalyzedSucceedContext, options, cancellationToken).ConfigureAwait(false),
CannotChangeSignatureAnalyzedContext cannotChangeSignatureAnalyzedContext => new ChangeSignatureResult(succeeded: false, changeSignatureFailureKind: cannotChangeSignatureAnalyzedContext.CannotChangeSignatureReason),
_ => throw ExceptionUtilities.Unreachable,
};
return ChangeSignatureWithContext(context, options, cancellationToken);
}
async Task<ChangeSignatureResult> GetChangeSignatureResultAsync(ChangeSignatureAnalysisSucceededContext context, ChangeSignatureOptionsResult? options, CancellationToken cancellationToken)
{
if (options == null)
{
return new ChangeSignatureResult(succeeded: false);
}
internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysisSucceededContext context, ChangeSignatureOptionsResult options, CancellationToken cancellationToken)
{
var succeeded = TryCreateUpdatedSolution(context, options, cancellationToken, out var updatedSolution);
return new ChangeSignatureResult(succeeded, updatedSolution, context.Symbol.ToDisplayString(), context.Symbol.GetGlyph(), options.PreviewChanges);
var (updatedSolution, confirmationMessage) = await CreateUpdatedSolutionAsync(context, options, cancellationToken).ConfigureAwait(false);
return new ChangeSignatureResult(updatedSolution != null, updatedSolution, context.Symbol.ToDisplayString(), context.Symbol.GetGlyph(), options.PreviewChanges, confirmationMessage: confirmationMessage);
}
}
/// <returns>Returns <c>null</c> if the operation is cancelled.</returns>
internal static ChangeSignatureOptionsResult? GetChangeSignatureOptions(ChangeSignatureAnalysisSucceededContext context)
internal static ChangeSignatureOptionsResult? GetChangeSignatureOptions(ChangeSignatureAnalyzedContext context)
{
var changeSignatureOptionsService = context.Solution.Workspace.Services.GetRequiredService<IChangeSignatureOptionsService>();
if (context is not ChangeSignatureAnalysisSucceededContext succeededContext)
{
return null;
}
var changeSignatureOptionsService = succeededContext.Solution.Workspace.Services.GetRequiredService<IChangeSignatureOptionsService>();
return changeSignatureOptionsService.GetChangeSignatureOptions(
context.Document, context.PositionForTypeBinding, context.Symbol, context.ParameterConfiguration);
succeededContext.Document, succeededContext.PositionForTypeBinding, succeededContext.Symbol, succeededContext.ParameterConfiguration);
}
private static async Task<ImmutableArray<ReferencedSymbol>> FindChangeSignatureReferencesAsync(
......@@ -248,23 +230,21 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
#nullable enable
private bool TryCreateUpdatedSolution(
ChangeSignatureAnalysisSucceededContext context, ChangeSignatureOptionsResult options, CancellationToken cancellationToken, [NotNullWhen(true)] out Solution? updatedSolution)
private async Task<(Solution updatedSolution, string? confirmationMessage)> CreateUpdatedSolutionAsync(
ChangeSignatureAnalysisSucceededContext context, ChangeSignatureOptionsResult options, CancellationToken cancellationToken)
{
var telemetryTimer = Stopwatch.StartNew();
updatedSolution = null;
var currentSolution = context.Solution;
var declaredSymbol = context.Symbol;
var nodesToUpdate = new Dictionary<DocumentId, List<SyntaxNode>>();
var definitionToUse = new Dictionary<SyntaxNode, ISymbol>();
var hasLocationsInMetadata = false;
string? confirmationMessage = null;
var symbols = FindChangeSignatureReferencesAsync(
declaredSymbol, context.Solution, cancellationToken).WaitAndGetResult(cancellationToken);
var symbols = await FindChangeSignatureReferencesAsync(
declaredSymbol, context.Solution, cancellationToken).ConfigureAwait(false);
var declaredSymbolParametersCount = declaredSymbol.GetParameters().Length;
......@@ -288,7 +268,7 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
if (symbol.Definition.Locations.Any(loc => loc.IsInMetadata))
{
hasLocationsInMetadata = true;
confirmationMessage = FeaturesResources.This_symbol_has_related_definitions_or_references_in_metadata_Changing_its_signature_may_result_in_build_errors_Do_you_want_to_continue;
continue;
}
......@@ -361,7 +341,7 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
{
if (location.Location.IsInMetadata)
{
hasLocationsInMetadata = true;
confirmationMessage = FeaturesResources.This_symbol_has_related_definitions_or_references_in_metadata_Changing_its_signature_may_result_in_build_errors_Do_you_want_to_continue;
continue;
}
......@@ -380,22 +360,13 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
}
}
if (hasLocationsInMetadata)
{
var notificationService = context.Solution.Workspace.Services.GetRequiredService<INotificationService>();
if (!notificationService.ConfirmMessageBox(FeaturesResources.This_symbol_has_related_definitions_or_references_in_metadata_Changing_its_signature_may_result_in_build_errors_Do_you_want_to_continue, severity: NotificationSeverity.Warning))
{
return false;
}
}
// Construct all the relevant syntax trees from the base solution
var updatedRoots = new Dictionary<DocumentId, SyntaxNode>();
foreach (var docId in nodesToUpdate.Keys)
{
var doc = currentSolution.GetRequiredDocument(docId);
var updater = doc.Project.LanguageServices.GetRequiredService<AbstractChangeSignatureService>();
var root = doc.GetSyntaxRootSynchronously(CancellationToken.None);
var root = await doc.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false);
if (root is null)
{
throw new NotSupportedException(WorkspacesResources.Document_does_not_support_syntax_trees);
......@@ -420,7 +391,7 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
newRoot,
changeSignatureFormattingAnnotation,
doc.Project.Solution.Workspace,
options: doc.GetOptionsAsync(cancellationToken).WaitAndGetResult(cancellationToken),
options: await doc.GetOptionsAsync(cancellationToken).ConfigureAwait(false),
rules: GetFormattingRules(doc),
cancellationToken: CancellationToken.None);
......@@ -431,18 +402,17 @@ internal ChangeSignatureResult ChangeSignatureWithContext(ChangeSignatureAnalysi
foreach (var docId in nodesToUpdate.Keys)
{
var updatedDoc = currentSolution.GetRequiredDocument(docId).WithSyntaxRoot(updatedRoots[docId]);
var docWithImports = ImportAdder.AddImportsFromSymbolAnnotationAsync(updatedDoc, cancellationToken: cancellationToken).WaitAndGetResult(cancellationToken);
var reducedDoc = Simplifier.ReduceAsync(docWithImports, Simplifier.Annotation, cancellationToken: cancellationToken).WaitAndGetResult(cancellationToken);
var formattedDoc = Formatter.FormatAsync(reducedDoc, SyntaxAnnotation.ElasticAnnotation, cancellationToken: cancellationToken).WaitAndGetResult(cancellationToken);
var docWithImports = await ImportAdder.AddImportsFromSymbolAnnotationAsync(updatedDoc, cancellationToken: cancellationToken).ConfigureAwait(false);
var reducedDoc = await Simplifier.ReduceAsync(docWithImports, Simplifier.Annotation, cancellationToken: cancellationToken).ConfigureAwait(false);
var formattedDoc = await Formatter.FormatAsync(reducedDoc, SyntaxAnnotation.ElasticAnnotation, cancellationToken: cancellationToken).ConfigureAwait(false);
currentSolution = currentSolution.WithDocumentSyntaxRoot(docId, formattedDoc.GetSyntaxRootSynchronously(cancellationToken)!);
currentSolution = currentSolution.WithDocumentSyntaxRoot(docId, (await formattedDoc.GetSyntaxRootAsync(cancellationToken).ConfigureAwait(false))!);
}
telemetryTimer.Stop();
ChangeSignatureLogger.LogCommitInformation(telemetryNumberOfDeclarationsToUpdate, telemetryNumberOfReferencesToUpdate, (int)telemetryTimer.ElapsedMilliseconds);
updatedSolution = currentSolution;
return true;
return (currentSolution, confirmationMessage);
}
#nullable disable
......
src/Features/Core/Portable/ChangeSignature/ChangeSignatureAnalyzedContext.cs
浏览文件 @ e03e7a46
......@@ -29,9 +29,9 @@ internal sealed class ChangeSignatureAnalysisSucceededContext : ChangeSignatureA
internal sealed class CannotChangeSignatureAnalyzedContext : ChangeSignatureAnalyzedContext
{
public readonly CannotChangeSignatureReason CannotChangeSignatureReason;
public readonly ChangeSignatureFailureKind CannotChangeSignatureReason;
public CannotChangeSignatureAnalyzedContext(CannotChangeSignatureReason reason)
public CannotChangeSignatureAnalyzedContext(ChangeSignatureFailureKind reason)
{
CannotChangeSignatureReason = reason;
}
......
src/Features/Core/Portable/ChangeSignature/ChangeSignatureCodeAction.cs
浏览文件 @ e03e7a46
......@@ -2,10 +2,13 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.CodeAnalysis.CodeActions;
using Microsoft.CodeAnalysis.Notification;
using Microsoft.CodeAnalysis.Shared.Utilities;
using Roslyn.Utilities;
namespace Microsoft.CodeAnalysis.ChangeSignature
......@@ -26,19 +29,19 @@ public ChangeSignatureCodeAction(AbstractChangeSignatureService changeSignatureS
public override object? GetOptions(CancellationToken cancellationToken)
=> AbstractChangeSignatureService.GetChangeSignatureOptions(_context);
protected override Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
{
if (options is ChangeSignatureOptionsResult changeSignatureOptions && changeSignatureOptions != null)
{
var changeSignatureResult = _changeSignatureService.ChangeSignatureWithContext(_context, changeSignatureOptions, cancellationToken);
var changeSignatureResult = await _changeSignatureService.ChangeSignatureWithContextAsync(_context, changeSignatureOptions, cancellationToken).ConfigureAwait(false);
if (changeSignatureResult.Succeeded)
{
return Task.FromResult(SpecializedCollections.SingletonEnumerable<CodeActionOperation>(new ApplyChangesOperation(changeSignatureResult.UpdatedSolution!)));
return SpecializedCollections.SingletonEnumerable<CodeActionOperation>(new ChangeSignatureCodeActionOperation(changeSignatureResult.UpdatedSolution, changeSignatureResult.ConfirmationMessage));
}
}
return SpecializedTasks.EmptyEnumerable<CodeActionOperation>();
return SpecializedCollections.EmptyEnumerable<CodeActionOperation>();
}
}
}
src/Features/Core/Portable/ChangeSignature/ChangeSignatureCodeActionOperation.cs 0 → 100644
浏览文件 @ e03e7a46
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System;
using System.Threading;
using Microsoft.CodeAnalysis.CodeActions;
using Microsoft.CodeAnalysis.Notification;
using Microsoft.CodeAnalysis.Shared.Utilities;
namespace Microsoft.CodeAnalysis.ChangeSignature
{
/// <summary>
/// Defines the <see cref="CodeActionOperation"/> for the <see cref="ChangeSignatureCodeAction"/>
/// This is used instead of <see cref="ApplyChangesOperation"/> as we need to show a confirmation
/// dialog to the user before applying the change.
/// </summary>
internal class ChangeSignatureCodeActionOperation : CodeActionOperation
{
public Solution ChangedSolution { get; }
public string? ConfirmationMessage { get; }
public ChangeSignatureCodeActionOperation(Solution changedSolution, string? confirmationMessage)
{
ChangedSolution = changedSolution ?? throw new ArgumentNullException(nameof(changedSolution));
ConfirmationMessage = confirmationMessage;
}
internal override bool ApplyDuringTests => true;
public override void Apply(Workspace workspace, CancellationToken cancellationToken)
=> this.TryApply(workspace, new ProgressTracker(), cancellationToken);
/// <summary>
/// Show the confirmation message, if available, before attempting to apply the changes.
/// </summary>
internal override bool TryApply(
Workspace workspace, IProgressTracker progressTracker, CancellationToken cancellationToken)
{
if (ConfirmationMessage != null)
{
var notificationService = workspace.Services.GetRequiredService<INotificationService>();
if (!notificationService.ConfirmMessageBox(ConfirmationMessage, severity: NotificationSeverity.Warning))
{
return false;
}
}
return workspace.TryApplyChanges(ChangedSolution, progressTracker);
}
}
}
src/Features/Core/Portable/ChangeSignature/CannotChangeSignatureReason.cs → src/Features/Core/Portable/ChangeSignature/ChangeSignatureFailureKind.cs
浏览文件 @ e03e7a46
......@@ -6,7 +6,7 @@
namespace Microsoft.CodeAnalysis.ChangeSignature
{
internal enum CannotChangeSignatureReason
internal enum ChangeSignatureFailureKind
{
None,
DefinedInMetadata,
......
src/Features/Core/Portable/ChangeSignature/ChangeSignatureResult.cs
浏览文件 @ e03e7a46
......@@ -2,27 +2,41 @@
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
using System.Diagnostics.CodeAnalysis;
namespace Microsoft.CodeAnalysis.ChangeSignature
{
internal sealed class ChangeSignatureResult
{
[MemberNotNullWhen(true, nameof(UpdatedSolution))]
public bool Succeeded { get; }
public Solution? UpdatedSolution { get; }
public Glyph? Glyph { get; }
public bool PreviewChanges { get; }
public ChangeSignatureFailureKind? ChangeSignatureFailureKind { get; }
public string? ConfirmationMessage { get; }
/// <summary>
/// Name of the symbol. Needed here for the Preview Changes dialog.
/// </summary>
public string? Name { get; }
public ChangeSignatureResult(bool succeeded, Solution? updatedSolution = null, string? name = null, Glyph? glyph = null, bool previewChanges = false)
public ChangeSignatureResult(
bool succeeded,
Solution? updatedSolution = null,
string? name = null,
Glyph? glyph = null,
bool previewChanges = false,
ChangeSignatureFailureKind? changeSignatureFailureKind = null,
string? confirmationMessage = null)
{
Succeeded = succeeded;
UpdatedSolution = updatedSolution;
Name = name;
Glyph = glyph;
PreviewChanges = previewChanges;
ChangeSignatureFailureKind = changeSignatureFailureKind;
ConfirmationMessage = confirmationMessage;
}
}
}
src/VisualStudio/Core/Def/Implementation/ChangeSignature/VisualStudioChangeSignatureOptionsService.cs
浏览文件 @ e03e7a46
......@@ -13,7 +13,7 @@
namespace Microsoft.VisualStudio.LanguageServices.Implementation.ChangeSignature
{
[ExportWorkspaceService(typeof(IChangeSignatureOptionsService), ServiceLayer.Host), Shared]
internal class VisualStudioChangeSignatureOptionsService : IChangeSignatureOptionsService
internal class VisualStudioChangeSignatureOptionsService : ForegroundThreadAffinitizedObject, IChangeSignatureOptionsService
{
private readonly IClassificationFormatMap _classificationFormatMap;
private readonly ClassificationTypeMap _classificationTypeMap;
......@@ -22,7 +22,8 @@ internal class VisualStudioChangeSignatureOptionsService : IChangeSignatureOptio
[Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
public VisualStudioChangeSignatureOptionsService(
IClassificationFormatMapService classificationFormatMapService,
ClassificationTypeMap classificationTypeMap)
ClassificationTypeMap classificationTypeMap,
IThreadingContext threadingContext) : base(threadingContext)
{
_classificationFormatMap = classificationFormatMapService.GetClassificationFormatMap("tooltip");
_classificationTypeMap = classificationTypeMap;
......@@ -34,6 +35,8 @@ internal class VisualStudioChangeSignatureOptionsService : IChangeSignatureOptio
ISymbol symbol,
ParameterConfiguration parameters)
{
this.AssertIsForeground();
var viewModel = new ChangeSignatureDialogViewModel(
parameters,
symbol,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或