Commit b3c21d30 authored by Ilya Kirillov's avatar Ilya Kirillov Committed by intellij-monorepo-bot
Browse files

FIR IDE: adapt to reference resolve changes related to library resolve

GitOrigin-RevId: 0677cf10f3b7d112cd3be4ea043f2d0a88f35f52
parent 1746d089
Showing with 12 additions and 12 deletions
+12 -12
......@@ -7,9 +7,9 @@ import com.intellij.openapi.module.Module
import com.intellij.openapi.vfs.LocalFileSystem
import com.intellij.testFramework.PsiTestUtil
import junit.framework.Assert
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeModuleSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSessionProviderStorage
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirModuleSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSessionProviderStorage
import org.jetbrains.kotlin.analysis.project.structure.KtSourceModule
import org.jetbrains.kotlin.idea.fir.analysis.project.structure.getMainKtSourceModule
import org.jetbrains.kotlin.idea.fir.analysis.providers.TestProjectModule
......@@ -50,7 +50,7 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
val rootModuleSourceInfo = rootModule.getMainKtSourceModule()!!
val storage = FirIdeSessionProviderStorage(project)
val storage = LLFirSessionProviderStorage(project)
val initialSessions = storage.getFirSessions(rootModuleSourceInfo)
modulesToMakeOOBM.forEach { it.incModificationTracker() }
......@@ -62,7 +62,7 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
changedSessions.removeAll(intersection)
val changedSessionsModulesNamesSorted = changedSessions
.map { session ->
val moduleSession = session as FirIdeModuleSession
val moduleSession = session as LLFirModuleSession
val module = moduleSession.module as KtSourceModule
module.moduleName
}
......@@ -72,9 +72,9 @@ abstract class AbstractSessionsInvalidationTest : AbstractMultiModuleTest() {
Assert.assertEquals(testStructure.expectedInvalidatedModules, changedSessionsModulesNamesSorted)
}
private fun FirIdeSessionProviderStorage.getFirSessions(module: KtSourceModule): Set<FirIdeSession> {
private fun LLFirSessionProviderStorage.getFirSessions(module: KtSourceModule): Set<LLFirSession> {
val sessionProvider = getSessionProvider(module)
return sessionProvider.sessions.values.toSet()
return sessionProvider.allSessions.toSet()
}
private fun createEmptyModule(name: String): Module {
......
......@@ -2,16 +2,16 @@
package org.jetbrains.kotlin.idea.fir.low.level.api
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.FirModuleResolveState
import org.jetbrains.kotlin.analysis.low.level.api.fir.api.LLFirModuleResolveState
import org.jetbrains.kotlin.analysis.low.level.api.fir.createResolveStateForNoCaching
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.FirIdeSession
import org.jetbrains.kotlin.analysis.low.level.api.fir.sessions.LLFirSession
import org.jetbrains.kotlin.analysis.project.structure.getKtModule
import org.jetbrains.kotlin.psi.KtElement
internal inline fun <R> resolveWithClearCaches(
context: KtElement,
noinline configureSession: FirIdeSession.() -> Unit = {},
action: (FirModuleResolveState) -> R,
noinline configureSession: LLFirSession.() -> Unit = {},
action: (LLFirModuleResolveState) -> R,
): R {
val project = context.project
val resolveState = createResolveStateForNoCaching(context.getKtModule(project), project, configureSession)
......
......@@ -151,7 +151,7 @@ The Kotlin FIR plugin provides language support in IntelliJ IDEA and Android Stu
<statusBarWidgetFactory implementation="org.jetbrains.kotlin.idea.fir.FirStatusBarWidgetFactory"/>
<highlightRangeExtension implementation="org.jetbrains.kotlin.idea.fir.highlighter.KotlinFirPsiChecker"/>
<annotator language="kotlin" implementationClass="org.jetbrains.kotlin.idea.fir.highlighter.KotlinFirPsiChecker"/>
<projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.FirIdeResolveStateService"/>
<projectService serviceImplementation="org.jetbrains.kotlin.analysis.low.level.api.fir.LLFirResolveStateService"/>
<projectService serviceImplementation="org.jetbrains.kotlin.resolve.jvm.KotlinJavaPsiFacade"/>
<projectService serviceInterface="org.jetbrains.kotlin.psi.KtFileClassProvider"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment