jvm-abi-gen: Remove effectively private classes from ABI

#KT-64590 Fixed

plugins/jvm-abi-gen/testData/compare/multifileClass/base/test.kt

@@ -0,0 +1,5 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package test
+
+fun f() {}

plugins/jvm-abi-gen/testData/compare/multifileClass/differentAbi/test.kt

@@ -0,0 +1,5 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package test
+
+// Removal of function from a multi-file class should result in a different ABI even though the multi-file part class is package-private.

plugins/jvm-abi-gen/testData/compare/nestedPrivateClasses/base/test.kt

@@ -0,0 +1,9 @@
+package test
+
+class Class {
+    private companion object {}
+    private class PrivateClass {
+        companion object {}
+        class NestedClass
+    }
+}

plugins/jvm-abi-gen/testData/compare/nestedPrivateClasses/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compare/nestedPrivateClasses/sameAbi/test.kt

@@ -0,0 +1,3 @@
+package test
+
+class Class

plugins/jvm-abi-gen/testData/compare/privateInterfaceDefaultImplementation/base/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class SomeClass {
+    private interface PrivateInterface {
+        fun d() = "Default implementation of removed interface should not affect abi."
+    }
+}

plugins/jvm-abi-gen/testData/compare/privateInterfaceDefaultImplementation/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compare/privateInterfaceDefaultImplementation/sameAbi/test.kt

@@ -0,0 +1,7 @@
+package test
+
+class SomeClass {
+    private interface PrivateInterface {
+        fun d(): String
+    }
+}

plugins/jvm-abi-gen/testData/compare/privateOuterClassForEffectivelyVisibleInterface/base/test.kt

@@ -0,0 +1,9 @@
+package test
+
+class Outer {
+    class Public : NestedClass.I
+
+    private class NestedClass {
+        interface I
+    }
+}

plugins/jvm-abi-gen/testData/compare/privateOuterClassForEffectivelyVisibleInterface/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compare/privateOuterClassForEffectivelyVisibleInterface/sameAbi/test.kt

@@ -0,0 +1,11 @@
+package test
+
+class Outer {
+    class Public : NestedClass.I
+
+    private class NestedClass {
+        interface I
+
+        fun someFun() = Unit
+    }
+}

plugins/jvm-abi-gen/testData/compare/privateTopLevelClasses/base/test.kt

@@ -0,0 +1,5 @@
+package test
+
+class Class
+
+private class PrivateClass

plugins/jvm-abi-gen/testData/compare/privateTopLevelClasses/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compare/privateTopLevelClasses/sameAbi/test.kt

@@ -0,0 +1,3 @@
+package test
+
+class Class

plugins/jvm-abi-gen/testData/compare/privateTopLevelClassesWithoutOption/base/test.kt

@@ -0,0 +1,5 @@
+package test
+
+class Class
+
+private class PrivateClass

plugins/jvm-abi-gen/testData/compare/privateTopLevelClassesWithoutOption/differentAbi/test.kt

@@ -0,0 +1,3 @@
+package test
+
+class Class

plugins/jvm-abi-gen/testData/compile/conflictingClasses/app/app.kt

@@ -0,0 +1,5 @@
+package app
+
+//UnexpectedInnerClass although declared in a separate module
+//appear to be an inner class of the class generated from this file
+fun runAppAndReturnOk() = AppKt.UnexpectedInnerClass.result()

plugins/jvm-abi-gen/testData/compile/conflictingClasses/lib/AppKt.kt

@@ -0,0 +1,7 @@
+package app
+
+class AppKt {
+    object UnexpectedInnerClass {
+        fun result() = "OK"
+    }
+}

plugins/jvm-abi-gen/testData/compile/multifileClass/app/app.kt

@@ -0,0 +1,12 @@
+package app
+
+import lib.*
+
+fun runAppAndReturnOk(): String {
+    f1()
+    if (v1 != "OK") return "Fail 1"
+    f2()
+    if (v2 != "OK") return "Fail 2"
+
+    return "OK"
+}

plugins/jvm-abi-gen/testData/compile/multifileClass/lib/part1.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T1 = String
+fun f1() {}
+val v1: T1 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClass/lib/part2.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T2 = String
+fun f2() {}
+val v2: T2 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassOptimized/app/app.kt

@@ -0,0 +1,12 @@
+package app
+
+import lib.*
+
+fun runAppAndReturnOk(): String {
+    f1()
+    if (v1 != "OK") return "Fail 1"
+    f2()
+    if (v2 != "OK") return "Fail 2"
+
+    return "OK"
+}

