Kapt3: "$annotations" are not always ACC_PRIVATE now (see also KT-15993)

plugins/kapt3/src/org/jetbrains/kotlin/kapt3/stubs/ClassFileToSourceStubConverter.kt

@@ -306,8 +306,7 @@ class ClassFileToSourceStubConverter(
         val descriptor = kaptContext.origins[method]?.descriptor as? CallableDescriptor ?: return null
 
         val isAnnotationHolderForProperty = descriptor is PropertyDescriptor && isSynthetic(method.access)
-                                            && isPrivate(method.access) && isStatic(method.access)
+                                            && isStatic(method.access) && method.name.endsWith("\$annotations")
-                                            && method.name.endsWith("\$annotations")
 
         if (isSynthetic(method.access) && !isAnnotationHolderForProperty) return null
 

plugins/kapt3/testData/converter/annotations.txt

@@ -77,7 +77,7 @@ public final class TestAnno2 {
     }
 
     @Anno3(value = "property")
-    private static void b$annotations() {
+    public static void b$annotations() {
     }
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/testData/converter/annotations2.txt

@@ -24,7 +24,7 @@ public final class AnnotationsTest {
     }
 
     @Anno(value = "top-level-val")
-    private static void topLevelVal$annotations(int p0) {
+    public static void topLevelVal$annotations(int p0) {
     }
 
     @org.jetbrains.annotations.NotNull()
@@ -68,14 +68,14 @@ public abstract class Test {
     public abstract java.lang.String abstractMethod();
 
     @Anno(value = "abstract-val")
-    private static void abstractVal$annotations() {
+    public static void abstractVal$annotations() {
     }
 
     @org.jetbrains.annotations.NotNull()
     public abstract java.lang.String getAbstractVal();
 
     @Anno(value = "v-property")
-    private static void v$annotations() {
+    public static void v$annotations() {
     }
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/testData/converter/jvmStatic.txt

@@ -25,7 +25,7 @@ public final class JvmStaticTest {
 
     public static final class Companion {
 
-        private static void one$annotations() {
+        public static void one$annotations() {
         }
 
         public final int getOne() {
@@ -40,4 +40,4 @@ public final class JvmStaticTest {
             super();
         }
     }
-}
+}

plugins/kapt3/testData/converter/jvmStaticFieldInParent.txt

@@ -14,7 +14,7 @@ public final class Test {
 
     public static final class A {
 
-        private static void test$annotations() {
+        public static void test$annotations() {
         }
 
         @org.jetbrains.annotations.NotNull()

plugins/kapt3/testData/converter/propertyAnnotations.txt

@@ -20,7 +20,7 @@ public final class Test {
 
     @Anno2()
     @Anno()
-    private static void prop$annotations() {
+    public static void prop$annotations() {
     }
 
     @org.jetbrains.annotations.NotNull()

plugins/kapt3/testData/converter/topLevel.txt

@@ -46,7 +46,7 @@ public final class TopLevelKt {
     }
 
     @Anno(value = "extpr")
-    private static void extensionProperty$annotations(java.lang.Object p0) {
+    public static void extensionProperty$annotations(java.lang.Object p0) {
     }
 
     @org.jetbrains.annotations.NotNull()