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

Rename: IdeFirProvider -> FirIdeProvider

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-12-16 12:45:45 +03:00
parent 8703da5a25
commit befcfad898
4 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeJavaModuleBasedSession.kt
+3 -4
View File
@@ -23,15 +23,14 @@ class FirIdeJavaModuleBasedSession(
project: Project, project: Project,
moduleInfo: ModuleInfo, moduleInfo: ModuleInfo,
sessionProvider: FirProjectSessionProvider, sessionProvider: FirProjectSessionProvider,
scope: GlobalSearchScope, scope: GlobalSearchScope
dependenciesProvider: FirSymbolProvider? = null
) : FirModuleBasedSession(moduleInfo, sessionProvider) { ) : FirModuleBasedSession(moduleInfo, sessionProvider) {
init { init {
registerComponent( registerComponent(
FirProvider::class, FirProvider::class,
IdeFirProvider(project, scope, this) FirIdeProvider(project, scope, this)
) )
registerComponent( registerComponent(
FirSymbolProvider::class, FirSymbolProvider::class,
@@ -39,7 +38,7 @@ class FirIdeJavaModuleBasedSession(
listOf( listOf(
firProvider, firProvider,
JavaSymbolProvider(this, sessionProvider.project, scope), JavaSymbolProvider(this, sessionProvider.project, scope),
dependenciesProvider ?: FirDependenciesSymbolProviderImpl(this) FirDependenciesSymbolProviderImpl(this)
) )
) as FirSymbolProvider ) as FirSymbolProvider
) )
idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/IdeFirProvider.kt → idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirIdeProvider.kt
+1 -1
View File
@@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name
import org.jetbrains.kotlin.psi.KtElement import org.jetbrains.kotlin.psi.KtElement
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
class IdeFirProvider( class FirIdeProvider(
val project: Project, val project: Project,
val scope: GlobalSearchScope, val scope: GlobalSearchScope,
val session: FirSession val session: FirSession
idea/idea-analysis/src/org/jetbrains/kotlin/idea/fir/FirResolutionApi.kt
+5 -5
View File
@@ -83,7 +83,7 @@ fun KtCallableDeclaration.getOrBuildFir(
val klassFqName = this.containingClassOrObject?.relativeFqName() val klassFqName = this.containingClassOrObject?.relativeFqName()
val declName = this.nameAsSafeName val declName = this.nameAsSafeName
val firProvider = FirProvider.getInstance(session) as IdeFirProvider val firProvider = FirProvider.getInstance(session) as FirIdeProvider
val firFile = firProvider.getOrBuildFile(file) val firFile = firProvider.getOrBuildFile(file)
val firMemberSymbol = firFile.findCallableMember(firProvider, this, packageFqName, klassFqName, declName).symbol val firMemberSymbol = firFile.findCallableMember(firProvider, this, packageFqName, klassFqName, declName).symbol
val firMemberDeclaration = firMemberSymbol.fir val firMemberDeclaration = firMemberSymbol.fir
@@ -106,7 +106,7 @@ fun KtClassOrObject.getOrBuildFir(
val packageFqName = file.packageFqName val packageFqName = file.packageFqName
val klassFqName = this.relativeFqName() val klassFqName = this.relativeFqName()
val firProvider = FirProvider.getInstance(session) as IdeFirProvider val firProvider = FirProvider.getInstance(session) as FirIdeProvider
val firFile = firProvider.getOrBuildFile(file) val firFile = firProvider.getOrBuildFile(file)
val firClass = firProvider.getFirClassifierByFqName(ClassId(packageFqName, klassFqName, false)) as FirRegularClass val firClass = firProvider.getFirClassifierByFqName(ClassId(packageFqName, klassFqName, false)) as FirRegularClass
if (firClass.resolvePhase >= phase) { if (firClass.resolvePhase >= phase) {
@@ -118,9 +118,9 @@ fun KtClassOrObject.getOrBuildFir(
return firClass 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 session = state.getSession(this)
val firProvider = FirProvider.getInstance(session) as IdeFirProvider val firProvider = FirProvider.getInstance(session) as FirIdeProvider
return firProvider to firProvider.getOrBuildFile(this) return firProvider to firProvider.getOrBuildFile(this)
} }
@@ -157,7 +157,7 @@ fun KtFile.getOrBuildFirWithDiagnostics(state: FirModuleResolveState): FirFile {
private fun FirDeclaration.runResolve( private fun FirDeclaration.runResolve(
file: FirFile, file: FirFile,
firProvider: IdeFirProvider, firProvider: FirIdeProvider,
toPhase: FirResolvePhase, toPhase: FirResolvePhase,
state: FirModuleResolveState state: FirModuleResolveState
) { ) {
idea/tests/org/jetbrains/kotlin/idea/fir/AbstractFirLazyResolveTest.kt
+1 -1
View File
@@ -101,7 +101,7 @@ abstract class AbstractFirLazyResolveTest : KotlinLightCodeInsightFixtureTestCas
for (file in files) { for (file in files) {
val psiFile = psiManager.findFile(file) as KtFile val psiFile = psiManager.findFile(file) as KtFile
val session = resolveState.getSession(psiFile) 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 val firFile = firProvider.getFile(psiFile) ?: continue
KotlinTestUtils.assertEqualsToFile(File(expectedTxtPath(file)), firFile.render()) KotlinTestUtils.assertEqualsToFile(File(expectedTxtPath(file)), firFile.render())
} }