Skip to content

Commit

Permalink
Merge pull request #44267 from sharwell/continuation-format
Browse files Browse the repository at this point in the history 
Add formatting tests for comments after line continuation
  • Loading branch information
@sharwell
sharwell authored May 16, 2020
2 parents d1a0151 + 57d8952 commit 914aed9
Showing 1 changed file with 110 additions and 67 deletions.
177 changes: 110 additions & 67 deletions src/Workspaces/VisualBasicTest/Formatting/FormattingTests.vb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -780,98 +780,139 @@ End Class</Code>
Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Public Async Function LineContinuation1() As Task
Dim code = <Code>Class C
<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function LineContinuation1(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim a = 1 + _
2 + _
Dim a = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Dim expected = <Code>Class C
Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim a = 1 + _
2 + _
Dim a = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
Await AssertFormatAsync(code, expected)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Public Async Function LineContinuation2() As Task
Dim code = <Code>Class C
<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function LineContinuation2(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
2 + _
Dim aa = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Dim expected = <Code>Class C
Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
2 + _
Dim aa = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
Await AssertFormatAsync(code, expected)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Public Async Function LineContinuation3() As Task
Dim code = <Code>Class C
<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function LineContinuation3(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
2 + _
Dim aa = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Dim expected = <Code>Class C
Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
2 + _
Dim aa = 1 + {continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
Await AssertFormatAsync(code, expected)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Public Async Function LineContinuation4() As Task
Dim code = <Code>Class C
<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function LineContinuation4(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
_
_
_
_
_
2 + _
Dim aa = 1 + {continuation}
{continuation}
{continuation}
{continuation}
{continuation}
{continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Dim expected = <Code>Class C
Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + _
_
_
_
_
_
2 + _
Dim aa = 1 + {continuation}
{continuation}
{continuation}
{continuation}
{continuation}
{continuation}
2 + {continuation}
3
End Sub
End Class</Code>
End Class"

Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
Await AssertFormatAsync(code, expected)
End Function

<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function LineContinuation5(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + {continuation}
{continuation}
{continuation}
{continuation}
{continuation}
{continuation}
2 + {continuation}
3
End Sub
End Class"

Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim aa = 1 + {continuation}
{continuation}
{continuation}
{continuation}
{continuation}
{continuation}
2 + {continuation}
3
End Sub
End Class"

Await AssertFormatAsync(code, expected)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Expand Down Expand Up @@ -1029,27 +1070,29 @@ End Class</Code>
Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
End Function

<Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
Public Async Function Trivia3() As Task
Dim code = <Code>Class C
<Theory, Trait(Traits.Feature, Traits.Features.Formatting)>
<InlineData("_")>
<InlineData("_ ' Comment")>
Public Async Function Trivia3(continuation As String) As Task
Dim code = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim a = _
_
_
Dim a = {continuation}
{continuation}
{continuation}
1
End Sub
End Class</Code>
End Class"

Dim expected = <Code>Class C
Dim expected = $"Class C
Sub Method(Optional ByVal i As Integer = 1)
Dim a = _
_
_
Dim a = {continuation}
{continuation}
{continuation}
1
End Sub
End Class</Code>
End Class"

Await AssertFormatLf2CrLfAsync(code.Value, expected.Value)
Await AssertFormatAsync(code, expected)
End Function

<WorkItem(538354, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/538354")>
Expand Down

0 comments on commit 914aed9

Please sign in to comment.