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

FIR IDE: fix compilation after rename registerJavaSpecificComponents -> registerJavaSpecificResolveComponents

Browse Source
This commit is contained in:
Ilya Kirillov
2020-09-18 12:50:27 +03:00
parent 65ef629ca7
commit 4238fd3842
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSessionFactory.kt
+3 -6
View File
@@ -22,10 +22,7 @@ import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCompositeSymbolProvide
import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped
import org.jetbrains.kotlin.fir.resolve.transformers.FirPhaseManager import org.jetbrains.kotlin.fir.resolve.transformers.FirPhaseManager
import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider
import org.jetbrains.kotlin.fir.session.FirSessionFactory import org.jetbrains.kotlin.fir.session.*
import org.jetbrains.kotlin.fir.session.registerCommonComponents
import org.jetbrains.kotlin.fir.session.registerJavaSpecificComponents
import org.jetbrains.kotlin.fir.session.registerResolveComponents
import org.jetbrains.kotlin.idea.caches.project.* import org.jetbrains.kotlin.idea.caches.project.*
import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider import org.jetbrains.kotlin.idea.caches.resolve.IDEPackagePartProvider
import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner
@@ -115,7 +112,7 @@ internal object FirIdeSessionFactory {
) )
) )
registerJavaSpecificComponents() registerJavaSpecificResolveComponents()
FirSessionFactory.FirSessionConfigurator(this).apply { FirSessionFactory.FirSessionConfigurator(this).apply {
if (isRootModule) { if (isRootModule) {
registerCommonCheckers() registerCommonCheckers()
@@ -141,7 +138,7 @@ internal object FirIdeSessionFactory {
val kotlinClassFinder = VirtualFileFinderFactory.getInstance(project).create(searchScope) val kotlinClassFinder = VirtualFileFinderFactory.getInstance(project).create(searchScope)
return FirIdeLibrariesSession(moduleInfo, project, searchScope, builtinTypes).apply { return FirIdeLibrariesSession(moduleInfo, project, searchScope, builtinTypes).apply {
registerCommonComponents() registerCommonComponents()
registerJavaSpecificComponents() registerJavaSpecificResolveComponents()
registerIdeComponents() registerIdeComponents()
val javaSymbolProvider = JavaSymbolProvider(this, project, searchScope) val javaSymbolProvider = JavaSymbolProvider(this, project, searchScope)