Touchups for new oneOf support

flipstone · Mar 22, 2024 · f78fc83 · f78fc83
1 parent 5761301
commit f78fc83
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 8 deletions.
diff --git a/json-fleece-codegen-util/src/Fleece/CodeGenUtil.hs b/json-fleece-codegen-util/src/Fleece/CodeGenUtil.hs
@@ -1382,15 +1382,14 @@ generateFleeceObject typeMap typeName codeGenFields mbAdditionalProperties typeO
       case mbAdditionalPropertiesSchemaTypeInfo of
         Nothing ->
           []
-        Just additionalPropsTypeInfo -> do
+        Just additionalPropsTypeInfo ->
           [
             ( additionalPropsFieldName
             , schemaTypeExpr (mapTypeInfo additionalPropsTypeInfo)
             , Nothing
             )
-            ]
+          ]
 
-  let
     fieldNameAndType field =
       (fieldName field, fieldTypeName field, fieldDescription field)
 

diff --git a/json-fleece-codegen-util/src/Fleece/CodeGenUtil/HaskellCode.hs b/json-fleece-codegen-util/src/Fleece/CodeGenUtil/HaskellCode.hs
@@ -440,7 +440,7 @@ unionTypeList members =
   fromCode $
     lines
       ( toCode union
-          : map (indent 2 . toCode) (delimitLines "'[ " " , " members <> ["]"])
+          : map (indent 2 . toCode) (delimitLines "'[ " " , " members <> [" ]"])
       )
 
 quote :: HaskellCode -> HaskellCode

diff --git a/json-fleece-openapi3/examples/test-cases/TestCases/Types/OneOfWithNullable.hs b/json-fleece-openapi3/examples/test-cases/TestCases/Types/OneOfWithNullable.hs
@@ -20,7 +20,7 @@ newtype OneOfWithNullable = OneOfWithNullable (Shrubbery.Union
    , [AStringType.AStringType]
    , Either FC.Null [AStringType.AStringType]
    , [Either FC.Null [AStringType.AStringType]]
-  ])
+   ])
   deriving (Show, Eq)
 
 oneOfWithNullableSchema :: FC.Fleece schema => schema OneOfWithNullable

diff --git a/json-fleece-openapi3/examples/test-cases/TestCases/Types/ReferenceOneOfInsideOneOf.hs b/json-fleece-openapi3/examples/test-cases/TestCases/Types/ReferenceOneOfInsideOneOf.hs
@@ -17,7 +17,7 @@ newtype ReferenceOneOfInsideOneOf = ReferenceOneOfInsideOneOf (Shrubbery.Union
   '[ ReferenceOneOf.ReferenceOneOf
    , TopLevelOneOfOneOption.TopLevelOneOfOneOption
    , [TopLevelOneOfOneOption.TopLevelOneOfOneOption]
-  ])
+   ])
   deriving (Show, Eq)
 
 referenceOneOfInsideOneOfSchema :: FC.Fleece schema => schema ReferenceOneOfInsideOneOf

diff --git a/json-fleece-openapi3/examples/test-cases/TestCases/Types/TopLevelOneOf.hs b/json-fleece-openapi3/examples/test-cases/TestCases/Types/TopLevelOneOf.hs
@@ -24,7 +24,7 @@ newtype TopLevelOneOf = TopLevelOneOf (Shrubbery.Union
    , Num2SchemaStartingWithNumber.Num2SchemaStartingWithNumber
    , [FieldDescriptions.FieldDescriptions]
    , [[MixedInJustAdditionalPropertiesSchemaInline.MixedInJustAdditionalPropertiesSchemaInline]]
-  ])
+   ])
   deriving (Show, Eq)
 
 topLevelOneOfSchema :: FC.Fleece schema => schema TopLevelOneOf

diff --git a/json-fleece-openapi3/examples/test-cases/TestCases/Types/TopLevelOneOfOneOption.hs b/json-fleece-openapi3/examples/test-cases/TestCases/Types/TopLevelOneOfOneOption.hs
@@ -13,7 +13,7 @@ import qualified Shrubbery as Shrubbery
 
 newtype TopLevelOneOfOneOption = TopLevelOneOfOneOption (Shrubbery.Union
   '[ T.Text
-  ])
+   ])
   deriving (Show, Eq)
 
 topLevelOneOfOneOptionSchema :: FC.Fleece schema => schema TopLevelOneOfOneOption