From 16c116908ced64d7e8d7e055f5fbb27aeb3ebe07 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 21 Feb 2024 11:11:21 +0100 Subject: [PATCH] Minor: fix typo --- .../jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt | 4 ++-- .../kotlin/fir/java/enhancement/SignatureEnhancement.kt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index f749aed7b1a..37bb4e9b1a3 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -46,7 +46,7 @@ class FirJavaClass @FirImplementationDetail internal constructor( override val declarations: MutableList, override val scopeProvider: FirScopeProvider, override val symbol: FirRegularClassSymbol, - private val unenhnancedSuperTypes: List, + private val nonEnhancedSuperTypes: List, override val typeParameters: MutableList, internal val javaPackage: JavaPackage?, val javaTypeParameterStack: MutableJavaTypeParameterStack, @@ -71,7 +71,7 @@ class FirJavaClass @FirImplementationDetail internal constructor( // TODO: the lazy superTypeRefs is a workaround for KT-55387, some non-lazy solution should probably be used instead override val superTypeRefs: List by lazy { val enhancement = FirSignatureEnhancement(this@FirJavaClass, moduleData.session, overridden = { emptyList() }) - enhancement.enhanceSuperTypes(unenhnancedSuperTypes) + enhancement.enhanceSuperTypes(nonEnhancedSuperTypes) } // TODO: the lazy annotations is a workaround for KT-55387, some non-lazy solution should probably be used instead diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt index 93fb6d34645..a123a752506 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt @@ -542,11 +542,11 @@ class FirSignatureEnhancement( ).enhance(bound, emptyList(), FirJavaTypeConversionMode.TYPE_PARAMETER_BOUND_AFTER_FIRST_ROUND) - fun enhanceSuperTypes(unenhnancedSuperTypes: List): List { + fun enhanceSuperTypes(nonEnhancedSuperTypes: List): List { val purelyImplementedSupertype = getPurelyImplementedSupertype(moduleData.session) val purelyImplementedSupertypeClassId = purelyImplementedSupertype?.classId return buildList { - unenhnancedSuperTypes.mapNotNullTo(this) { superType -> + nonEnhancedSuperTypes.mapNotNullTo(this) { superType -> enhanceSuperType(superType).takeUnless { purelyImplementedSupertypeClassId != null && it.coneType.classId == purelyImplementedSupertypeClassId }