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

Clean up some code in compiler.resolution.common.jvm

Browse Source
This commit is contained in:
Victor Petukhov
2020-11-27 11:44:34 +03:00
parent 63aa809280
commit f0ab8bc332
2 changed files with 44 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/Annotations.kt
+1 -1
View File
@@ -155,7 +155,7 @@ class BinaryJavaAnnotation private constructor(
context.resolveByInternalName(Type.getType(desc).internalName) context.resolveByInternalName(Type.getType(desc).internalName)
} }
override val classId: ClassId? override val classId: ClassId
get() = classifierResolutionResult.classifier.safeAs<JavaClass>()?.classId get() = classifierResolutionResult.classifier.safeAs<JavaClass>()?.classId
?: ClassId.topLevel(FqName(classifierResolutionResult.qualifiedName)) ?: ClassId.topLevel(FqName(classifierResolutionResult.qualifiedName))
compiler/resolution.common.jvm/src/org/jetbrains/kotlin/load/java/structure/impl/classFiles/BinaryClassSignatureParser.kt
+2 -4
View File
@@ -120,12 +120,10 @@ class BinaryClassSignatureParser {
signature.next() signature.next()
do { do {
group.add(parseClassOrTypeVariableElement(signature, context)) group.add(parseClassOrTypeVariableElement(signature, context))
} } while (signature.current() != '>')
while (signature.current() != '>')
argumentGroups.add(group) argumentGroups.add(group)
} } else if (c != ' ') {
else if (c != ' ') {
canonicalName.append(c) canonicalName.append(c)
} }
signature.next() signature.next()