From 321e948eca13cabe96093a09e7a7eb8316788bda Mon Sep 17 00:00:00 2001 From: Simon Ogorodnik Date: Mon, 10 Jun 2019 16:38:40 +0300 Subject: [PATCH] [FIR] Improve typing to get rid of cast --- .../src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt | 2 +- .../src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt index e8ddd542015..d9fa39b8c9c 100644 --- a/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt +++ b/compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt @@ -35,7 +35,7 @@ abstract class ConeTypeAliasLookupTag : ConeClassLikeLookupTag() abstract class ConeClassLookupTag : ConeClassLikeLookupTag() class ConeClassLikeLookupTagImpl(override val classId: ClassId) : ConeClassLikeLookupTag() { - var boundSymbol: Pair<*, *>? = null + var boundSymbol: Pair<*, ConeClassifierSymbol?>? = null override fun equals(other: Any?): Boolean { if (this === other) return true diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt index 48234b0e8df..bd873531121 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt @@ -23,7 +23,7 @@ abstract class FirSymbolProvider { return when (lookupTag) { is ConeClassLikeLookupTag -> { (lookupTag as? ConeClassLikeLookupTagImpl) - ?.boundSymbol?.takeIf { it.first === this }?.let { return it.second as ConeClassifierSymbol? } + ?.boundSymbol?.takeIf { it.first === this }?.let { return it.second } getClassLikeSymbolByFqName(lookupTag.classId).also { (lookupTag as? ConeClassLikeLookupTagImpl)