From 38a79086d39e6c1d54098621f55542d7061015e7 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Thu, 1 Mar 2018 21:13:48 +0300 Subject: [PATCH] Rename: ResolutionFacadeImpl -> ModuleResolutionFacadeImpl --- .../kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt | 4 ++-- ...{ResolutionFacadeImpl.kt => ModuleResolutionFacadeImpl.kt} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/{ResolutionFacadeImpl.kt => ModuleResolutionFacadeImpl.kt} (97%) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt index 7799056d564..67348a874ab 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt @@ -376,7 +376,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService { val notInSourceFiles = files.filterNotInProjectSource(moduleInfo) return if (notInSourceFiles.isNotEmpty()) { val projectFacade = getFacadeForSyntheticFiles(notInSourceFiles) - ResolutionFacadeImpl(projectFacade, moduleInfo) + ModuleResolutionFacadeImpl(projectFacade, moduleInfo) } else { val platform = TargetPlatformDetector.getPlatform(file) getResolutionFacadeByModuleInfo(moduleInfo, platform) @@ -393,7 +393,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService { private fun getResolutionFacadeByModuleInfo(moduleInfo: IdeaModuleInfo, platform: TargetPlatform): ResolutionFacade { val settings = PlatformAnalysisSettings(platform, moduleInfo.sdk, moduleInfo.supportsAdditionalBuiltInsMembers()) val projectFacade = globalFacade(settings) - return ResolutionFacadeImpl(projectFacade, moduleInfo) + return ModuleResolutionFacadeImpl(projectFacade, moduleInfo) } override fun getResolutionFacadeByModuleInfo(moduleInfo: ModuleInfo, platform: TargetPlatform): ResolutionFacade? = diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt similarity index 97% rename from idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt rename to idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt index 53a5522cc7e..25da91dbadb 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.resolve.lazy.AbsentDescriptorHandler import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.ResolveSession -internal class ResolutionFacadeImpl( +internal class ModuleResolutionFacadeImpl( private val projectFacade: ProjectResolutionFacade, private val moduleInfo: IdeaModuleInfo ) : ResolutionFacade { @@ -97,5 +97,5 @@ internal class ResolutionFacadeImpl( } fun ResolutionFacade.findModuleDescriptor(ideaModuleInfo: IdeaModuleInfo): ModuleDescriptor? { - return (this as? ResolutionFacadeImpl)?.findModuleDescriptor(ideaModuleInfo) + return (this as? ModuleResolutionFacadeImpl)?.findModuleDescriptor(ideaModuleInfo) }