From f30bf0e7e245f7851bd6b85cc3ae4231d7b59483 Mon Sep 17 00:00:00 2001 From: Sergej Jaskiewicz Date: Tue, 17 Oct 2023 15:25:59 +0300 Subject: [PATCH] [FIR generator] Remove unused `customType` property from `SimpleField` --- .../kotlin/fir/tree/generator/model/ElementUtils.kt | 6 +++--- .../org/jetbrains/kotlin/fir/tree/generator/model/Field.kt | 6 ------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt index acd7b7b748c..b42e932264c 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/ElementUtils.kt @@ -13,18 +13,18 @@ import org.jetbrains.kotlin.generators.tree.typeWithArguments // ----------- Simple field ----------- fun field(name: String, type: TypeRef, nullable: Boolean = false, withReplace: Boolean = false): Field { - return SimpleField(name, type.typeWithArguments, type.packageName, null, nullable, withReplace) + return SimpleField(name, type.typeWithArguments, type.packageName, nullable, withReplace) } fun field(name: String, typeWithArgs: Pair>, nullable: Boolean = false, withReplace: Boolean = false): Field { val (type, args) = typeWithArgs - return SimpleField(name, type.typeWithArguments, type.packageName, null, nullable, withReplace).apply { + return SimpleField(name, type.typeWithArguments, type.packageName, nullable, withReplace).apply { arguments += args } } fun field(type: TypeRef, nullable: Boolean = false, withReplace: Boolean = false): Field { - return SimpleField(type.type.replaceFirstChar(Char::lowercaseChar), type.typeWithArguments, type.packageName, null, nullable, withReplace) + return SimpleField(type.type.replaceFirstChar(Char::lowercaseChar), type.typeWithArguments, type.packageName, nullable, withReplace) } fun booleanField(name: String, withReplace: Boolean = false): Field { diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt index a8fbe9e67ec..fa596a181db 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/model/Field.kt @@ -153,7 +153,6 @@ class SimpleField( override val name: String, override val type: String, override val packageName: String?, - val customType: TypeRef? = null, override val nullable: Boolean, override var withReplace: Boolean, override var isVolatile: Boolean = false, @@ -162,9 +161,6 @@ class SimpleField( override var isParameter: Boolean = false, ) : Field() { override val isFirType: Boolean = false - override val fullQualifiedName: String? - get() = customType?.fullQualifiedName ?: super.fullQualifiedName - override var isMutable: Boolean = withReplace override var isMutableOrEmpty: Boolean = false @@ -173,7 +169,6 @@ class SimpleField( name = name, type = type, packageName = packageName, - customType = customType, nullable = nullable, withReplace = withReplace, isVolatile = isVolatile, @@ -189,7 +184,6 @@ class SimpleField( name = name, type = newType.type, packageName = newType.packageName, - customType = customType, nullable = nullable, withReplace = withReplace, isVolatile = isVolatile,