Refactoring: rename AnalyzerFacade -> ResolverForModuleFactory

This commit is contained in:
Nikolay Krasko
2018-02-22 15:27:02 +03:00
parent c5e8374fa8
commit dced45d1bf
6 changed files with 19 additions and 17 deletions
@@ -85,7 +85,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
private val debugName: String,
private val projectContext: ProjectContext,
modules: Collection<M>,
private val analyzerFacade: (M) -> AnalyzerFacade,
private val resolverForModuleFactory: (M) -> ResolverForModuleFactory,
private val modulesContent: (M) -> ModuleContent,
private val platformParameters: PlatformAnalysisParameters,
private val targetEnvironment: TargetEnvironment = CompilerEnvironment,
@@ -170,7 +170,7 @@ class ResolverForProjectImpl<M : ModuleInfo>(
ResolverForModuleComputationTracker.getInstance(projectContext.project)?.onResolverComputed(module)
analyzerFacade(module).createResolverForModule(
resolverForModuleFactory(module).createResolverForModule(
module, descriptor as ModuleDescriptorImpl, projectContext.withModule(descriptor), modulesContent(module),
platformParameters, targetEnvironment, this@ResolverForProjectImpl,
languageSettingsProvider,
@@ -281,7 +281,7 @@ interface TrackableModuleInfo : ModuleInfo {
fun createModificationTracker(): ModificationTracker
}
abstract class AnalyzerFacade {
abstract class ResolverForModuleFactory {
abstract fun <M : ModuleInfo> createResolverForModule(
moduleInfo: M,
moduleDescriptor: ModuleDescriptorImpl,
@@ -49,7 +49,7 @@ import org.jetbrains.kotlin.serialization.deserialization.MetadataPackageFragmen
* A facade that is used to analyze common (platform-independent) modules in multi-platform projects.
* See [TargetPlatform.Common]
*/
object CommonAnalyzerFacade : AnalyzerFacade() {
object CommonAnalyzerFacade : ResolverForModuleFactory() {
private class SourceModuleInfo(
override val name: Name,
override val capabilities: Map<ModuleDescriptor.Capability<*>, Any?>,
@@ -78,9 +78,11 @@ object CommonAnalyzerFacade : AnalyzerFacade() {
@Suppress("NAME_SHADOWING")
val resolver = ResolverForProjectImpl(
"sources for metadata serializer",
ProjectContext(project), listOf(moduleInfo), { CommonAnalyzerFacade },
{ ModuleContent(files, GlobalSearchScope.allScope(project)) },
object : PlatformAnalysisParameters {},
ProjectContext(project),
listOf(moduleInfo),
resolverForModuleFactory = { CommonAnalyzerFacade },
modulesContent = { ModuleContent(files, GlobalSearchScope.allScope(project)) },
platformParameters = object : PlatformAnalysisParameters {},
languageSettingsProvider = object : LanguageSettingsProvider {
override fun getLanguageVersionSettings(moduleInfo: ModuleInfo, project: Project) = multiplatformLanguageSettings
override fun getTargetPlatform(moduleInfo: ModuleInfo) = TargetPlatformVersion.NoVersion