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

JavacWrapper: optimize building of tree-based stuff

Browse Source
This commit is contained in:
Mikhail Glukhikh
2019-09-24 19:19:44 +03:00
parent 39ff04e043
commit 9f3d834b2a
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/javac-wrapper/src/org/jetbrains/kotlin/javac/JavacWrapper.kt
+17 -14
View File
@@ -126,22 +126,25 @@ class JavacWrapper(
private val fileObjects = javaFiles.mapTo(ListBuffer()) { fileManager.getRegularFile(it) }.toList() private val fileObjects = javaFiles.mapTo(ListBuffer()) { fileManager.getRegularFile(it) }.toList()
private val compilationUnits: JavacList<JCTree.JCCompilationUnit> = fileObjects.mapTo(ListBuffer(), javac::parse).toList() private val compilationUnits: JavacList<JCTree.JCCompilationUnit> = fileObjects.mapTo(ListBuffer(), javac::parse).toList()
private val treeBasedJavaClasses = compilationUnits.flatMap { unit -> private val treeBasedJavaClasses: Map<ClassId, TreeBasedClass>
unit.typeDecls.map { classDeclaration -> private val treeBasedJavaPackages: Map<FqName, TreeBasedPackage>
val packageName = unit.packageName?.toString() ?: ""
val className = (classDeclaration as JCTree.JCClassDecl).simpleName.toString()
val classId = classId(packageName, className)
classId to TreeBasedClass(classDeclaration, unit, this, classId, null)
}
}.toMap()
private val treeBasedJavaPackages = compilationUnits init {
.mapTo(hashSetOf<TreeBasedPackage>()) { unit -> val javaClasses = mutableMapOf<ClassId, TreeBasedClass>()
unit.packageName?.toString()?.let { packageName -> val javaPackages = mutableMapOf<FqName, TreeBasedPackage>()
TreeBasedPackage(packageName, this, unit) for (unit in compilationUnits) {
} ?: TreeBasedPackage("<root>", this, unit) val packageName = unit.packageName?.toString()
val javaPackage = TreeBasedPackage(packageName ?: "<root>", this, unit)
javaPackages[javaPackage.fqName] = javaPackage
for (classDeclaration in unit.typeDecls) {
val className = (classDeclaration as JCTree.JCClassDecl).simpleName.toString()
val classId = classId(packageName ?: "", className)
javaClasses[classId] = TreeBasedClass(classDeclaration, unit, this, classId, null)
}
} }
.associateBy(TreeBasedPackage::fqName) treeBasedJavaClasses = javaClasses
treeBasedJavaPackages = javaPackages
}
private val packageSourceAnnotations = compilationUnits private val packageSourceAnnotations = compilationUnits
.filter { .filter {