azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve generated code for Gradle properties

Browse Source 
Fix warnings about double nullability and useless elvis.
This commit is contained in:
Alexander Udalov
2021-02-19 17:49:15 +01:00
committed by TeamCityServer
parent ccc27b6a0c
commit e5128a8772
5 changed files with 41 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
generators/tests/org/jetbrains/kotlin/generators/arguments/GenerateGradleOptions.kt
+17 -12
View File
@@ -198,15 +198,19 @@ private fun Printer.generateImpl(
for (property in properties) {
println()
val backingField = property.backingField()
val backingFieldType = property.gradleReturnType + "?"
println("private var $backingField: $backingFieldType = null")
generatePropertyDeclaration(property, modifiers = "override")
withIndent {
println("get() = $backingField ?: ${property.gradleDefaultValue}")
println("set(value) {")
withIndent { println("$backingField = value") }
println("}")
val propertyType = property.gradleReturnType
if (propertyType.endsWith("?")) {
generatePropertyDeclaration(property, modifiers = "override", value = "null")
} else {
val backingField = property.backingField()
println("private var $backingField: $propertyType? = null")
generatePropertyDeclaration(property, modifiers = "override")
withIndent {
println("get() = $backingField ?: ${property.gradleDefaultValue}")
println("set(value) {")
withIndent { println("$backingField = value") }
println("}")
}
}
}
@@ -214,7 +218,7 @@ private fun Printer.generateImpl(
println("internal open fun updateArguments(args: $argsType) {")
withIndent {
for (property in properties) {
val backingField = property.backingField()
val backingField = if (property.gradleReturnType.endsWith("?")) property.name else property.backingField()
println("$backingField?.let { args.${property.name} = it }")
}
}
@@ -252,9 +256,10 @@ private fun Printer.generateDeclaration(
println("}")
}
private fun Printer.generatePropertyDeclaration(property: KProperty1<*, *>, modifiers: String = "") {
private fun Printer.generatePropertyDeclaration(property: KProperty1<*, *>, modifiers: String = "", value: String? = null) {
val returnType = property.gradleReturnType
println("$modifiers var ${property.name}: $returnType")
val initialValue = if (value != null) " = $value" else ""
println("$modifiers var ${property.name}: $returnType$initialValue")
}
private fun Printer.generateOptionDeprecation(property: KProperty1<*, *>) {