[Generator] Consistent style for initializing local variables (#159)

czechboy0 · web-flow · commit 16420dfa30f2 · 2023-08-01T16:15:09.000+02:00
[Generator] Consistent style for initializing local variables ### Motivation Move to a consistent style when initializing local variables, always use `let foo = Foo(...)` vs `let foo: Foo = .init(...)`. ### Modifications Updated all occurrences of the latter to use the former. Also updated for the generated code. ### Result Consistent local variable initialization. ### Test Plan All tests passed. Reviewed by: gjcairo, simonjbeaumont Builds: ✔︎ pull request validation (5.8) - Build finished. ✔︎ pull request validation (5.9) - Build finished. ✔︎ pull request validation (docc test) - Build finished. ✔︎ pull request validation (integration test) - Build finished. ✔︎ pull request validation (nightly) - Build finished. ✔︎ pull request validation (soundness) - Build finished. #159
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift b/Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift
@@ -172,19 +172,19 @@ extension ClientFileTranslator {
             .identifier(Constants.Operations.namespace)
             .dot(description.methodName)
 
-        let operationArg: FunctionArgumentDescription = .init(
+        let operationArg = FunctionArgumentDescription(
             label: "forOperation",
             expression: operationTypeExpr.dot("id")
         )
-        let inputArg: FunctionArgumentDescription = .init(
+        let inputArg = FunctionArgumentDescription(
             label: "input",
             expression: .identifier(Constants.Operation.Input.variableName)
         )
-        let serializerArg: FunctionArgumentDescription = .init(
+        let serializerArg = FunctionArgumentDescription(
             label: "serializer",
             expression: try translateClientSerializer(description)
         )
-        let deserializerArg: FunctionArgumentDescription = .init(
+        let deserializerArg = FunctionArgumentDescription(
             label: "deserializer",
             expression: try translateClientDeserializer(description)
         )
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateCodable.swift b/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateCodable.swift
@@ -29,7 +29,7 @@ extension FileTranslator {
         let knownKeys =
             properties
             .map(\.originalName)
-        let knownKeysFunctionArg: FunctionArgumentDescription = .init(
+        let knownKeysFunctionArg = FunctionArgumentDescription(
             label: "knownKeys",
             expression: .literal(
                 .array(
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateObjectStruct.swift b/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateObjectStruct.swift
@@ -144,7 +144,7 @@ extension FileTranslator {
             typeUsage = valueTypeUsage.asDictionaryValue
         }
 
-        let extraProperty: PropertyBlueprint = .init(
+        let extraProperty = PropertyBlueprint(
             comment: .doc("A container of undocumented properties."),
             originalName: "additionalProperties",
             typeUsage: typeUsage,
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateStringEnum.swift b/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateStringEnum.swift
@@ -72,7 +72,7 @@ extension FileTranslator {
                     ]
                 )
             }
-            let unknownCase: SwitchCaseDescription = .init(
+            let unknownCase = SwitchCaseDescription(
                 kind: .default,
                 body: [
                     .expression(
@@ -126,7 +126,7 @@ extension FileTranslator {
                     ]
                 )
             }
-            let unknownCase: SwitchCaseDescription = .init(
+            let unknownCase = SwitchCaseDescription(
                 kind: .case(
                     .valueBinding(
                         kind: .let,
@@ -147,7 +147,7 @@ extension FileTranslator {
                 ]
             )
 
-            let variableDescription: VariableDescription = .init(
+            let variableDescription = VariableDescription(
                 accessModifier: config.access,
                 kind: .var,
                 left: "rawValue",
@@ -186,7 +186,7 @@ extension FileTranslator {
             )
         }
 
-        let enumDescription: EnumDescription = .init(
+        let enumDescription = EnumDescription(
             isFrozen: true,
             accessModifier: config.access,
             name: typeName.shortSwiftName,
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateTypealias.swift b/Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateTypealias.swift
@@ -26,7 +26,7 @@ extension FileTranslator {
         userDescription: String?,
         to existingTypeUsage: TypeUsage
     ) throws -> Declaration {
-        let typealiasDescription: TypealiasDescription = .init(
+        let typealiasDescription = TypealiasDescription(
             accessModifier: config.access,
             name: typeName.shortSwiftName,
             existingType: existingTypeUsage.fullyQualifiedNonOptionalSwiftName
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/RequestBody/translateRequestBody.swift b/Sources/_OpenAPIGeneratorCore/Translator/RequestBody/translateRequestBody.swift
@@ -204,7 +204,7 @@ extension ClientFileTranslator {
                         ])
                 )
             )
-            let caseDesc: SwitchCaseDescription = .init(
+            let caseDesc = SwitchCaseDescription(
                 kind: .case(.dot(contentTypeIdentifier), ["value"]),
                 body: [
                     .expression(bodyAssignExpr)
@@ -213,7 +213,7 @@ extension ClientFileTranslator {
             return caseDesc
         }
         if !requestBody.request.required {
-            let noneCase: SwitchCaseDescription = .init(
+            let noneCase = SwitchCaseDescription(
                 kind: .case(.dot("none")),
                 body: [
                     .expression(
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponseOutcome.swift b/Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponseOutcome.swift
@@ -276,8 +276,7 @@ extension ServerFileTranslator {
         let responseVarDecl: Declaration = .variable(
             kind: .var,
             left: "response",
-            type: "Response",
-            right: .dot("init")
+            right: .identifier("Response")
                 .call([
                     .init(label: "statusCode", expression: statusCodeExpr)
                 ])
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift b/Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift
@@ -192,19 +192,19 @@ extension ServerFileTranslator {
             .identifier(Constants.Operations.namespace)
             .dot(description.methodName)
 
-        let operationArg: FunctionArgumentDescription = .init(
+        let operationArg = FunctionArgumentDescription(
             label: "forOperation",
             expression: operationTypeExpr.dot("id")
         )
-        let requestArg: FunctionArgumentDescription = .init(
+        let requestArg = FunctionArgumentDescription(
             label: "request",
             expression: .identifier("request")
         )
-        let metadataArg: FunctionArgumentDescription = .init(
+        let metadataArg = FunctionArgumentDescription(
             label: "with",
             expression: .identifier("metadata")
         )
-        let methodArg: FunctionArgumentDescription = .init(
+        let methodArg = FunctionArgumentDescription(
             label: "using",
             expression: .closureInvocation(
                 body: [
@@ -218,11 +218,11 @@ extension ServerFileTranslator {
                 ]
             )
         )
-        let deserializerArg: FunctionArgumentDescription = .init(
+        let deserializerArg = FunctionArgumentDescription(
             label: "deserializer",
             expression: try translateServerDeserializer(description)
         )
-        let serializerArg: FunctionArgumentDescription = .init(
+        let serializerArg = FunctionArgumentDescription(
             label: "serializer",
             expression: try translateServerSerializer(description)
         )
diff --git a/Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateAPIProtocol.swift b/Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateAPIProtocol.swift
@@ -30,7 +30,7 @@ extension TypesFileTranslator {
             operations
             .map(translateAPIProtocolDeclaration(operation:))
 
-        let protocolDescription: ProtocolDescription = .init(
+        let protocolDescription = ProtocolDescription(
             accessModifier: config.access,
             name: Constants.APIProtocol.typeName,
             conformances: Constants.APIProtocol.conformances,
diff --git a/Tests/OpenAPIGeneratorCoreTests/Renderer/Test_TextBasedRenderer.swift b/Tests/OpenAPIGeneratorCoreTests/Renderer/Test_TextBasedRenderer.swift
@@ -16,7 +16,7 @@ import XCTest
 
 final class Test_TextBasedRenderer: XCTestCase {
 
-    var renderer: TextBasedRenderer = .init()
+    var renderer = TextBasedRenderer()
 
     func testComment() throws {
         try _test(
diff --git a/Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Server.swift b/Tests/OpenAPIGeneratorReferenceTests/Resources/ReferenceSources/Petstore/Server.swift
@@ -114,7 +114,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                 switch output {
                 case let .ok(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 200)
+                    var response = Response(statusCode: 200)
                     suppressMutabilityWarning(&response)
                     try converter.setHeaderFieldAsText(
                         in: &response.headerFields,
@@ -141,7 +141,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                     return response
                 case let .`default`(statusCode, value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: statusCode)
+                    var response = Response(statusCode: statusCode)
                     suppressMutabilityWarning(&response)
                     switch value.body {
                     case let .json(value):
@@ -203,7 +203,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                 switch output {
                 case let .created(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 201)
+                    var response = Response(statusCode: 201)
                     suppressMutabilityWarning(&response)
                     try converter.setHeaderFieldAsJSON(
                         in: &response.headerFields,
@@ -225,7 +225,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                     return response
                 case let .badRequest(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 400)
+                    var response = Response(statusCode: 400)
                     suppressMutabilityWarning(&response)
                     try converter.setHeaderFieldAsText(
                         in: &response.headerFields,
@@ -277,7 +277,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                 switch output {
                 case let .noContent(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 204)
+                    var response = Response(statusCode: 204)
                     suppressMutabilityWarning(&response)
                     return response
                 case let .undocumented(statusCode, _): return .init(statusCode: statusCode)
@@ -328,12 +328,12 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                 switch output {
                 case let .noContent(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 204)
+                    var response = Response(statusCode: 204)
                     suppressMutabilityWarning(&response)
                     return response
                 case let .badRequest(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 400)
+                    var response = Response(statusCode: 400)
                     suppressMutabilityWarning(&response)
                     switch value.body {
                     case let .json(value):
@@ -398,7 +398,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                 switch output {
                 case let .ok(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 200)
+                    var response = Response(statusCode: 200)
                     suppressMutabilityWarning(&response)
                     switch value.body {
                     case let .binary(value):
@@ -415,7 +415,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                     return response
                 case let .preconditionFailed(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 412)
+                    var response = Response(statusCode: 412)
                     suppressMutabilityWarning(&response)
                     switch value.body {
                     case let .json(value):
@@ -432,7 +432,7 @@ fileprivate extension UniversalServer where APIHandler: APIProtocol {
                     return response
                 case let .internalServerError(value):
                     suppressUnusedWarning(value)
-                    var response: Response = .init(statusCode: 500)
+                    var response = Response(statusCode: 500)
                     suppressMutabilityWarning(&response)
                     switch value.body {
                     case let .text(value):

Original file line number	Diff line number	Diff line change
`@@ -172,19 +172,19 @@ extension ClientFileTranslator {`
`172`	`172`	`.identifier(Constants.Operations.namespace)`
`173`	`173`	`.dot(description.methodName)`
`174`	`174`
`175`		`- let operationArg: FunctionArgumentDescription = .init(`
	`175`	`+ let operationArg = FunctionArgumentDescription(`
`176`	`176`	`label: "forOperation",`
`177`	`177`	`expression: operationTypeExpr.dot("id")`
`178`	`178`	`)`
`179`		`- let inputArg: FunctionArgumentDescription = .init(`
	`179`	`+ let inputArg = FunctionArgumentDescription(`
`180`	`180`	`label: "input",`
`181`	`181`	`expression: .identifier(Constants.Operation.Input.variableName)`
`182`	`182`	`)`
`183`		`- let serializerArg: FunctionArgumentDescription = .init(`
	`183`	`+ let serializerArg = FunctionArgumentDescription(`
`184`	`184`	`label: "serializer",`
`185`	`185`	`expression: try translateClientSerializer(description)`
`186`	`186`	`)`
`187`		`- let deserializerArg: FunctionArgumentDescription = .init(`
	`187`	`+ let deserializerArg = FunctionArgumentDescription(`
`188`	`188`	`label: "deserializer",`
`189`	`189`	`expression: try translateClientDeserializer(description)`
`190`	`190`	`)`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ extension FileTranslator {`
`144`	`144`	`typeUsage = valueTypeUsage.asDictionaryValue`
`145`	`145`	`}`
`146`	`146`
`147`		`- let extraProperty: PropertyBlueprint = .init(`
	`147`	`+ let extraProperty = PropertyBlueprint(`
`148`	`148`	`comment: .doc("A container of undocumented properties."),`
`149`	`149`	`originalName: "additionalProperties",`
`150`	`150`	`typeUsage: typeUsage,`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ extension FileTranslator {`
`72`	`72`	`]`
`73`	`73`	`)`
`74`	`74`	`}`
`75`		`- let unknownCase: SwitchCaseDescription = .init(`
	`75`	`+ let unknownCase = SwitchCaseDescription(`
`76`	`76`	`kind: .default,`
`77`	`77`	`body: [`
`78`	`78`	`.expression(`
`@@ -126,7 +126,7 @@ extension FileTranslator {`
`126`	`126`	`]`
`127`	`127`	`)`
`128`	`128`	`}`
`129`		`- let unknownCase: SwitchCaseDescription = .init(`
	`129`	`+ let unknownCase = SwitchCaseDescription(`
`130`	`130`	`kind: .case(`
`131`	`131`	`.valueBinding(`
`132`	`132`	`kind: .let,`
`@@ -147,7 +147,7 @@ extension FileTranslator {`
`147`	`147`	`]`
`148`	`148`	`)`
`149`	`149`
`150`		`- let variableDescription: VariableDescription = .init(`
	`150`	`+ let variableDescription = VariableDescription(`
`151`	`151`	`accessModifier: config.access,`
`152`	`152`	`kind: .var,`
`153`	`153`	`left: "rawValue",`
`@@ -186,7 +186,7 @@ extension FileTranslator {`
`186`	`186`	`)`
`187`	`187`	`}`
`188`	`188`
`189`		`- let enumDescription: EnumDescription = .init(`
	`189`	`+ let enumDescription = EnumDescription(`
`190`	`190`	`isFrozen: true,`
`191`	`191`	`accessModifier: config.access,`
`192`	`192`	`name: typeName.shortSwiftName,`
Original file line number	Diff line number	Diff line change
`@@ -204,7 +204,7 @@ extension ClientFileTranslator {`
`204`	`204`	`])`
`205`	`205`	`)`
`206`	`206`	`)`
`207`		`- let caseDesc: SwitchCaseDescription = .init(`
	`207`	`+ let caseDesc = SwitchCaseDescription(`
`208`	`208`	`kind: .case(.dot(contentTypeIdentifier), ["value"]),`
`209`	`209`	`body: [`
`210`	`210`	`.expression(bodyAssignExpr)`
`@@ -213,7 +213,7 @@ extension ClientFileTranslator {`
`213`	`213`	`return caseDesc`
`214`	`214`	`}`
`215`	`215`	`if !requestBody.request.required {`
`216`		`- let noneCase: SwitchCaseDescription = .init(`
	`216`	`+ let noneCase = SwitchCaseDescription(`
`217`	`217`	`kind: .case(.dot("none")),`
`218`	`218`	`body: [`
`219`	`219`	`.expression(`
Original file line number	Diff line number	Diff line change
`@@ -192,19 +192,19 @@ extension ServerFileTranslator {`
`192`	`192`	`.identifier(Constants.Operations.namespace)`
`193`	`193`	`.dot(description.methodName)`
`194`	`194`
`195`		`- let operationArg: FunctionArgumentDescription = .init(`
	`195`	`+ let operationArg = FunctionArgumentDescription(`
`196`	`196`	`label: "forOperation",`
`197`	`197`	`expression: operationTypeExpr.dot("id")`
`198`	`198`	`)`
`199`		`- let requestArg: FunctionArgumentDescription = .init(`
	`199`	`+ let requestArg = FunctionArgumentDescription(`
`200`	`200`	`label: "request",`
`201`	`201`	`expression: .identifier("request")`
`202`	`202`	`)`
`203`		`- let metadataArg: FunctionArgumentDescription = .init(`
	`203`	`+ let metadataArg = FunctionArgumentDescription(`
`204`	`204`	`label: "with",`
`205`	`205`	`expression: .identifier("metadata")`
`206`	`206`	`)`
`207`		`- let methodArg: FunctionArgumentDescription = .init(`
	`207`	`+ let methodArg = FunctionArgumentDescription(`
`208`	`208`	`label: "using",`
`209`	`209`	`expression: .closureInvocation(`
`210`	`210`	`body: [`
`@@ -218,11 +218,11 @@ extension ServerFileTranslator {`
`218`	`218`	`]`
`219`	`219`	`)`
`220`	`220`	`)`
`221`		`- let deserializerArg: FunctionArgumentDescription = .init(`
	`221`	`+ let deserializerArg = FunctionArgumentDescription(`
`222`	`222`	`label: "deserializer",`
`223`	`223`	`expression: try translateServerDeserializer(description)`
`224`	`224`	`)`
`225`		`- let serializerArg: FunctionArgumentDescription = .init(`
	`225`	`+ let serializerArg = FunctionArgumentDescription(`
`226`	`226`	`label: "serializer",`
`227`	`227`	`expression: try translateServerSerializer(description)`
`228`	`228`	`)`