Merge pull request #10748 from michalhosala/fix-vbnet-tab-indentation

Fixed complex trivia tab indentation
dotnet · May 12, 2016 · c624146 · c624146
2 parents 27293ac + 7ef2e05
commit c624146
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 0 deletions.
diff --git a/...rkspaces/VisualBasic/Portable/Formatting/Engine/Trivia/TriviaDataFactory.ComplexTrivia.vb b/...rkspaces/VisualBasic/Portable/Formatting/Engine/Trivia/TriviaDataFactory.ComplexTrivia.vb
@@ -81,6 +81,10 @@ Namespace Microsoft.CodeAnalysis.VisualBasic.Formatting
 
                 Debug.Assert(Me.SecondTokenIsFirstTokenOnLine OrElse beginningOfNewLine)
 
+                If Me.OptionSet.GetOption(FormattingOptions.UseTabs, LanguageNames.VisualBasic) Then
+                    Return True
+                End If
+
                 Return CodeShapeAnalyzer.ShouldFormatMultiLine(context, beginningOfNewLine, list)
             End Function
 

diff --git a/src/Workspaces/VisualBasicTest/Formatting/FormattingTests.vb b/src/Workspaces/VisualBasicTest/Formatting/FormattingTests.vb
@@ -1774,6 +1774,33 @@ End Class</Code>
             Await AssertFormatAsync(code, expected, changedOptionSet:=optionSet)
         End Function
 
+        <Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
+        <WorkItem(10742, "https://github.com/dotnet/roslyn/issues/10742")>
+        Public Async Function ReFormatWithTabsEnabled6() As Task
+            Dim code =
+                "Class SomeClass" + vbCrLf +
+                "    Sub Foo() ' Comment" + vbCrLf +
+                "        Foo()" + vbCrLf +
+                "    End Sub" + vbCrLf +
+                "End Class"
+
+            Dim expected =
+                "Class SomeClass" + vbCrLf +
+                vbTab + "Sub Foo() ' Comment" + vbCrLf +
+                vbTab + vbTab + "Foo()" + vbCrLf +
+                vbTab + "End Sub" + vbCrLf +
+                "End Class"
+
+            Dim optionSet = New Dictionary(Of OptionKey, Object) From
+            {
+                {New OptionKey(FormattingOptions.UseTabs, LanguageNames.VisualBasic), True},
+                {New OptionKey(FormattingOptions.TabSize, LanguageNames.VisualBasic), 4},
+                {New OptionKey(FormattingOptions.IndentationSize, LanguageNames.VisualBasic), 4}
+            }
+
+            Await AssertFormatAsync(code, expected, changedOptionSet:=optionSet)
+        End Function
+
         <Fact, Trait(Traits.Feature, Traits.Features.Formatting)>
         Public Async Function ReFormatWithTabsDisabled() As Task
             Dim code =