[FIR/IR generator] Replace getTypeWithArguments with a property

The `notNull` of that method was never used.
2023-10-19 18:16:37 +02:00
parent de4e39906c
commit f2bb988e68
12 changed files with 27 additions and 27 deletions
@@ -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
 }
@@ -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>()
@@ -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
@@ -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

@@ -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

@@ -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

@@ -19,9 +19,8 @@ private object InferredOverriddenType : TypeRefWithNullability {
    override val packageName: String?
        get() = null

-    override fun getTypeWithArguments(notNull: Boolean): String {
-        error("not supported")
-    }
+    override val typeWithArguments: String
+        get() = error("not supported")

    override fun substitute(map: TypeParameterSubstitutionMap) = this

@@ -36,7 +36,8 @@ abstract class AbstractElement<Element, Field> : ElementOrRef<Element, Field>, F
    override val allParents: List<Element>
        get() = elementParents.map { it.element }

-    final override fun getTypeWithArguments(notNull: Boolean): String = type + generics
+    final override val typeWithArguments: String
+        get() = type + generics

    abstract override val allFields: List<Field>

@@ -6,5 +6,6 @@
 package org.jetbrains.kotlin.generators.tree

 data class ArbitraryImportable(override val packageName: String, override val type: String) : Importable {
-    override fun getTypeWithArguments(notNull: Boolean): String = type
-}
+    override val typeWithArguments: String
+        get() = type
+}
@@ -10,7 +10,5 @@ interface Importable {
    val packageName: String?
    val fullQualifiedName: String? get() = packageName?.let { "$it.${type.replace(Regex("<.+>"), "")}" }

-    fun getTypeWithArguments(notNull: Boolean = false): String
+    val typeWithArguments: String
 }
-
-val Importable.typeWithArguments: String get() = getTypeWithArguments()
@@ -25,7 +25,8 @@ interface TypeRef : Importable {
        override val packageName: String?
            get() = null

-        override fun getTypeWithArguments(notNull: Boolean): String = type
+        override val typeWithArguments: String
+            get() = type

        override fun substitute(map: TypeParameterSubstitutionMap) = this

@@ -110,7 +111,8 @@ data class TypeRefWithVariance<out T : TypeRef>(val variance: Variance, val type
    override val packageName: String?
        get() = null

-    override fun getTypeWithArguments(notNull: Boolean): String = type
+    override val typeWithArguments: String
+        get() = type

    override fun substitute(map: TypeParameterSubstitutionMap): TypeRefWithVariance<*> =
        TypeRefWithVariance(variance, typeRef.substitute(map))
@@ -165,7 +167,8 @@ data class PositionTypeParameterRef(
    override val packageName: String?
        get() = null

-    override fun getTypeWithArguments(notNull: Boolean): String = type
+    override val typeWithArguments: String
+        get() = type

    override fun copy(nullable: Boolean) = PositionTypeParameterRef(index, nullable)
 }
@@ -190,7 +193,7 @@ open class NamedTypeParameterRef(
    override val packageName: String?
        get() = null

-    override fun getTypeWithArguments(notNull: Boolean) = name
+    override val typeWithArguments get() = name

    final override fun copy(nullable: Boolean) = NamedTypeParameterRef(name, nullable)
 }
@@ -209,7 +212,8 @@ interface ParametrizedTypeRef<Self : ParametrizedTypeRef<Self, P>, P : TypeParam
    override fun substitute(map: TypeParameterSubstitutionMap): Self =
        copy(args.mapValues { it.value.substitute(map) })

-    override fun getTypeWithArguments(notNull: Boolean): String = type + generics + (if (nullable) "?" else "")
+    override val typeWithArguments: String
+        get() = type + generics + (if (nullable) "?" else "")
 }

 typealias TypeParameterSubstitutionMap = Map<out TypeParameterRef, TypeRef>
@@ -7,7 +7,6 @@ package org.jetbrains.kotlin.generators.tree.printer

 import org.jetbrains.kotlin.generators.tree.AbstractElement
 import org.jetbrains.kotlin.generators.tree.ImplementationKind
-import org.jetbrains.kotlin.generators.tree.typeWithArguments

 /**
 * The angle bracket-delimited list of type parameters to print, or empty string if the element has no type parameters.
@@ -51,4 +50,4 @@ fun ImplementationKind?.braces(): String = when (this) {
 val AbstractElement<*, *>.generics: String
    get() = params.takeIf { it.isNotEmpty() }
        ?.let { it.joinToString(", ", "<", ">") { it.name } }
-        ?: ""
+        ?: ""