From 3853d6a39a69adad0f722ac5a29689d60690418e Mon Sep 17 00:00:00 2001 From: Alexander Udalov Date: Mon, 15 Sep 2014 10:55:31 +0400 Subject: [PATCH] Read InnerClasses attribute value in FileBasedKotlinClass Resolve names mentioned in class declarations based on this information Original commit: 1f8b2cef523eaf31ddee7f0aed6b20d9522f5507 --- .../jet/jps/incremental/LocalFileKotlinClass.kt | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt index dd55ccff47a..a414e46deb4 100644 --- a/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt +++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt @@ -25,15 +25,16 @@ class LocalFileKotlinClass private( private val file: File, private val fileContents: ByteArray, className: JvmClassName, - classHeader: KotlinClassHeader -) : FileBasedKotlinClass(className, classHeader) { + classHeader: KotlinClassHeader, + innerClasses: FileBasedKotlinClass.InnerClassesInfo +) : FileBasedKotlinClass(className, classHeader, innerClasses) { class object { fun create(file: File): LocalFileKotlinClass? { val fileContents = file.readBytes() return FileBasedKotlinClass.create(fileContents) { - className, classHeader -> - LocalFileKotlinClass(file, fileContents, className, classHeader) + className, classHeader, innerClasses -> + LocalFileKotlinClass(file, fileContents, className, classHeader, innerClasses) } } }