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

FIR IDE: initialize FirSession with correct language settings

Browse Source
This commit is contained in:
Ilya Kirillov
2021-04-09 11:38:30 +02:00
parent 9c6445d863
commit aff1788a4c
1 changed files with 3 additions and 1 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 -1
View File
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirModuleWithDepend
import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirThreadSafeSymbolProviderWrapper import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirThreadSafeSymbolProviderWrapper
import org.jetbrains.kotlin.idea.fir.low.level.api.util.ModuleLibrariesSearchScope import org.jetbrains.kotlin.idea.fir.low.level.api.util.ModuleLibrariesSearchScope
import org.jetbrains.kotlin.idea.fir.low.level.api.util.checkCanceled import org.jetbrains.kotlin.idea.fir.low.level.api.util.checkCanceled
import org.jetbrains.kotlin.idea.project.languageVersionSettings
import org.jetbrains.kotlin.load.java.JavaClassFinderImpl import org.jetbrains.kotlin.load.java.JavaClassFinderImpl
import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory import org.jetbrains.kotlin.load.kotlin.VirtualFileFinderFactory
@@ -60,10 +61,10 @@ internal object FirIdeSessionFactory {
sessionsCache: MutableMap<ModuleSourceInfo, FirIdeSourcesSession>, sessionsCache: MutableMap<ModuleSourceInfo, FirIdeSourcesSession>,
isRootModule: Boolean, isRootModule: Boolean,
librariesCache: LibrariesCache, librariesCache: LibrariesCache,
languageVersionSettings: LanguageVersionSettings = LanguageVersionSettingsImpl.DEFAULT,
configureSession: (FirIdeSession.() -> Unit)? = null configureSession: (FirIdeSession.() -> Unit)? = null
): FirIdeSourcesSession { ): FirIdeSourcesSession {
sessionsCache[moduleInfo]?.let { return it } sessionsCache[moduleInfo]?.let { return it }
val languageVersionSettings = moduleInfo.module.languageVersionSettings
val scopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped) val scopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped)
val firBuilder = FirFileBuilder(scopeProvider, firPhaseRunner) val firBuilder = FirFileBuilder(scopeProvider, firPhaseRunner)
val searchScope = ModuleProductionSourceScope(moduleInfo.module) val searchScope = ModuleProductionSourceScope(moduleInfo.module)
@@ -113,6 +114,7 @@ internal object FirIdeSessionFactory {
builtinsAndCloneableSession, builtinsAndCloneableSession,
builtinTypes, builtinTypes,
librariesCache, librariesCache,
languageVersionSettings = languageVersionSettings,
configureSession = configureSession, configureSession = configureSession,
).symbolProvider ).symbolProvider
) )