Refactor IsStroustrupStyleExpr and isStroustrupStyleType into Context…

….fs (#2756)

src/Fantomas.Core/CodePrinter.fs

@@ -851,7 +851,7 @@ let genExpr (e: Expr) =
                 onlyIf
                     (isMultiline
                      && ctx.Config.MultiLineLambdaClosingNewline
-                     && not (ctx.Config.ExperimentalStroustrupStyle && node.Lambda.Expr.IsStroustrupStyleExpr))
+                     && not (isStroustrupStyleExpr ctx.Config node.Lambda.Expr))
                     sepNln
                     ctx)
         +> genSingleTextNode node.ClosingParen
@@ -1052,9 +1052,7 @@ let genExpr (e: Expr) =
                         +> onlyIfCtx
                             (fun ctx ->
                                 ctx.Config.MultiLineLambdaClosingNewline
-                                && (not (
-                                    ctx.Config.ExperimentalStroustrupStyle && lambdaNode.Expr.IsStroustrupStyleExpr
-                                )))
+                                && (not (isStroustrupStyleExpr ctx.Config lambdaNode.Expr)))
                             sepNln
                         +> genSingleTextNode appParen.Paren.ClosingParen
                     | _ ->
@@ -1928,7 +1926,7 @@ let genClause (isLastItem: bool) (node: MatchClauseNode) =
                         ctx)
 
     let genPatAndBody ctx =
-        if ctx.Config.ExperimentalStroustrupStyle && node.BodyExpr.IsStroustrupStyleExpr then
+        if isStroustrupStyleExpr ctx.Config node.BodyExpr then
             let startColumn = ctx.Column
             (genPatInClause node.Pattern +> atIndentLevel false startColumn genWhenAndBody) ctx
         else
@@ -2187,9 +2185,7 @@ let genAppWithLambda sep (node: ExprAppWithLambdaNode) =
                     | Choice1Of2 lambdaNode ->
                         genSingleTextNode node.OpeningParen
                         +> (genLambdaWithParen lambdaNode |> genNode lambdaNode)
-                        +> onlyIf
-                            (not (ctx.Config.ExperimentalStroustrupStyle && lambdaNode.Expr.IsStroustrupStyleExpr))
-                            sepNln
+                        +> onlyIf (not (isStroustrupStyleExpr ctx.Config lambdaNode.Expr)) sepNln
                         +> genSingleTextNode node.ClosingParen
                     | Choice2Of2 matchLambdaNode ->
                         genSingleTextNode node.OpeningParen
@@ -2211,11 +2207,7 @@ let genAppWithLambda sep (node: ExprAppWithLambdaNode) =
                                  +> (genLambdaWithParen lambdaNode |> genNode lambdaNode))
                                 (fun isMultiline ->
                                     onlyIf
-                                        (isMultiline
-                                         && not (
-                                             ctx.Config.ExperimentalStroustrupStyle
-                                             && lambdaNode.Expr.IsStroustrupStyleExpr
-                                         ))
+                                        (isMultiline && not (isStroustrupStyleExpr ctx.Config lambdaNode.Expr))
                                         sepNln
                                     +> genSingleTextNode node.ClosingParen)
                         | Choice2Of2 matchLambdaNode ->

src/Fantomas.Core/Context.fs

@@ -752,21 +752,51 @@ let sepSpaceOrDoubleIndentAndNlnIfExpressionExceedsPageWidth expr (ctx: Context)
         expr
         ctx
 
+let isStroustrupStyleExpr (config: FormatConfig) (e: Expr) =
+    let isStroustrupEnabled = config.MultilineBracketStyle = ExperimentalStroustrup
+
+    match e with
+    | Expr.Record node when isStroustrupEnabled ->
+        match node.Extra with
+        | RecordNodeExtra.Inherit _ -> false
+        | RecordNodeExtra.With _
+        | RecordNodeExtra.None -> true
+    | Expr.AnonRecord _ when isStroustrupEnabled -> true
+    | Expr.NamedComputation node when isStroustrupEnabled ->
+        match node.Name with
+        | Expr.Ident _ -> true
+        | _ -> false
+    | Expr.ArrayOrList _ when isStroustrupEnabled -> true
+    | _ -> false
+
+let isStroustrupStyleType (config: FormatConfig) (t: Type) =
+    let isStroustrupEnabled = config.MultilineBracketStyle = ExperimentalStroustrup
+
+    match t with
+    | Type.AnonRecord _ when isStroustrupEnabled -> true
+    | _ -> false
+
+let canSafelyUseStroustrup (node: Node) = not node.HasContentBefore
+
 let sepSpaceOrIndentAndNlnIfExceedsPageWidthUnlessStroustrup isStroustrup f (node: Node) (ctx: Context) =
-    if
-        ctx.Config.ExperimentalStroustrupStyle
-        && isStroustrup
-        && Seq.isEmpty node.ContentBefore
-    then
+    if isStroustrup && canSafelyUseStroustrup node then
         (sepSpace +> f) ctx
     else
         sepSpaceOrIndentAndNlnIfExpressionExceedsPageWidth f ctx
 
