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

Simplify component injection in annotation/constant loaders

Browse Source
This commit is contained in:
Alexander Udalov
2014-11-21 03:50:25 +03:00
parent 149a90d7bf
commit 673c15a23d
9 changed files with 64 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/decompiler/textBuilder/DeserializerForDecompiler.kt
+6 -17
View File
@@ -87,27 +87,16 @@ public class DeserializerForDecompiler(val packageDirectory: VirtualFile, val di
return null
}
}
private val storageManager = LockBasedStorageManager.NO_LOCKS
private val loadersStorage = DescriptorLoadersStorage(storageManager);
{
loadersStorage.setModule(moduleDescriptor)
loadersStorage.setErrorReporter(LOGGING_REPORTER)
}
private val loadersStorage = DescriptorLoadersStorage(storageManager, moduleDescriptor)
private val annotationLoader = AnnotationDescriptorLoader(moduleDescriptor, storageManager);
{
annotationLoader.setKotlinClassFinder(localClassFinder)
annotationLoader.setErrorReporter(LOGGING_REPORTER)
annotationLoader.setStorage(loadersStorage)
}
private val annotationLoader = AnnotationDescriptorLoader(
storageManager, moduleDescriptor, loadersStorage, localClassFinder, LOGGING_REPORTER
)
private val constantLoader = ConstantDescriptorLoader();
{
constantLoader.setKotlinClassFinder(localClassFinder)
constantLoader.setErrorReporter(LOGGING_REPORTER)
constantLoader.setStorage(loadersStorage)
}
private val constantLoader = ConstantDescriptorLoader(loadersStorage, localClassFinder, LOGGING_REPORTER)
private val classDataFinder = object : ClassDataFinder {
override fun findClassData(classId: ClassId): ClassData? {