Fix some more unit tests.

fsprojects · Jun 3, 2022 · 9cb0f24 · 9cb0f24
1 parent 99821fe
commit 9cb0f24
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/Fantomas.Core/AstTransformer.fs b/src/Fantomas.Core/AstTransformer.fs
@@ -447,15 +447,9 @@ module private Ast =
                     |> finalContinuation)
             | SynExpr.LetOrUse (_, _, bindings, body, _, trivia) ->
                 visit body (fun nodes ->
-                    mkSynExprNode
-                        SynExpr_LetOrUse
-                        synExpr
-                        synExpr.Range
-                        (sortChildren
-                            [| yield! (List.map visitSynBinding bindings)
-                               yield! Option.toList (mkNodeOption SynExpr_LetOrUse_In trivia.InKeyword)
-                               yield! nodes |])
-                    |> List.singleton
+                    [ yield! (List.map visitSynBinding bindings)
+                      yield! Option.toList (mkNodeOption SynExpr_LetOrUse_In trivia.InKeyword)
+                      yield! nodes ]
                     |> finalContinuation)
             | SynExpr.TryWith (tryExpr,
                                withCases,

diff --git a/src/Fantomas.Core/CodePrinter.fs b/src/Fantomas.Core/CodePrinter.fs
@@ -3810,7 +3810,10 @@ and genTypeDefn
         +> genEq SynTypeDefn_Equals equalsRange
         +> indent
         +> sepNln
-        +> genMemberDefnList { astContext with InterfaceRange = None } others
+        +> genTriviaFor
+            SynTypeDefnRepr_ObjectModel
+            tdr.Range
+            (genMemberDefnList { astContext with InterfaceRange = None } others)
         +> unindent
 
     | ExceptionRepr (ExceptionDefRepr (ats, px, ao, uc)) -> genExceptionBody astContext ats px ao uc

diff --git a/src/Fantomas.Core/TriviaTypes.fs b/src/Fantomas.Core/TriviaTypes.fs
@@ -104,7 +104,7 @@ type FsAstType =
     | SynExpr_TypeApp
     | SynExpr_TypeApp_Less
     | SynExpr_TypeApp_Greater
-    | SynExpr_LetOrUse
+    // | SynExpr_LetOrUse use first nested SynExpr
     | SynExpr_LetOrUse_In
     | SynExpr_TryWith
     | SynExpr_TryWith_Try