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

Use ClassId instead of JvmClassName in KotlinJvmBinaryClass

Browse Source 
ClassId contains exact information about origin of the class (e.g. if '$' in
the class name denotes nested classes separator or just a character in the
name)

Original commit: 7595e32bb6
This commit is contained in:
Alexander Udalov
2014-09-15 13:49:55 +04:00
parent 3853d6a39a
commit 11b8d4f9c3
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-plugin/jps-plugin.iml
+1 -1
View File
@@ -18,7 +18,7 @@
<orderEntry type="module" module-name="descriptors" /> <orderEntry type="module" module-name="descriptors" />
<orderEntry type="module" module-name="frontend.java" /> <orderEntry type="module" module-name="frontend.java" />
<orderEntry type="module" module-name="serialization.java" /> <orderEntry type="module" module-name="serialization.java" />
<orderEntry type="module" module-name="serialization" scope="TEST" /> <orderEntry type="module" module-name="serialization" />
<orderEntry type="module" module-name="compiler-tests" scope="TEST" /> <orderEntry type="module" module-name="compiler-tests" scope="TEST" />
<orderEntry type="library" name="asm" level="project" /> <orderEntry type="library" name="asm" level="project" />
</component> </component>
jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/IncrementalCacheImpl.kt
+1 -1
View File
@@ -63,7 +63,7 @@ public class IncrementalCacheImpl(val baseDir: File): StorageOwner, IncrementalC
if (kotlinClass == null) return DO_NOTHING if (kotlinClass == null) return DO_NOTHING
val fileBytes = kotlinClass.getFileContents() val fileBytes = kotlinClass.getFileContents()
val className = kotlinClass.getClassName() val className = JvmClassName.byClassId(kotlinClass.getClassId())
val header = kotlinClass.getClassHeader() val header = kotlinClass.getClassHeader()
val annotationDataEncoded = header.annotationData val annotationDataEncoded = header.annotationData
jps/jps-plugin/src/org/jetbrains/jet/jps/incremental/LocalFileKotlinClass.kt
+2 -2
View File
@@ -17,14 +17,14 @@
package org.jetbrains.jet.jps.incremental package org.jetbrains.jet.jps.incremental
import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass import org.jetbrains.jet.lang.resolve.kotlin.FileBasedKotlinClass
import org.jetbrains.jet.lang.resolve.java.JvmClassName
import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader import org.jetbrains.jet.lang.resolve.kotlin.header.KotlinClassHeader
import org.jetbrains.jet.descriptors.serialization.ClassId
import java.io.File import java.io.File
class LocalFileKotlinClass private( class LocalFileKotlinClass private(
private val file: File, private val file: File,
private val fileContents: ByteArray, private val fileContents: ByteArray,
className: JvmClassName, className: ClassId,
classHeader: KotlinClassHeader, classHeader: KotlinClassHeader,
innerClasses: FileBasedKotlinClass.InnerClassesInfo innerClasses: FileBasedKotlinClass.InnerClassesInfo
) : FileBasedKotlinClass(className, classHeader, innerClasses) { ) : FileBasedKotlinClass(className, classHeader, innerClasses) {