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

workaround for NPE in proguard

Browse Source
This commit is contained in:
Dmitry Petrov
2015-09-07 18:56:06 +03:00
parent a00346a141
commit 879d7b1b24
1 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt
+13 -16
View File
@@ -59,31 +59,28 @@ public object JvmFileClassUtil {
"${facadeName}__${PackagePartClassUtils.getFilePartShortName(fileName)}" "${facadeName}__${PackagePartClassUtils.getFilePartShortName(fileName)}"
public @jvmStatic fun parseJvmFileClass(annotations: Annotations): ParsedJmvFileClassAnnotations? { public @jvmStatic fun parseJvmFileClass(annotations: Annotations): ParsedJmvFileClassAnnotations? {
val jvmName = annotations.findAnnotation(JVM_NAME) val jvmName = annotations.findAnnotation(JVM_NAME) ?: return null
val jvmMultifileClass = annotations.findAnnotation(JVM_MULTIFILE_CLASS) val jvmMultifileClass = annotations.findAnnotation(JVM_MULTIFILE_CLASS)
return jvmName?.let { return parseJvmFileClass(jvmName, jvmMultifileClass)
parseJvmFileClass(it, jvmMultifileClass)
}
} }
public @jvmStatic fun parseJvmFileClass(jvmName: AnnotationDescriptor, jvmMultifileClass: AnnotationDescriptor?): ParsedJmvFileClassAnnotations { public @jvmStatic fun parseJvmFileClass(jvmName: AnnotationDescriptor, jvmMultifileClass: AnnotationDescriptor?): ParsedJmvFileClassAnnotations? {
val name = jvmName.allValueArguments.values().firstOrNull()?.let { (it as? StringValue)?.value } val jvmNameArgument = jvmName.allValueArguments.values().singleOrNull() ?: return null
val name = (jvmNameArgument as? StringValue)?.value ?: return null
val isMultifileClassPart = jvmMultifileClass != null val isMultifileClassPart = jvmMultifileClass != null
return ParsedJmvFileClassAnnotations(name!!, isMultifileClassPart) return ParsedJmvFileClassAnnotations(name, isMultifileClassPart)
} }
public @jvmStatic fun getFileClassInfoNoResolve(file: JetFile): JvmFileClassInfo = public @jvmStatic fun getFileClassInfoNoResolve(file: JetFile): JvmFileClassInfo =
getFileClassInfo(file, parseJvmNameOnFileNoResolve(file)) getFileClassInfo(file, parseJvmNameOnFileNoResolve(file))
public @jvmStatic fun parseJvmNameOnFileNoResolve(file: JetFile): ParsedJmvFileClassAnnotations? = public @jvmStatic fun parseJvmNameOnFileNoResolve(file: JetFile): ParsedJmvFileClassAnnotations? {
findAnnotationEntryOnFileNoResolve(file, JVM_NAME_SHORT)?.let { annotationEntry -> val jvmName = findAnnotationEntryOnFileNoResolve(file, JVM_NAME_SHORT) ?: return null
val nameExpr = annotationEntry.valueArguments.firstOrNull()?.getArgumentExpression() ?: return null val nameExpr = jvmName.valueArguments.firstOrNull()?.getArgumentExpression() ?: return null
val name = getLiteralStringFromRestrictedConstExpression(nameExpr) val name = getLiteralStringFromRestrictedConstExpression(nameExpr) ?: return null
val isMultifileClassPart = findAnnotationEntryOnFileNoResolve(file, JVM_MULTIFILE_CLASS_SHORT) != null val isMultifileClassPart = findAnnotationEntryOnFileNoResolve(file, JVM_MULTIFILE_CLASS_SHORT) != null
name?.let { return ParsedJmvFileClassAnnotations(name, isMultifileClassPart)
ParsedJmvFileClassAnnotations(it, isMultifileClassPart) }
}
}
public @jvmStatic fun findAnnotationEntryOnFileNoResolve(file: JetFile, shortName: String): JetAnnotationEntry? = public @jvmStatic fun findAnnotationEntryOnFileNoResolve(file: JetFile, shortName: String): JetAnnotationEntry? =
file.fileAnnotationList?.annotationEntries?.firstOrNull { file.fileAnnotationList?.annotationEntries?.firstOrNull {