[FIR/IR generator] Replace getTypeWithArguments with a property
The `notNull` of that method was never used.
This commit is contained in:
committed by
Space Team
parent
de4e39906c
commit
f2bb988e68
+4
-2
@@ -43,7 +43,8 @@ class LeafBuilder(val implementation: Implementation) : Builder() {
|
||||
"${implementation.element.type}Builder"
|
||||
}
|
||||
|
||||
override fun getTypeWithArguments(notNull: Boolean): String = type + implementation.element.generics
|
||||
override val typeWithArguments: String
|
||||
get() = type + implementation.element.generics
|
||||
|
||||
override val allFields: List<FieldWithDefault> by lazy { implementation.fieldsWithoutDefault }
|
||||
|
||||
@@ -72,5 +73,6 @@ class IntermediateBuilder(override val type: String) : Builder() {
|
||||
override val uselessFields: List<FieldWithDefault> = emptyList()
|
||||
override var packageName: String = DEFAULT_BUILDER_PACKAGE
|
||||
|
||||
override fun getTypeWithArguments(notNull: Boolean): String = type
|
||||
override val typeWithArguments: String
|
||||
get() = type
|
||||
}
|
||||
|
||||
+4
-2
@@ -15,7 +15,8 @@ class ImplementationWithArg(
|
||||
) : FieldContainer by implementation, ImplementationKindOwner by implementation {
|
||||
val element: Element get() = implementation.element
|
||||
|
||||
override fun getTypeWithArguments(notNull: Boolean): String = type + generics
|
||||
override val typeWithArguments: String
|
||||
get() = type + generics
|
||||
}
|
||||
|
||||
class Implementation(val element: Element, val name: String?) : FieldContainer, ImplementationKindOwner {
|
||||
@@ -41,7 +42,8 @@ class Implementation(val element: Element, val name: String?) : FieldContainer,
|
||||
}
|
||||
}
|
||||
|
||||
override fun getTypeWithArguments(notNull: Boolean): String = type + element.generics
|
||||
override val typeWithArguments: String
|
||||
get() = type + element.generics
|
||||
|
||||
override val packageName = element.packageName + ".impl"
|
||||
val usedTypes = mutableListOf<Importable>()
|
||||
|
||||
+1
-3
@@ -8,10 +8,8 @@ package org.jetbrains.kotlin.fir.tree.generator.printer
|
||||
import org.jetbrains.kotlin.fir.tree.generator.declarationAttributesType
|
||||
import org.jetbrains.kotlin.fir.tree.generator.model.*
|
||||
import org.jetbrains.kotlin.generators.tree.StandardTypes
|
||||
import org.jetbrains.kotlin.generators.tree.TypeRefWithNullability
|
||||
import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile
|
||||
import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType
|
||||
import org.jetbrains.kotlin.generators.tree.typeWithArguments
|
||||
import org.jetbrains.kotlin.utils.SmartPrinter
|
||||
import org.jetbrains.kotlin.utils.withIndent
|
||||
import java.io.File
|
||||
@@ -142,7 +140,7 @@ private fun SmartPrinter.printFieldInBuilder(field: FieldWithDefault, builder: B
|
||||
return true to false
|
||||
}
|
||||
val name = field.name
|
||||
val type = field.typeRef.getTypeWithArguments(field.notNull)
|
||||
val type = field.typeRef.typeWithArguments
|
||||
val defaultValue = if (fieldIsUseless)
|
||||
field.defaultValueInImplementation.also { requireNotNull(it) }
|
||||
else
|
||||
|
||||
-1
@@ -6,7 +6,6 @@
|
||||
package org.jetbrains.kotlin.fir.tree.generator.printer
|
||||
|
||||
import org.jetbrains.kotlin.fir.tree.generator.model.Field
|
||||
import org.jetbrains.kotlin.generators.tree.typeWithArguments
|
||||
import org.jetbrains.kotlin.utils.SmartPrinter
|
||||
import org.jetbrains.kotlin.utils.withIndent
|
||||
|
||||
|
||||
-1
@@ -11,7 +11,6 @@ import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile
|
||||
import org.jetbrains.kotlin.generators.tree.printer.multipleUpperBoundsList
|
||||
import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType
|
||||
import org.jetbrains.kotlin.generators.tree.printer.typeParameters
|
||||
import org.jetbrains.kotlin.generators.tree.typeWithArguments
|
||||
import org.jetbrains.kotlin.utils.withIndent
|
||||
import java.io.File
|
||||
|
||||
|
||||
-2
@@ -12,8 +12,6 @@ import org.jetbrains.kotlin.generators.tree.printer.GeneratedFile
|
||||
import org.jetbrains.kotlin.generators.tree.printer.multipleUpperBoundsList
|
||||
import org.jetbrains.kotlin.generators.tree.printer.printGeneratedType
|
||||
import org.jetbrains.kotlin.generators.tree.printer.typeParameters
|
||||
import org.jetbrains.kotlin.generators.tree.typeWithArguments
|
||||
import org.jetbrains.kotlin.utils.SmartPrinter
|
||||
import org.jetbrains.kotlin.utils.withIndent
|
||||
import java.io.File
|
||||
|
||||
|
||||
Reference in New Issue
Block a user