Rename: IdeFirProvider -> FirIdeProvider
This commit is contained in:
+3
-4
@@ -23,15 +23,14 @@ class FirIdeJavaModuleBasedSession(
|
||||
project: Project,
|
||||
moduleInfo: ModuleInfo,
|
||||
sessionProvider: FirProjectSessionProvider,
|
||||
scope: GlobalSearchScope,
|
||||
dependenciesProvider: FirSymbolProvider? = null
|
||||
scope: GlobalSearchScope
|
||||
) : FirModuleBasedSession(moduleInfo, sessionProvider) {
|
||||
|
||||
|
||||
init {
|
||||
registerComponent(
|
||||
FirProvider::class,
|
||||
IdeFirProvider(project, scope, this)
|
||||
FirIdeProvider(project, scope, this)
|
||||
)
|
||||
registerComponent(
|
||||
FirSymbolProvider::class,
|
||||
@@ -39,7 +38,7 @@ class FirIdeJavaModuleBasedSession(
|
||||
listOf(
|
||||
firProvider,
|
||||
JavaSymbolProvider(this, sessionProvider.project, scope),
|
||||
dependenciesProvider ?: FirDependenciesSymbolProviderImpl(this)
|
||||
FirDependenciesSymbolProviderImpl(this)
|
||||
)
|
||||
) as FirSymbolProvider
|
||||
)
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name
|
||||
import org.jetbrains.kotlin.psi.KtElement
|
||||
import org.jetbrains.kotlin.psi.KtFile
|
||||
|
||||
class IdeFirProvider(
|
||||
class FirIdeProvider(
|
||||
val project: Project,
|
||||
val scope: GlobalSearchScope,
|
||||
val session: FirSession
|
||||
@@ -83,7 +83,7 @@ fun KtCallableDeclaration.getOrBuildFir(
|
||||
val klassFqName = this.containingClassOrObject?.relativeFqName()
|
||||
val declName = this.nameAsSafeName
|
||||
|
||||
val firProvider = FirProvider.getInstance(session) as IdeFirProvider
|
||||
val firProvider = FirProvider.getInstance(session) as FirIdeProvider
|
||||
val firFile = firProvider.getOrBuildFile(file)
|
||||
val firMemberSymbol = firFile.findCallableMember(firProvider, this, packageFqName, klassFqName, declName).symbol
|
||||
val firMemberDeclaration = firMemberSymbol.fir
|
||||
@@ -106,7 +106,7 @@ fun KtClassOrObject.getOrBuildFir(
|
||||
val packageFqName = file.packageFqName
|
||||
val klassFqName = this.relativeFqName()
|
||||
|
||||
val firProvider = FirProvider.getInstance(session) as IdeFirProvider
|
||||
val firProvider = FirProvider.getInstance(session) as FirIdeProvider
|
||||
val firFile = firProvider.getOrBuildFile(file)
|
||||
val firClass = firProvider.getFirClassifierByFqName(ClassId(packageFqName, klassFqName, false)) as FirRegularClass
|
||||
if (firClass.resolvePhase >= phase) {
|
||||
@@ -118,9 +118,9 @@ fun KtClassOrObject.getOrBuildFir(
|
||||
return firClass
|
||||
}
|
||||
|
||||
private fun KtFile.getOrBuildRawFirFile(state: FirModuleResolveState): Pair<IdeFirProvider, FirFile> {
|
||||
private fun KtFile.getOrBuildRawFirFile(state: FirModuleResolveState): Pair<FirIdeProvider, FirFile> {
|
||||
val session = state.getSession(this)
|
||||
val firProvider = FirProvider.getInstance(session) as IdeFirProvider
|
||||
val firProvider = FirProvider.getInstance(session) as FirIdeProvider
|
||||
return firProvider to firProvider.getOrBuildFile(this)
|
||||
}
|
||||
|
||||
@@ -157,7 +157,7 @@ fun KtFile.getOrBuildFirWithDiagnostics(state: FirModuleResolveState): FirFile {
|
||||
|
||||
private fun FirDeclaration.runResolve(
|
||||
file: FirFile,
|
||||
firProvider: IdeFirProvider,
|
||||
firProvider: FirIdeProvider,
|
||||
toPhase: FirResolvePhase,
|
||||
state: FirModuleResolveState
|
||||
) {
|
||||
|
||||
@@ -101,7 +101,7 @@ abstract class AbstractFirLazyResolveTest : KotlinLightCodeInsightFixtureTestCas
|
||||
for (file in files) {
|
||||
val psiFile = psiManager.findFile(file) as KtFile
|
||||
val session = resolveState.getSession(psiFile)
|
||||
val firProvider = FirProvider.getInstance(session) as IdeFirProvider
|
||||
val firProvider = FirProvider.getInstance(session) as FirIdeProvider
|
||||
val firFile = firProvider.getFile(psiFile) ?: continue
|
||||
KotlinTestUtils.assertEqualsToFile(File(expectedTxtPath(file)), firFile.render())
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user