fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-19 16:09:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve readability of constructor invocation params (#1312)

Browse Source
This commit is contained in:
Zac Sweers
2021-03-13 20:52:25 -05:00
committed by GitHub
parent 3bc47519ab
commit 103b60328c
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt
View File

@@ -553,7 +553,12 @@ internal class AdapterGenerator(
// We have to use the default primitive for the available type in order for // We have to use the default primitive for the available type in order for
// invokeDefaultConstructor to properly invoke it. Just using "null" isn't safe because // invokeDefaultConstructor to properly invoke it. Just using "null" isn't safe because
// the transient type may be a primitive type. // the transient type may be a primitive type.
result.addCode(input.type.rawType().defaultPrimitiveValue()) // Inline a little comment for readability indicating which parameter is it's referring to
result.addCode(
"/*·%L·*/·%L",
input.parameter.name,
input.type.rawType().defaultPrimitiveValue()
)
} else { } else {
result.addCode("%N", (input as ParameterProperty).property.localName) result.addCode("%N", (input as ParameterProperty).property.localName)
} }
@@ -580,7 +585,7 @@ internal class AdapterGenerator(
if (useDefaultsConstructor) { if (useDefaultsConstructor) {
// Add the masks and a null instance for the trailing default marker instance // Add the masks and a null instance for the trailing default marker instance
result.addCode(",\n%L,\nnull", maskNames.map { CodeBlock.of("%L", it) }.joinToCode(", ")) result.addCode(",\n%L,\n/*·DefaultConstructorMarker·*/·null", maskNames.map { CodeBlock.of("%L", it) }.joinToCode(", "))
} }
result.addCode("\n»)\n") result.addCode("\n»)\n")