From a07d3f242561668be38f085d38b2236be1195213 Mon Sep 17 00:00:00 2001 From: Ilya Kirillov Date: Mon, 24 Aug 2020 14:02:16 +0300 Subject: [PATCH] FIR IDE: minor: rename FirIdeJavaModuleBasedSession to FirIdeSourcesSession --- .../fir/low/level/api/FirIdeResolveStateService.kt | 3 ++- .../FirIdeSourcesSession.kt} | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) rename idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/{FirIdeJavaModuleBasedSession.kt => sessions/FirIdeSourcesSession.kt} (90%) diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt index d4c0ca1a289..f9e7dc79824 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeResolveStateService.kt @@ -11,6 +11,7 @@ import org.jetbrains.kotlin.idea.util.psiModificationTrackerBasedCachedValue import java.util.concurrent.ConcurrentHashMap import org.jetbrains.kotlin.idea.caches.project.* import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeModuleLibraryDependenciesSession +import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSourcesSession internal class FirIdeResolveStateService(private val project: Project) { private val stateCache by psiModificationTrackerBasedCachedValue(project) { @@ -23,7 +24,7 @@ internal class FirIdeResolveStateService(private val project: Project) { val librariesSession = FirIdeModuleLibraryDependenciesSession.create(moduleInfo as ModuleSourceInfo, sessionProvider, project) - val sourcesSession = FirIdeJavaModuleBasedSession.create( + val sourcesSession = FirIdeSourcesSession.create( project, moduleInfo, firPhaseRunner, diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeJavaModuleBasedSession.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSourcesSession.kt similarity index 90% rename from idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeJavaModuleBasedSession.kt rename to idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSourcesSession.kt index 83df7325b7d..17bd9cd360c 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/FirIdeJavaModuleBasedSession.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/sessions/FirIdeSourcesSession.kt @@ -3,7 +3,7 @@ * Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file. */ -package org.jetbrains.kotlin.idea.fir.low.level.api +package org.jetbrains.kotlin.idea.fir.low.level.api.sessions import com.intellij.openapi.module.impl.scopes.ModuleWithDependentsScope import com.intellij.openapi.project.Project @@ -24,16 +24,17 @@ import org.jetbrains.kotlin.fir.resolve.scopes.wrapScopeWithJvmMapped import org.jetbrains.kotlin.fir.resolve.transformers.PhasedFirFileResolver import org.jetbrains.kotlin.fir.scopes.KotlinScopeProvider import org.jetbrains.kotlin.idea.caches.project.ModuleSourceInfo +import org.jetbrains.kotlin.idea.fir.low.level.api.FirIdeSessionProvider +import org.jetbrains.kotlin.idea.fir.low.level.api.FirPhaseRunner +import org.jetbrains.kotlin.idea.fir.low.level.api.IdePhasedFirFileResolver import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.FirFileBuilder import org.jetbrains.kotlin.idea.fir.low.level.api.file.builder.ModuleFileCacheImpl import org.jetbrains.kotlin.idea.fir.low.level.api.providers.FirIdeProvider import org.jetbrains.kotlin.idea.fir.low.level.api.providers.firIdeProvider -import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeModuleLibraryDependenciesSession -import org.jetbrains.kotlin.idea.fir.low.level.api.sessions.FirIdeSession import org.jetbrains.kotlin.idea.fir.low.level.api.util.collectTransitiveDependenciesWithSelf -internal class FirIdeJavaModuleBasedSession private constructor( +internal class FirIdeSourcesSession private constructor( sessionProvider: FirIdeSessionProvider, override val scope: GlobalSearchScope, val firFileBuilder: FirFileBuilder, @@ -50,12 +51,12 @@ internal class FirIdeJavaModuleBasedSession private constructor( firPhaseRunner: FirPhaseRunner, sessionProvider: FirSessionProvider, librariesSession: FirIdeModuleLibraryDependenciesSession, - ): FirIdeJavaModuleBasedSession { + ): FirIdeSourcesSession { val scopeProvider = KotlinScopeProvider(::wrapScopeWithJvmMapped) val firBuilder = FirFileBuilder(sessionProvider as FirIdeSessionProvider, scopeProvider, firPhaseRunner) val dependentModules = moduleInfo.collectTransitiveDependenciesWithSelf().filterIsInstance() val searchScope = ModuleWithDependentsScope(project, dependentModules.map { it.module }) - return FirIdeJavaModuleBasedSession(sessionProvider, searchScope, firBuilder).apply { + return FirIdeSourcesSession(sessionProvider, searchScope, firBuilder).apply { val cache = ModuleFileCacheImpl(this) val phasedFirFileResolver = IdePhasedFirFileResolver(firBuilder, cache)