Skip to content

Commit 16420df

Browse files
czechboy0czechboy0
authored
[Generator] Consistent style for initializing local variables (#159)
[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
1 parent 8d5b397 commit 16420df

File tree

11 files changed

+32
-33
lines changed

11 files changed

+32
-33
lines changed

‎Sources/_OpenAPIGeneratorCore/Translator/ClientTranslator/translateClientMethod.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -172,19 +172,19 @@ extension ClientFileTranslator {
172172
.identifier(Constants.Operations.namespace)
173173
.dot(description.methodName)
174174

175-
let operationArg: FunctionArgumentDescription = .init(
175+
let operationArg = FunctionArgumentDescription(
176176
label: "forOperation",
177177
expression: operationTypeExpr.dot("id")
178178
)
179-
let inputArg: FunctionArgumentDescription = .init(
179+
let inputArg = FunctionArgumentDescription(
180180
label: "input",
181181
expression: .identifier(Constants.Operation.Input.variableName)
182182
)
183-
let serializerArg: FunctionArgumentDescription = .init(
183+
let serializerArg = FunctionArgumentDescription(
184184
label: "serializer",
185185
expression: try translateClientSerializer(description)
186186
)
187-
let deserializerArg: FunctionArgumentDescription = .init(
187+
let deserializerArg = FunctionArgumentDescription(
188188
label: "deserializer",
189189
expression: try translateClientDeserializer(description)
190190
)

‎Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateCodable.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ extension FileTranslator {
2929
let knownKeys =
3030
properties
3131
.map(\.originalName)
32-
let knownKeysFunctionArg: FunctionArgumentDescription = .init(
32+
let knownKeysFunctionArg = FunctionArgumentDescription(
3333
label: "knownKeys",
3434
expression: .literal(
3535
.array(

‎Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateObjectStruct.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ extension FileTranslator {
144144
typeUsage = valueTypeUsage.asDictionaryValue
145145
}
146146

147-
let extraProperty: PropertyBlueprint = .init(
147+
let extraProperty = PropertyBlueprint(
148148
comment: .doc("A container of undocumented properties."),
149149
originalName: "additionalProperties",
150150
typeUsage: typeUsage,

‎Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateStringEnum.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ extension FileTranslator {
7272
]
7373
)
7474
}
75-
let unknownCase: SwitchCaseDescription = .init(
75+
let unknownCase = SwitchCaseDescription(
7676
kind: .default,
7777
body: [
7878
.expression(
@@ -126,7 +126,7 @@ extension FileTranslator {
126126
]
127127
)
128128
}
129-
let unknownCase: SwitchCaseDescription = .init(
129+
let unknownCase = SwitchCaseDescription(
130130
kind: .case(
131131
.valueBinding(
132132
kind: .let,
@@ -147,7 +147,7 @@ extension FileTranslator {
147147
]
148148
)
149149

150-
let variableDescription: VariableDescription = .init(
150+
let variableDescription = VariableDescription(
151151
accessModifier: config.access,
152152
kind: .var,
153153
left: "rawValue",
@@ -186,7 +186,7 @@ extension FileTranslator {
186186
)
187187
}
188188

189-
let enumDescription: EnumDescription = .init(
189+
let enumDescription = EnumDescription(
190190
isFrozen: true,
191191
accessModifier: config.access,
192192
name: typeName.shortSwiftName,

‎Sources/_OpenAPIGeneratorCore/Translator/CommonTranslations/translateTypealias.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ extension FileTranslator {
2626
userDescription: String?,
2727
to existingTypeUsage: TypeUsage
2828
) throws -> Declaration {
29-
let typealiasDescription: TypealiasDescription = .init(
29+
let typealiasDescription = TypealiasDescription(
3030
accessModifier: config.access,
3131
name: typeName.shortSwiftName,
3232
existingType: existingTypeUsage.fullyQualifiedNonOptionalSwiftName

‎Sources/_OpenAPIGeneratorCore/Translator/RequestBody/translateRequestBody.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ extension ClientFileTranslator {
204204
])
205205
)
206206
)
207-
let caseDesc: SwitchCaseDescription = .init(
207+
let caseDesc = SwitchCaseDescription(
208208
kind: .case(.dot(contentTypeIdentifier), ["value"]),
209209
body: [
210210
.expression(bodyAssignExpr)
@@ -213,7 +213,7 @@ extension ClientFileTranslator {
213213
return caseDesc
214214
}
215215
if !requestBody.request.required {
216-
let noneCase: SwitchCaseDescription = .init(
216+
let noneCase = SwitchCaseDescription(
217217
kind: .case(.dot("none")),
218218
body: [
219219
.expression(

‎Sources/_OpenAPIGeneratorCore/Translator/Responses/translateResponseOutcome.swift‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,7 @@ extension ServerFileTranslator {
276276
let responseVarDecl: Declaration = .variable(
277277
kind: .var,
278278
left: "response",
279-
type: "Response",
280-
right: .dot("init")
279+
right: .identifier("Response")
281280
.call([
282281
.init(label: "statusCode", expression: statusCodeExpr)
283282
])

‎Sources/_OpenAPIGeneratorCore/Translator/ServerTranslator/translateServerMethod.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,19 +192,19 @@ extension ServerFileTranslator {
192192
.identifier(Constants.Operations.namespace)
193193
.dot(description.methodName)
194194

195-
let operationArg: FunctionArgumentDescription = .init(
195+
let operationArg = FunctionArgumentDescription(
196196
label: "forOperation",
197197
expression: operationTypeExpr.dot("id")
198198
)
199-
let requestArg: FunctionArgumentDescription = .init(
199+
let requestArg = FunctionArgumentDescription(
200200
label: "request",
201201
expression: .identifier("request")
202202
)
203-
let metadataArg: FunctionArgumentDescription = .init(
203+
let metadataArg = FunctionArgumentDescription(
204204
label: "with",
205205
expression: .identifier("metadata")
206206
)
207-
let methodArg: FunctionArgumentDescription = .init(
207+
let methodArg = FunctionArgumentDescription(
208208
label: "using",
209209
expression: .closureInvocation(
210210
body: [
@@ -218,11 +218,11 @@ extension ServerFileTranslator {
218218
]
219219
)
220220
)
221-
let deserializerArg: FunctionArgumentDescription = .init(
221+
let deserializerArg = FunctionArgumentDescription(
222222
label: "deserializer",
223223
expression: try translateServerDeserializer(description)
224224
)
225-
let serializerArg: FunctionArgumentDescription = .init(
225+
let serializerArg = FunctionArgumentDescription(
226226
label: "serializer",
227227
expression: try translateServerSerializer(description)
228228
)

‎Sources/_OpenAPIGeneratorCore/Translator/TypesTranslator/translateAPIProtocol.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extension TypesFileTranslator {
3030
operations
3131
.map(translateAPIProtocolDeclaration(operation:))
3232

33-
let protocolDescription: ProtocolDescription = .init(
33+
let protocolDescription = ProtocolDescription(
3434
accessModifier: config.access,
3535
name: Constants.APIProtocol.typeName,
3636
conformances: Constants.APIProtocol.conformances,

‎Tests/OpenAPIGeneratorCoreTests/Renderer/Test_TextBasedRenderer.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import XCTest
1616

1717
final class Test_TextBasedRenderer: XCTestCase {
1818

19-
var renderer: TextBasedRenderer = .init()
19+
var renderer = TextBasedRenderer()
2020

2121
func testComment() throws {
2222
try _test(

0 commit comments

Comments
 (0)