FIR: use session symbolProvider from symbol for getting it's file

This commit is contained in:
Ilya Kirillov
2020-12-31 12:22:47 +01:00
parent d46ad6c0ad
commit 0f2aca3280
6 changed files with 168 additions and 48 deletions
@@ -0,0 +1,38 @@
/*
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
*/
package org.jetbrains.kotlin.fir.resolve.providers.impl
import org.jetbrains.kotlin.fir.declarations.*
import org.jetbrains.kotlin.fir.resolve.providers.FirProvider
import org.jetbrains.kotlin.fir.resolve.providers.FirProviderInternals
import org.jetbrains.kotlin.fir.resolve.providers.FirSymbolProvider
import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol
import org.jetbrains.kotlin.name.ClassId
import org.jetbrains.kotlin.name.FqName
import org.jetbrains.kotlin.name.Name
class FirLibrarySessionProvider(
override val symbolProvider: FirSymbolProvider
) : FirProvider() {
override fun getFirClassifierByFqName(classId: ClassId): FirClassLikeDeclaration<*>? =
symbolProvider.getClassLikeSymbolByFqName(classId)?.fir
override fun getFirClassifierContainerFile(fqName: ClassId): FirFile = shouldNotBeCalled()
override fun getFirClassifierContainerFileIfAny(fqName: ClassId): FirFile? = null
override fun getFirCallableContainerFile(symbol: FirCallableSymbol<*>): FirFile? = null
override fun getFirFilesByPackage(fqName: FqName): List<FirFile> = emptyList()
@FirProviderInternals
override fun recordGeneratedClass(owner: FirAnnotatedDeclaration, klass: FirRegularClass) = shouldNotBeCalled()
@FirProviderInternals
override fun recordGeneratedMember(owner: FirAnnotatedDeclaration, klass: FirDeclaration) = shouldNotBeCalled()
override fun getClassNamesInPackage(fqName: FqName): Set<Name> = shouldNotBeCalled()
private fun shouldNotBeCalled(): Nothing = error("Should not be called for FirLibrarySessionProvider")
}
@@ -234,7 +234,6 @@ abstract class AbstractFirStatusResolveTransformer(
protected val containingClass: FirClass<*>? get() = classes.lastOrNull()
private val firProvider = session.firProvider
private val symbolProvider = session.symbolProvider
protected abstract fun FirDeclaration.needResolveMembers(): Boolean
@@ -383,6 +382,7 @@ abstract class AbstractFirStatusResolveTransformer(
@OptIn(ExperimentalStdlibApi::class)
private fun forceResolveStatusesOfClass(regularClass: FirRegularClass) {
val firProvider = regularClass.session.firProvider
if (statusComputationSession[regularClass] == StatusComputationSession.StatusComputationStatus.Computed) return
val file = firProvider.getFirClassifierContainerFileIfAny(regularClass.symbol)
if (regularClass.status is FirResolvedDeclarationStatus) {