Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Offer add parameter to constructor refactoring for all applicable constructors #34041

Merged
merged 14 commits into from
Mar 26, 2019
Merged

Offer add parameter to constructor refactoring for all applicable constructors #34041

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2fc0ecf
Fixes 33603 and 33623
chborl Mar 12, 2019
2933474
Respond to feedback
chborl Mar 14, 2019
2e64ad9
Fix spelling/random characters
JoeRobich Mar 14, 2019
73001c9
Use IsEmpty property
JoeRobich Mar 14, 2019
6c86d40
remove unneeded null check
chborl Mar 14, 2019
6b1aaa8
Merge branch 'deserializationctor' of https://github.com/chborl/rosly…
chborl Mar 14, 2019
39fc4b5
Configure await false
sharwell Mar 15, 2019
1f40165
refactor null check
sharwell Mar 15, 2019
a0fada4
Respond to feedback and refactor
chborl Mar 20, 2019
96b9f4e
Wrap long lines
chborl Mar 21, 2019
362e4ec
Update test comments
sharwell Mar 21, 2019
5653782
Change .AsImmutableOrNull to .ToImmutableAndFree
sharwell Mar 21, 2019
8a95222
Fix test doc comments
chborl Mar 25, 2019
3c9c22e
Apply suggestions from code review
sharwell Mar 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
488 changes: 484 additions & 4 deletions ...omMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs
View file
Open in desktop

Large diffs are not rendered by default.

261 changes: 257 additions & 4 deletions ...BasicTest/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
' Copyright (c) Microsoft. All Rights Reserved. Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.

Imports System.Collections.Immutable
Imports Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
Imports Microsoft.CodeAnalysis.CodeActions
Imports Microsoft.CodeAnalysis.CodeRefactorings
Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings

Expand All @@ -12,6 +14,10 @@ Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AddConstructorPara
Return New AddConstructorParametersFromMembersCodeRefactoringProvider()
End Function

Protected Overrides Function MassageActions(actions As ImmutableArray(Of CodeAction)) As ImmutableArray(Of CodeAction)
Return FlattenActions(actions)
End Function

<WorkItem(530592, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530592")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestAdd1() As Task
Expand Down Expand Up @@ -56,8 +62,10 @@ index:=1)
End Function

<WorkItem(530592, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530592")>
<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestAddToConstructorWithMostMatchingParameters1() As Task
' behavior change with 33603, now all constructors offered
Await TestInRegularAndScriptAsync(
"Class Program
[|Private i As Integer
Expand All @@ -83,12 +91,14 @@ End Class",
Me.s = s
Me.b = b
End Sub
End Class")
End Class", index:=1)
End Function

<WorkItem(530592, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/530592")>
<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestAddOptionalToConstructorWithMostMatchingParameters1() As Task
' behavior change with 33603, now all constructors offered
Await TestInRegularAndScriptAsync(
"Class Program
[|Private i As Integer
Expand All @@ -115,7 +125,7 @@ End Class",
Me.b = b
End Sub
End Class",
index:=1)
index:=3)
End Function

<WorkItem(28775, "https://github.com/dotnet/roslyn/issues/28775")>
Expand Down Expand Up @@ -304,5 +314,248 @@ End Class",
End Sub
End Class")
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_FirstOfThree() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer)
Me.i = i
End Sub

Public Sub New(i As Integer, j As Integer)
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer)
End Sub
End Class",
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer, l As Integer)
Me.i = i
Me.l = l
End Sub

Public Sub New(i As Integer, j As Integer)
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer)
End Sub
End Class", index:=0)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_SecondOfThree() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer)
Me.i = i
End Sub

Public Sub New(i As Integer, j As Integer)
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer)
End Sub
End Class",
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer)
Me.i = i
End Sub

Public Sub New(i As Integer, j As Integer, l As Integer)
Me.l = l
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer)
End Sub
End Class", index:=1)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_ThirdOfThree() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer)
Me.i = i
End Sub

Public Sub New(i As Integer, j As Integer)
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer)
End Sub
End Class",
"Class Program
Private [|l|] As Integer

Public Sub New(i As Integer)
Me.i = i
End Sub

Public Sub New(i As Integer, j As Integer)
End Sub

Public Sub New(i As Integer, j As Integer, k As Integer, l As Integer)
Me.l = l
End Sub
End Class", index:=2)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_OneMustBeOptional() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|l|] As Integer

' index 0, and 2 as optional
Public Sub New(i As Integer)
Me.i = i
End Sub

' index 3 as optional
Public Sub New(Optional j As Double = Nothing)
End Sub

' index 1, and 4 as optional
Public Sub New(i As Integer, j As Double)
End Sub
End Class",
"Class Program
Private [|l|] As Integer

' index 0, and 2 as optional
Public Sub New(i As Integer)
Me.i = i
End Sub

' index 3 as optional
Public Sub New(Optional j As Double = Nothing)
End Sub

' index 1, and 4 as optional
Public Sub New(i As Integer, j As Double, l As Integer)
Me.l = l
End Sub
End Class", index:=1)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_OneMustBeOptional2() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|l|] As Integer

' index 0, and 2 as optional
Public Sub New(i As Integer)
Me.i = i
End Sub

' index 3 as optional
Public Sub New(Optional j As Double = Nothing)
End Sub

' index 1, and 4 as optional
Public Sub New(i As Integer, j As Double)
End Sub
End Class",
"Class Program
Private [|l|] As Integer

' index 0, and 2 as optional
Public Sub New(i As Integer)
Me.i = i
End Sub

' index 3 as optional
Public Sub New(Optional j As Double = Nothing, Optional l As Integer = Nothing)
Me.l = l
End Sub

' index 1, and 4 as optional
Public Sub New(i As Integer, j As Double)
End Sub
End Class", index:=3)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_AllMustBeOptional1() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|p|] As Integer

Public Sub New(Optional i As Integer = Nothing)
Me.i = i
End Sub

Public Sub New(j As Double, Optional k As Double = Nothing)
End Sub

Public Sub New(l As Integer, m As Integer, Optional n As Integer = Nothing)
End Sub
End Class",
"Class Program
Private p As Integer

Public Sub New(Optional i As Integer = Nothing, Optional p As Integer = Nothing)
Me.i = i
Me.p = p
End Sub

Public Sub New(j As Double, Optional k As Double = Nothing)
End Sub

Public Sub New(l As Integer, m As Integer, Optional n As Integer = Nothing)
End Sub
End Class", index:=0)
End Function

<WorkItem(33603, "https://github.com/dotnet/roslyn/issues/33603")>
<Fact, Trait(Traits.Feature, Traits.Features.CodeActionsAddConstructorParametersFromMembers)>
Public Async Function TestMultipleConstructors_AllMustBeOptional2() As Task
Await TestInRegularAndScriptAsync(
"Class Program
Private [|p|] As Integer

Public Sub New(Optional i As Integer = Nothing)
Me.i = i
End Sub

Public Sub New(j As Double, Optional k As Double = Nothing)
End Sub

Public Sub New(l As Integer, m As Integer, Optional n As Integer = Nothing)
End Sub
End Class",
"Class Program
Private p As Integer

Public Sub New(Optional i As Integer = Nothing)
Me.i = i
End Sub

Public Sub New(j As Double, Optional k As Double = Nothing)
End Sub

Public Sub New(l As Integer, m As Integer, Optional n As Integer = Nothing, Optional p As Integer = Nothing)
Me.p = p
End Sub
End Class", index:=2)
End Function
End Class
End Namespace
End Namespace
Loading