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

Minor: rename globalFacade -> facadeForModules

Browse Source
This commit is contained in:
Dmitry Savvinov
2019-09-23 19:17:04 +03:00
parent 937d041bc3
commit e3b7b41544
1 changed files with 4 additions and 9 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
+4 -9
View File
@@ -34,13 +34,9 @@ import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForMod
import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForScriptDependenciesName import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForScriptDependenciesName
import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSdkName import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSdkName
import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSpecialInfoName import org.jetbrains.kotlin.analyzer.ResolverForProject.Companion.resolverForSpecialInfoName
import org.jetbrains.kotlin.builtins.DefaultBuiltIns
import org.jetbrains.kotlin.builtins.KotlinBuiltIns import org.jetbrains.kotlin.builtins.KotlinBuiltIns
import org.jetbrains.kotlin.caches.project.cacheByClass
import org.jetbrains.kotlin.caches.project.cacheInvalidatingOnRootModifications
import org.jetbrains.kotlin.caches.resolve.KotlinCacheService import org.jetbrains.kotlin.caches.resolve.KotlinCacheService
import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.config.LanguageFeature
import org.jetbrains.kotlin.config.isTypeRefinementEnabled
import org.jetbrains.kotlin.context.GlobalContext import org.jetbrains.kotlin.context.GlobalContext
import org.jetbrains.kotlin.context.GlobalContextImpl import org.jetbrains.kotlin.context.GlobalContextImpl
import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
@@ -65,7 +61,6 @@ import org.jetbrains.kotlin.resolve.diagnostics.KotlinSuppressCache
import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode import org.jetbrains.kotlin.resolve.lazy.BodyResolveMode
import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull import org.jetbrains.kotlin.utils.addToStdlib.firstIsInstanceOrNull
import org.jetbrains.kotlin.utils.addToStdlib.sumByLong import org.jetbrains.kotlin.utils.addToStdlib.sumByLong
import java.util.concurrent.ConcurrentHashMap
internal val LOG = Logger.getInstance(KotlinCacheService::class.java) internal val LOG = Logger.getInstance(KotlinCacheService::class.java)
@@ -162,7 +157,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
val relatedModules = scriptFile?.let { ScriptAdditionalIdeaDependenciesProvider.getRelatedModules(it, project) } val relatedModules = scriptFile?.let { ScriptAdditionalIdeaDependenciesProvider.getRelatedModules(it, project) }
val globalFacade = val globalFacade =
if (relatedModules?.isNotEmpty() == true) { if (relatedModules?.isNotEmpty() == true) {
globalFacade(settings) facadeForModules(settings)
} else { } else {
getOrBuildGlobalFacade(settings).facadeForSdk getOrBuildGlobalFacade(settings).facadeForSdk
} }
@@ -235,7 +230,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
.supportsFeature(LanguageFeature.ReleaseCoroutines) .supportsFeature(LanguageFeature.ReleaseCoroutines)
} }
private fun globalFacade(settings: PlatformAnalysisSettings) = private fun facadeForModules(settings: PlatformAnalysisSettings) =
getOrBuildGlobalFacade(settings).facadeForModules getOrBuildGlobalFacade(settings).facadeForModules
private fun librariesFacade(settings: PlatformAnalysisSettings) = private fun librariesFacade(settings: PlatformAnalysisSettings) =
@@ -297,7 +292,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
return when { return when {
specialModuleInfo is ModuleSourceInfo -> { specialModuleInfo is ModuleSourceInfo -> {
val dependentModules = specialModuleInfo.getDependentModules() val dependentModules = specialModuleInfo.getDependentModules()
val modulesFacade = globalFacade(settings) val modulesFacade = facadeForModules(settings)
val globalContext = val globalContext =
modulesFacade.globalContext.contextWithCompositeExceptionTracker( modulesFacade.globalContext.contextWithCompositeExceptionTracker(
project, project,
@@ -499,7 +494,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
is ScriptDependenciesInfo.ForProject, is ScriptDependenciesInfo.ForProject,
is ScriptDependenciesSourceInfo.ForProject -> facadeForScriptDependenciesForProject is ScriptDependenciesSourceInfo.ForProject -> facadeForScriptDependenciesForProject
is ScriptDependenciesInfo.ForFile -> createFacadeForScriptDependencies(moduleInfo) is ScriptDependenciesInfo.ForFile -> createFacadeForScriptDependencies(moduleInfo)
else -> globalFacade(settings) else -> facadeForModules(settings)
} }
return ModuleResolutionFacadeImpl(projectFacade, moduleInfo) return ModuleResolutionFacadeImpl(projectFacade, moduleInfo)
} }