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

Rename: ResolutionFacadeImpl -> ModuleResolutionFacadeImpl

Browse Source
This commit is contained in:
Nikolay Krasko
2018-03-01 21:13:48 +03:00
parent dced45d1bf
commit 38a79086d3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+2 -2
View File
@@ -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? =
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ResolutionFacadeImpl.kt → idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ModuleResolutionFacadeImpl.kt
+2 -2
View File
@@ -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)
}