From 4779e3e9cfd4e57e0804094b34d7d1219b2d4214 Mon Sep 17 00:00:00 2001
From: Alexander Udalov <alexander.udalov@jetbrains.com>
Date: Sat, 20 Feb 2016 12:34:24 +0300
Subject: [PATCH] Drop traces of old annotations from kotlin.jvm.internal

---
 build.xml                                                | 9 ++-------
 .../idea/caches/resolve/AbstractIdeLightClassTest.kt     | 4 ++--
 .../kotlin/annotation/AnnotationCollectorExtension.kt    | 3 ++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/build.xml b/build.xml
index 28feac4e329..06f13043b73 100644
--- a/build.xml
+++ b/build.xml
@@ -557,7 +557,6 @@
             <withKotlin modulename="kotlin-compiler">
                 <compilerarg value="-version"/>
             </withKotlin>
-            <skip pattern="kotlin/jvm/internal/.*"/>
             <skip pattern="kotlin/Metadata"/>
             <src refid="compilerSources.path"/>
             <classpath refid="classpath"/>
@@ -617,7 +616,7 @@
             <withKotlin modulename="kotlin-build-common">
                 <compilerarg value="-version"/>
             </withKotlin>
-            <skip pattern="kotlin/jvm/internal/.*"/>
+            <skip pattern="kotlin/Metadata"/>
             <src>
                 <pathelement path="build-common/src"/>
             </src>
@@ -692,7 +691,6 @@
             <withKotlin modulename="kotlin-android-compiler-plugin">
                 <compilerarg value="-version"/>
             </withKotlin>
-            <skip pattern="kotlin/jvm/internal/.*"/>
             <skip pattern="kotlin/Metadata"/>
             <src>
                 <pathelement path="plugins/android-compiler-plugin/src"/>
@@ -719,7 +717,6 @@
             <withKotlin modulename="kotlin-ant-tools">
                 <compilerarg value="-version"/>
             </withKotlin>
-            <skip pattern="kotlin/jvm/internal/.*"/>
             <skip pattern="kotlin/Metadata"/>
             <src>
                 <dirset dir="${basedir}/ant">
@@ -799,7 +796,6 @@
 
             <javac2 srcdir="${toString:src.dirset}" destdir="@{output}" debug="true" debuglevel="lines,vars,source"
                     includeAntRuntime="false" source="${java.target}" target="${java.target}">
-                <skip pattern="kotlin/jvm/internal/.*"/>
                 <skip pattern="kotlin/Metadata"/>
                 <classpath>
                     <path refid="classpath.path"/>
@@ -975,7 +971,7 @@
             <kotlinc src="${basedir}/generators/infrastructure/strip-kotlin-annotations.kts" output="">
                 <compilerarg value="-version"/>
                 <compilerarg value="-script"/>
-                <compilerarg value="kotlin/jvm/internal/.*|kotlin/Metadata"/> <!-- Annotations to strip -->
+                <compilerarg value="kotlin/Metadata"/> <!-- Annotation to strip -->
                 <compilerarg value="kotlin/reflect/jvm/internal/impl/.*"/> <!-- Classes to strip from -->
                 <compilerarg value="${output}/kotlin-reflect-jarjar.jar"/>
                 <compilerarg value="${kotlin-home}/lib/kotlin-reflect.jar"/>
@@ -1071,7 +1067,6 @@
             <withKotlin modulename="kotlin-for-upsource">
                 <compilerarg value="-version"/>
             </withKotlin>
-            <skip pattern="kotlin/jvm/internal/.*"/>
             <skip pattern="kotlin/Metadata"/>
             <src>
                 <dirset dir="${basedir}/idea/ide-common" includes="src"/>
diff --git a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
index f502078efb7..b5d21e3716a 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/caches/resolve/AbstractIdeLightClassTest.kt
@@ -25,6 +25,7 @@ import org.jetbrains.kotlin.asJava.LightClassTestCommon
 import org.jetbrains.kotlin.idea.KotlinDaemonAnalyzerTestCase
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase
 import org.jetbrains.kotlin.idea.test.KotlinWithJdkAndRuntimeLightProjectDescriptor
+import org.jetbrains.kotlin.load.java.JvmAnnotationNames
 import org.jetbrains.kotlin.test.KotlinTestUtils
 import org.jetbrains.kotlin.test.MockLibraryUtil
 import org.junit.Assert
@@ -80,8 +81,7 @@ private fun testLightClass(project: Project, testDataPath: String, normalize: (S
                         .replace("java.lang.String s)", "java.lang.String p)")
                         .replace("java.lang.String s1", "java.lang.String p1")
                         .replace("java.lang.String s2", "java.lang.String p2")
-                        .removeLinesStartingWith("@kotlin.jvm.internal.")
-                        .removeLinesStartingWith("@kotlin.Metadata")
+                        .removeLinesStartingWith("@" + JvmAnnotationNames.METADATA_FQ_NAME.asString())
                         .run(normalize)
             }
     )
diff --git a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
index c5ae2b47557..2e710fa372d 100644
--- a/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
+++ b/plugins/annotation-collector/src/org/jetbrains/kotlin/annotation/AnnotationCollectorExtension.kt
@@ -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) {