-let sepSpaceOrIndentAndNlnIfExpressionExceedsPageWidthUnlessStroustrup f (expr: Expr) =
-    sepSpaceOrIndentAndNlnIfExceedsPageWidthUnlessStroustrup expr.IsStroustrupStyleExpr (f expr) (Expr.Node expr)
+let sepSpaceOrIndentAndNlnIfExpressionExceedsPageWidthUnlessStroustrup f (expr: Expr) (ctx: Context) =
+    sepSpaceOrIndentAndNlnIfExceedsPageWidthUnlessStroustrup
+        (isStroustrupStyleExpr ctx.Config expr)
+        (f expr)
+        (Expr.Node expr)
+        ctx
 
-let sepSpaceOrIndentAndNlnIfTypeExceedsPageWidthUnlessStroustrup f (t: Type) =
-    sepSpaceOrIndentAndNlnIfExceedsPageWidthUnlessStroustrup t.IsStroustrupStyleType (f t) (Type.Node t)
+let sepSpaceOrIndentAndNlnIfTypeExceedsPageWidthUnlessStroustrup f (t: Type) (ctx: Context) =
+    sepSpaceOrIndentAndNlnIfExceedsPageWidthUnlessStroustrup
+        (isStroustrupStyleType ctx.Config t)
+        (f t)
+        (Type.Node t)
+        ctx
 
 let autoNlnIfExpressionExceedsPageWidth expr (ctx: Context) =
     expressionExceedsPageWidth
@@ -907,10 +937,7 @@ let addParenIfAutoNln expr f =
 
 let autoIndentAndNlnExpressUnlessStroustrup (f: Expr -> Context -> Context) (e: Expr) (ctx: Context) =
     let shouldUseStroustrup =
-        ctx.Config.ExperimentalStroustrupStyle
-        && e.IsStroustrupStyleExpr
-        && let node = Expr.Node e in
-           Seq.isEmpty node.ContentBefore
+        isStroustrupStyleExpr ctx.Config e && canSafelyUseStroustrup (Expr.Node e)
 
     if shouldUseStroustrup then
         f e ctx
@@ -919,10 +946,7 @@ let autoIndentAndNlnExpressUnlessStroustrup (f: Expr -> Context -> Context) (e:
 
 let autoIndentAndNlnTypeUnlessStroustrup (f: Type -> Context -> Context) (t: Type) (ctx: Context) =
     let shouldUseStroustrup =
-        ctx.Config.ExperimentalStroustrupStyle
-        && t.IsStroustrupStyleType
-        && let node = Type.Node t in
-           Seq.isEmpty node.ContentBefore
+        isStroustrupStyleType ctx.Config t && canSafelyUseStroustrup (Type.Node t)
 
     if shouldUseStroustrup then
         f t ctx
@@ -935,9 +959,7 @@ let autoIndentAndNlnIfExpressionExceedsPageWidthUnlessStroustrup
     (ctx: Context)
     =
     let isStroustrup =
-        ctx.Config.ExperimentalStroustrupStyle
-        && e.IsStroustrupStyleExpr
-        && Seq.isEmpty (Expr.Node e).ContentBefore
+        isStroustrupStyleExpr ctx.Config e && canSafelyUseStroustrup (Expr.Node e)
 
     if isStroustrup then
         f e ctx

src/Fantomas.Core/Context.fsi

@@ -234,6 +234,8 @@ val sepSpaceOrIndentAndNlnIfExpressionExceedsPageWidthUnlessStroustrup:
 val sepSpaceOrIndentAndNlnIfTypeExceedsPageWidthUnlessStroustrup:
     f: (Type -> Context -> Context) -> t: Type -> (Context -> Context)
 
+val isStroustrupStyleExpr: config: FormatConfig -> e: Expr -> bool
+
 val autoParenthesisIfExpressionExceedsPageWidth: expr: (Context -> Context) -> ctx: Context -> Context
 val futureNlnCheck: f: (Context -> Context) -> ctx: Context -> bool
 /// similar to futureNlnCheck but validates whether the expression is going over the max page width

src/Fantomas.Core/SyntaxOak.fs

@@ -382,11 +382,6 @@ type Type =
         | Or n -> n
         | LongIdentApp n -> n
 
-    member e.IsStroustrupStyleType: bool =
-        match e with
-        | AnonRecord _ -> true
-        | _ -> false
-
 /// A pattern composed from a left hand-side pattern, a single text token/operator and a right hand-side pattern.
 type PatLeftMiddleRight(lhs: Pattern, middle: Choice<SingleTextNode, string>, rhs: Pattern, range) =
     inherit NodeBase(range)
@@ -1728,21 +1723,6 @@ type Expr =
         | Typar n -> n
         | Chain n -> n
 
-    member e.IsStroustrupStyleExpr: bool =
-        match e with
-        | Expr.Record node ->
-            match node.Extra with
-            | RecordNodeExtra.Inherit _ -> false
-            | RecordNodeExtra.With _
-            | RecordNodeExtra.None -> true
-        | Expr.AnonRecord _ -> true
-        | Expr.NamedComputation node ->
-            match node.Name with
-            | Expr.Ident _ -> true
-            | _ -> false
-        | Expr.ArrayOrList _ -> true
-        | _ -> false
-
     member e.HasParentheses: bool =
         match e with
         | Expr.Paren _ -> true