fix: Proper formatting of generated structures (#894)

jbelkins · web-flow · commit 4c816b5f948a · 2025-01-08T11:05:33.000-06:00
diff --git a/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt b/smithy-swift-codegen/src/main/kotlin/software/amazon/smithy/swift/codegen/StructureGenerator.kt
@@ -143,21 +143,24 @@ class StructureGenerator(
         val hasMembers = membersSortedByName.isNotEmpty()
 
         if (hasMembers) {
-            writer.openBlock("public init(", ")") {
+            writer.write("public init(")
+            writer.indent {
                 for ((index, member) in membersSortedByName.withIndex()) {
                     val (memberName, memberSymbol) = memberShapeDataContainer.getOrElse(member) { Pair(null, null) }
                     if (memberName == null || memberSymbol == null) continue
                     val terminator = if (index == membersSortedByName.size - 1) "" else ","
                     writer.write("\$L: \$D$terminator", memberName, memberSymbol)
                 }
             }
-            writer.openBlock("{", "}") {
+            writer.write(") {")
+            writer.indent {
                 val path = "properties.".takeIf { error } ?: ""
                 membersSortedByName.forEach {
                     val (memberName, _) = memberShapeDataContainer.getOrElse(it) { return@forEach }
                     writer.write("self.$path\$L = \$L", memberName, memberName)
                 }
             }
+            writer.write("}")
         } else {
             writer.write("public init() { }")
         }
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/ServiceRenamesTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/ServiceRenamesTests.kt
@@ -27,8 +27,7 @@ public struct MyTestOperationInput: Swift.Sendable {
 
     public init(
         bar: ExampleClientTypes.RenamedGreeting? = nil
-    )
-    {
+    ) {
         self.bar = bar
     }
 }
@@ -54,8 +53,7 @@ public struct MyTestOperationOutput: Swift.Sendable {
 
     public init(
         baz: ExampleClientTypes.GreetingStruct? = nil
-    )
-    {
+    ) {
         self.baz = baz
     }
 }
@@ -83,8 +81,7 @@ extension ExampleClientTypes {
 
         public init(
             hi: Swift.String? = nil
-        )
-        {
+        ) {
             self.hi = hi
         }
     }
@@ -113,8 +110,7 @@ extension ExampleClientTypes {
 
         public init(
             salutation: Swift.String? = nil
-        )
-        {
+        ) {
             self.salutation = salutation
         }
     }
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructEncodeGenerationIsolatedTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructEncodeGenerationIsolatedTests.kt
@@ -46,8 +46,7 @@ public struct EnumInputInput: Swift.Sendable {
     public init(
         enumHeader: ExampleClientTypes.MyEnum? = nil,
         nestedWithEnum: ExampleClientTypes.NestedEnum? = nil
-    )
-    {
+    ) {
         self.enumHeader = enumHeader
         self.nestedWithEnum = nestedWithEnum
     }
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructureGeneratorTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/basicshapes/StructureGeneratorTests.kt
@@ -55,8 +55,7 @@ public struct MyStruct: Swift.Sendable {
         bar: Swift.Int = 0,
         baz: Swift.Int? = nil,
         foo: Swift.String? = nil
-    )
-    {
+    ) {
         self.bar = bar
         self.baz = baz
         self.foo = foo
@@ -110,8 +109,7 @@ public struct PrimitiveTypesInput: Swift.Sendable {
         primitiveShortVal: Swift.Int16 = 0,
         shortVal: Swift.Int16? = nil,
         str: Swift.String? = nil
-    )
-    {
+    ) {
         self.booleanVal = booleanVal
         self.byteVal = byteVal
         self.doubleVal = doubleVal
@@ -154,8 +152,7 @@ public struct RecursiveShapesInputOutputNested1: Swift.Sendable {
     public init(
         foo: Swift.String? = nil,
         nested: RecursiveShapesInputOutputNested2? = nil
-    )
-    {
+    ) {
         self.foo = foo
         self.nested = nested
     }
@@ -168,8 +165,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Sendable {
     public init(
         bar: Swift.String? = nil,
         recursiveMember: RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.bar = bar
         self.recursiveMember = recursiveMember
     }
@@ -181,8 +177,7 @@ public struct RecursiveShapesInputOutput: Swift.Sendable {
 
     public init(
         nested: RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.nested = nested
     }
 }
@@ -211,8 +206,7 @@ public struct RecursiveShapesInputOutputNestedList1: Swift.Sendable {
     public init(
         foo: Swift.String? = nil,
         recursiveList: [RecursiveShapesInputOutputNested2]? = nil
-    )
-    {
+    ) {
         self.foo = foo
         self.recursiveList = recursiveList
     }
@@ -225,8 +219,7 @@ public struct RecursiveShapesInputOutputNested2: Swift.Sendable {
     public init(
         bar: Swift.String? = nil,
         recursiveMember: RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.bar = bar
         self.recursiveMember = recursiveMember
     }
@@ -238,8 +231,7 @@ public struct RecursiveShapesInputOutputLists: Swift.Sendable {
 
     public init(
         nested: RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.nested = nested
     }
 }
@@ -282,8 +274,7 @@ public struct MyError: ClientRuntime.ModeledError, ClientRuntime.ServiceError, C
     public init(
         baz: Swift.Int? = nil,
         message: Swift.String? = nil
-    )
-    {
+    ) {
         self.properties.baz = baz
         self.properties.message = message
     }
@@ -333,8 +324,7 @@ public struct JsonListsInput: Swift.Sendable {
         stringList: [Swift.String]? = nil,
         stringSet: Swift.Set<Swift.String>? = nil,
         timestampList: [Foundation.Date]? = nil
-    )
-    {
+    ) {
         self.booleanList = booleanList
         self.integerList = integerList
         self.nestedStringList = nestedStringList
@@ -382,8 +372,7 @@ public struct JsonMapsInput: Swift.Sendable {
         sparseNumberMap: [Swift.String: Swift.Int?]? = nil,
         sparseStringMap: [Swift.String: Swift.String?]? = nil,
         sparseStructMap: [Swift.String: ExampleClientTypes.GreetingStruct?]? = nil
-    )
-    {
+    ) {
         self.denseBooleanMap = denseBooleanMap
         self.denseNumberMap = denseNumberMap
         self.denseStringMap = denseStringMap
@@ -420,8 +409,7 @@ public struct JsonMapsOutput: Swift.Sendable {
         sparseNumberMap: [Swift.String: Swift.Int?]? = nil,
         sparseStringMap: [Swift.String: Swift.String?]? = nil,
         sparseStructMap: [Swift.String: ExampleClientTypes.GreetingStruct?]? = nil
-    )
-    {
+    ) {
         self.denseBooleanMap = denseBooleanMap
         self.denseNumberMap = denseNumberMap
         self.denseStringMap = denseStringMap
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/codegencomponents/RecursiveShapeBoxerTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/codegencomponents/RecursiveShapeBoxerTests.kt
@@ -57,8 +57,7 @@ public struct RecursiveShapesInput: Swift.Sendable {
 
     public init(
         nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.nested = nested
     }
 }
@@ -74,8 +73,7 @@ public struct RecursiveShapesOutput: Swift.Sendable {
 
     public init(
         nested: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
-    )
-    {
+    ) {
         self.nested = nested
     }
 }
@@ -95,8 +93,7 @@ extension ExampleClientTypes {
         public init(
             foo: Swift.String? = nil,
             nested: ExampleClientTypes.RecursiveShapesInputOutputNested2? = nil
-        )
-        {
+        ) {
             self.foo = foo
             self.nested = nested
         }
@@ -116,8 +113,7 @@ extension ExampleClientTypes {
         public init(
             bar: Swift.String? = nil,
             recursiveMember: ExampleClientTypes.RecursiveShapesInputOutputNested1? = nil
-        )
-        {
+        ) {
             self.bar = bar
             self.recursiveMember = recursiveMember
         }
diff --git a/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/protocolspecificserde/awsjson11/NestedListEncodeJSONGenerationTests.kt b/smithy-swift-codegen/src/test/kotlin/software/amazon/smithy/swift/codegen/protocolspecificserde/awsjson11/NestedListEncodeJSONGenerationTests.kt
@@ -26,8 +26,7 @@ public struct ListOfMapsOperationInput: Swift.Sendable {
 
     public init(
         targetMaps: [[Swift.String: [Swift.String]]]? = nil
-    )
-    {
+    ) {
         self.targetMaps = targetMaps
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -143,21 +143,24 @@ class StructureGenerator(`
`143`	`143`	`val hasMembers = membersSortedByName.isNotEmpty()`
`144`	`144`
`145`	`145`	`if (hasMembers) {`
`146`		`- writer.openBlock("public init(", ")") {`
	`146`	`+ writer.write("public init(")`
	`147`	`+ writer.indent {`
`147`	`148`	`for ((index, member) in membersSortedByName.withIndex()) {`
`148`	`149`	`val (memberName, memberSymbol) = memberShapeDataContainer.getOrElse(member) { Pair(null, null) }`
`149`	`150`	`if (memberName == null \|\| memberSymbol == null) continue`
`150`	`151`	`val terminator = if (index == membersSortedByName.size - 1) "" else ","`
`151`	`152`	`writer.write("\$L: \$D$terminator", memberName, memberSymbol)`
`152`	`153`	`}`
`153`	`154`	`}`
`154`		`- writer.openBlock("{", "}") {`
	`155`	`+ writer.write(") {")`
	`156`	`+ writer.indent {`
`155`	`157`	`val path = "properties.".takeIf { error } ?: ""`
`156`	`158`	`membersSortedByName.forEach {`
`157`	`159`	`val (memberName, _) = memberShapeDataContainer.getOrElse(it) { return@forEach }`
`158`	`160`	`writer.write("self.$path\$L = \$L", memberName, memberName)`
`159`	`161`	`}`
`160`	`162`	`}`
	`163`	`+ writer.write("}")`
`161`	`164`	`} else {`
`162`	`165`	`writer.write("public init() { }")`
`163`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ public struct MyTestOperationInput: Swift.Sendable {`
`27`	`27`
`28`	`28`	`public init(`
`29`	`29`	`bar: ExampleClientTypes.RenamedGreeting? = nil`
`30`		`- )`
`31`		`- {`
	`30`	`+ ) {`
`32`	`31`	`self.bar = bar`
`33`	`32`	`}`
`34`	`33`	`}`
`@@ -54,8 +53,7 @@ public struct MyTestOperationOutput: Swift.Sendable {`
`54`	`53`
`55`	`54`	`public init(`
`56`	`55`	`baz: ExampleClientTypes.GreetingStruct? = nil`
`57`		`- )`
`58`		`- {`
	`56`	`+ ) {`
`59`	`57`	`self.baz = baz`
`60`	`58`	`}`
`61`	`59`	`}`
`@@ -83,8 +81,7 @@ extension ExampleClientTypes {`
`83`	`81`
`84`	`82`	`public init(`
`85`	`83`	`hi: Swift.String? = nil`
`86`		`- )`
`87`		`- {`
	`84`	`+ ) {`
`88`	`85`	`self.hi = hi`
`89`	`86`	`}`
`90`	`87`	`}`
`@@ -113,8 +110,7 @@ extension ExampleClientTypes {`
`113`	`110`
`114`	`111`	`public init(`
`115`	`112`	`salutation: Swift.String? = nil`
`116`		`- )`
`117`		`- {`
	`113`	`+ ) {`
`118`	`114`	`self.salutation = salutation`
`119`	`115`	`}`
`120`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ public struct ListOfMapsOperationInput: Swift.Sendable {`
`26`	`26`
`27`	`27`	`public init(`
`28`	`28`	`targetMaps: [[Swift.String: [Swift.String]]]? = nil`
`29`		`- )`
`30`		`- {`
	`29`	`+ ) {`
`31`	`30`	`self.targetMaps = targetMaps`
`32`	`31`	`}`
`33`	`32`	`}`