Fix rebase issues

Author: Josh DeGraw

src/Fantomas.Core.Tests/DallasTests.fs

@@ -3,6 +3,7 @@
 open NUnit.Framework
 open FsUnit
 open Fantomas.Core.Tests.TestHelper
+open Fantomas.Core.FormatConfig
 
 [<Test>]
 let ``proof of concept`` () =
@@ -1850,9 +1851,7 @@ let someTest input1 input2 =
         Expect.equal input1 input2 "didn't equal"
     }
 """
-        { config with
-            ExperimentalStroustrupStyle = true
-            MultilineBlockBracketsOnSameColumn = true }
+        { config with MultilineBracketStyle = ExperimentalStroustrup }
     |> prepend newline
     |> should
         equal

src/Fantomas.Core/CodePrinter2.fs

@@ -3,6 +3,7 @@
 open System
 open Fantomas.Core.Context
 open Fantomas.Core.SyntaxOak
+open Fantomas.Core.FormatConfig
 
 let noBreakInfixOps = set [| "="; ">"; "<"; "%" |]
 let newLineInfixOps = set [ "|>"; "||>"; "|||>"; ">>"; ">>=" ]
@@ -2553,7 +2554,7 @@ let genPat (p: Pattern) =
 
         let multilineExpressionIfAlignBrackets =
             ifAlignBrackets multilineRecordExprAlignBrackets multilineRecordExpr
-            
+
         fun ctx ->
             let size = getRecordSize ctx node.Fields
             genNode node (isSmallExpression size smallRecordExpr multilineExpressionIfAlignBrackets) ctx
@@ -3330,10 +3331,7 @@ let genTypeDefn (td: TypeDefn) =
             +> genSingleTextNode node.ClosingBrace
 
         let multilineExpression (ctx: Context) =
-            if
-                ctx.Config.MultilineBlockBracketsOnSameColumn
-                || (List.exists (fun (fieldNode: FieldNode) -> fieldNode.XmlDoc.IsSome) node.Fields)
-            then
+            let aligned =
                 let msIsEmpty = List.isEmpty members
 
                 (ifElseCtx
@@ -3351,7 +3349,12 @@ let genTypeDefn (td: TypeDefn) =
                  +> sepNlnTypeAndMembers typeDefnNode
                  +> genMemberDefnList members)
                     ctx
-            else
+
+            match ctx.Config.MultilineBracketStyle with
+            | Aligned
+            | ExperimentalStroustrup -> aligned
+            | Classic when (List.exists (fun (fieldNode: FieldNode) -> fieldNode.XmlDoc.IsSome) node.Fields) -> aligned
+            | Classic ->
                 (sepNlnUnlessLastEventIsNewline
                  +> opt (indent +> sepNln) node.Accessibility genSingleTextNode
                  +> genSingleTextNodeSuffixDelimiter node.OpeningBrace

src/Fantomas.Core/Fantomas.Core.fsproj

@@ -20,11 +20,6 @@
     <Compile Include="Queue.fs" />
     <Compile Include="Flowering.fsi" />
     <Compile Include="Flowering.fs" />
-    <Compile Include="SourceParser.fs" />
-    <Compile Include="AstTransformer.fsi" />
-    <Compile Include="AstTransformer.fs" />
-    <Compile Include="Version.fs" />
-    <Compile Include="Queue.fs" />
     <Compile Include="Defines.fsi" />
     <Compile Include="Defines.fs" />
     <Compile Include="Context.fs" />

src/Fantomas.Core/FormatConfig.fs

@@ -218,7 +218,7 @@ type FormatConfig =
       // [<Category("Convention")>]
       // [<DisplayName("Format braces using Stroustrup Style where possible.")>]
       // [<Description("Experimental feature, use at your own risk.")>]
- 
+
       [<Category("Convention")>]
       [<DisplayName("How to format brackets")>]
       [<Description("Possible options include classic (default), aligned, and experimental_stroustrup")>]
@@ -233,6 +233,9 @@ type FormatConfig =
       [<Description("Pretty printing based on ASTs only.\nPlease do not use this setting for formatting hand written code!")>]
       StrictMode: bool }
 
+    member this.ExperimentalStroustrupStyle =
+        this.MultilineBracketStyle = ExperimentalStroustrup
+
     static member Default =
         { IndentSize = 4
           MaxLineLength = 120