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

FIR: Use static scope for importing from non-object classes

Browse Source
This commit is contained in:
Denis Zharkov
2020-06-25 12:32:00 +03:00
parent 396c6377f8
commit a017109d7d
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirAbstractImportingScope.kt
+7 -1
View File
@@ -5,6 +5,7 @@
package org.jetbrains.kotlin.fir.scopes.impl package org.jetbrains.kotlin.fir.scopes.impl
import org.jetbrains.kotlin.descriptors.ClassKind
import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.FirSession
import org.jetbrains.kotlin.fir.declarations.FirResolvedImport import org.jetbrains.kotlin.fir.declarations.FirResolvedImport
import org.jetbrains.kotlin.fir.declarations.expandedConeType import org.jetbrains.kotlin.fir.declarations.expandedConeType
@@ -33,7 +34,12 @@ abstract class FirAbstractImportingScope(
return getStaticsScope(expansionSymbol.classId) return getStaticsScope(expansionSymbol.classId)
} }
} else { } else {
return (symbol as FirClassSymbol<*>).fir.unsubstitutedScope(session, scopeSession) val firClass = (symbol as FirClassSymbol<*>).fir
return if (firClass.classKind == ClassKind.OBJECT)
firClass.unsubstitutedScope(session, scopeSession)
else
firClass.scopeProvider.getStaticScope(firClass, session, scopeSession)
} }
return null return null