plugins/jvm-abi-gen/testData/compile/multifileClassOptimized/directives.txt

@@ -0,0 +1 @@
+// INHERIT_MULTIFILE_PARTS

plugins/jvm-abi-gen/testData/compile/multifileClassOptimized/lib/part1.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T1 = String
+fun f1() {}
+val v1: T1 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassOptimized/lib/part2.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T2 = String
+fun f2() {}
+val v2: T2 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassOptimizedWithRemovePrivateOption/app/app.kt

@@ -0,0 +1,12 @@
+package app
+
+import lib.*
+
+fun runAppAndReturnOk(): String {
+    f1()
+    if (v1 != "OK") return "Fail 1"
+    f2()
+    if (v2 != "OK") return "Fail 2"
+
+    return "OK"
+}

plugins/jvm-abi-gen/testData/compile/multifileClassOptimizedWithRemovePrivateOption/directives.txt

@@ -0,0 +1,2 @@
+// INHERIT_MULTIFILE_PARTS
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compile/multifileClassOptimizedWithRemovePrivateOption/lib/part1.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T1 = String
+fun f1() {}
+val v1: T1 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassOptimizedWithRemovePrivateOption/lib/part2.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T2 = String
+fun f2() {}
+val v2: T2 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassWithRemovePrivateOption/app/app.kt

@@ -0,0 +1,12 @@
+package app
+
+import lib.*
+
+fun runAppAndReturnOk(): String {
+    f1()
+    if (v1 != "OK") return "Fail 1"
+    f2()
+    if (v2 != "OK") return "Fail 2"
+
+    return "OK"
+}

plugins/jvm-abi-gen/testData/compile/multifileClassWithRemovePrivateOption/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compile/multifileClassWithRemovePrivateOption/lib/part1.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T1 = String
+fun f1() {}
+val v1: T1 = "OK"

plugins/jvm-abi-gen/testData/compile/multifileClassWithRemovePrivateOption/lib/part2.kt

@@ -0,0 +1,7 @@
+@file:JvmMultifileClass
+@file:JvmName("Multifile")
+package lib
+
+typealias T2 = String
+fun f2() {}
+val v2: T2 = "OK"

plugins/jvm-abi-gen/testData/compile/privateInterfaceImplementedByPublicClass/app/app.kt

@@ -0,0 +1,7 @@
+package app
+
+import lib.*
+
+fun runAppAndReturnOk(): String {
+    return Outer.Public.result()
+}

plugins/jvm-abi-gen/testData/compile/privateInterfaceImplementedByPublicClass/directives.txt

@@ -0,0 +1 @@
+// REMOVE_PRIVATE_CLASSES

plugins/jvm-abi-gen/testData/compile/privateInterfaceImplementedByPublicClass/lib/lib.kt

@@ -0,0 +1,13 @@
+package lib
+
+class Outer {
+    object Public : Private
+
+    private interface Private: Secret.EffectivelyPrivate
+
+    private object Secret {
+        interface EffectivelyPrivate {
+            fun result(): String = "OK"
+        }
+    }
+}

plugins/jvm-abi-gen/testData/content/effectivelyPrivateAnnotation/annotation.kt

@@ -0,0 +1,7 @@
+package test
+
+class Outer {
+    private object Annotations {
+        annotation class EffectivelyPrivateAnnotation
+    }
+}

plugins/jvm-abi-gen/testData/content/effectivelyPrivateAnnotation/signatures.txt

@@ -0,0 +1,20 @@
+@java.lang.annotation.Retention(value=RUNTIME)
+@kotlin.Metadata
+public annotation class test/Outer$Annotations$EffectivelyPrivateAnnotation {
+    // source: 'annotation.kt'
+    private final inner class test/Outer$Annotations
+    public inner class test/Outer$Annotations$EffectivelyPrivateAnnotation
+}
+@kotlin.Metadata
+final class test/Outer$Annotations {
+    // source: 'annotation.kt'
+    private final inner class test/Outer$Annotations
+    public inner class test/Outer$Annotations$EffectivelyPrivateAnnotation
+    public final static @org.jetbrains.annotations.NotNull field INSTANCE: test.Outer$Annotations
+}
+@kotlin.Metadata
+public final class test/Outer {
+    // source: 'annotation.kt'
+    private final inner class test/Outer$Annotations
+    public method <init>(): void
+}