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

Cleanup

Browse Source 
- do not use annotation resolve in CodegenFileClassProvider
- test using private methods across different parts of multifile class
This commit is contained in:
Dmitry Petrov
2015-09-09 12:39:10 +03:00
parent 5e38c99f81
commit 8162272106
7 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/backend/src/org/jetbrains/kotlin/codegen/CodegenFileClassesProvider.kt
+4 -7
View File
@@ -24,7 +24,7 @@ import org.jetbrains.kotlin.psi.JetFile
import org.jetbrains.kotlin.resolve.BindingContext
import java.util.*
public class CodegenFileClassesProvider private constructor(private val bindingContext: BindingContext) : JvmFileClassesProvider {
public class CodegenFileClassesProvider private constructor() : JvmFileClassesProvider {
private val fileParts = hashMapOf<JetFile, JvmFileClassInfo>()
override fun getFileClassFqName(file: JetFile): FqName =
@@ -33,11 +33,8 @@ public class CodegenFileClassesProvider private constructor(private val bindingC
public fun getFileClassInfo(file: JetFile): JvmFileClassInfo =
fileParts.getOrPut(file) { createFileClassInfo(file) }
private fun createFileClassInfo(file: JetFile): JvmFileClassInfo {
val fileAnnotations = JvmFileClassUtil.collectFileAnnotations(file, bindingContext)
val jvmClassNameAnnotation = JvmFileClassUtil.parseJvmFileClass(fileAnnotations)
return JvmFileClassUtil.getFileClassInfo(file, jvmClassNameAnnotation)
}
private fun createFileClassInfo(file: JetFile): JvmFileClassInfo =
JvmFileClassUtil.getFileClassInfoNoResolve(file)
internal fun addFileClassInfo(file: JetFile) {
if (fileParts.containsKey(file)) return
@@ -51,7 +48,7 @@ public class CodegenFileClassesProvider private constructor(private val bindingC
packagesWithObsoleteParts: Collection<FqName>,
multifileFacadesWithObsoleteParts: Collection<FqName>
) : CodegenFileClassesProvider {
val codegenFileClassesManager = CodegenFileClassesProvider(bindingContext)
val codegenFileClassesManager = CodegenFileClassesProvider()
files.forEach {
codegenFileClassesManager.addFileClassInfo(it)
}