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

Drop traces of old annotations from kotlin.jvm.internal

Browse Source
This commit is contained in:
Alexander Udalov
2016-02-20 12:34:24 +03:00
parent c93517bc2f
commit 4779e3e9cf
3 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
+2 -1
View File
@@ -23,6 +23,7 @@ import org.jetbrains.kotlin.codegen.DelegatingClassBuilder
import org.jetbrains.kotlin.codegen.DelegatingClassBuilderFactory
import org.jetbrains.kotlin.codegen.extensions.ClassBuilderInterceptorExtension
import org.jetbrains.kotlin.diagnostics.DiagnosticSink
import org.jetbrains.kotlin.load.java.JvmAnnotationNames
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.jvm.diagnostics.JvmDeclarationOrigin
import org.jetbrains.org.objectweb.asm.*
@@ -165,7 +166,7 @@ abstract class AnnotationCollectorExtensionBase(val supportInheritedAnnotations:
private fun isAnnotationHandled(annotationFqName: String): Boolean {
return if (annotationFilterEnabled)
annotationFilters.any { it.matcher(annotationFqName).matches() }
else !annotationFqName.startsWith("kotlin.jvm.internal.") && annotationFqName != "kotlin.Metadata" //apply to all
else annotationFqName != JvmAnnotationNames.METADATA_FQ_NAME.asString()
}
private fun recordClass(packageName: String, className: String) {