[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
+2
-1
@@ -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>
|
||||
|
||||
|
||||
+3
-2
@@ -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
|
||||
}
|
||||
|
||||
+1
-3
@@ -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()
|
||||
+9
-5
@@ -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>
|
||||
|
||||
+1
-2
@@ -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 } }
|
||||
?: ""
|
||||
?: ""
|
||||
|
||||
Reference in New Issue
Block a user