azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIR] Improve typing to get rid of cast

Browse Source
This commit is contained in:
Simon Ogorodnik
2019-06-10 16:38:40 +03:00
committed by Mikhail Glukhikh
parent 95409b35ca
commit 321e948eca
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/cones/src/org/jetbrains/kotlin/fir/symbols/ConeLookupTags.kt
+1 -1
View File
@@ -35,7 +35,7 @@ abstract class ConeTypeAliasLookupTag : ConeClassLikeLookupTag()
abstract class ConeClassLookupTag : ConeClassLikeLookupTag() abstract class ConeClassLookupTag : ConeClassLikeLookupTag()
class ConeClassLikeLookupTagImpl(override val classId: ClassId) : ConeClassLikeLookupTag() { class ConeClassLikeLookupTagImpl(override val classId: ClassId) : ConeClassLikeLookupTag() {
var boundSymbol: Pair<*, *>? = null var boundSymbol: Pair<*, ConeClassifierSymbol?>? = null
override fun equals(other: Any?): Boolean { override fun equals(other: Any?): Boolean {
if (this === other) return true if (this === other) return true
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/FirSymbolProvider.kt
+1 -1
View File
@@ -23,7 +23,7 @@ abstract class FirSymbolProvider {
return when (lookupTag) { return when (lookupTag) {
is ConeClassLikeLookupTag -> { is ConeClassLikeLookupTag -> {
(lookupTag as? ConeClassLikeLookupTagImpl) (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 { getClassLikeSymbolByFqName(lookupTag.classId).also {
(lookupTag as? ConeClassLikeLookupTagImpl) (lookupTag as? ConeClassLikeLookupTagImpl)