Private visibility for non-const, non-jvmField class companion property backing field

Original commit: e116cc3206

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java

@@ -892,6 +892,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta
                 doTest(fileName);
             }
 
+            @TestMetadata("jvmFieldChanged")
+            public void testJvmFieldChanged() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("jvmFieldUnchanged")
+            public void testJvmFieldUnchanged() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/");
+                doTest(fileName);
+            }
+
             @TestMetadata("methodAddedInSuper")
             public void testMethodAddedInSuper() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/");

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalConstantSearchTest.kt

@@ -34,10 +34,18 @@ public class IncrementalConstantSearchTest : AbstractIncrementalJpsTest() {
         doTest("jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/")
     }
 
+    fun testKotlinJvmFieldChangedUsedInJava() {
+        doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/")
+    }
+
     fun testKotlinConstantUnchangedUsedInJava() {
         doTest("jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/")
     }
 
+    fun testKotlinJvmFieldUnchangedUsedInJava() {
+        doTest("jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/")
+    }
+
     override val mockConstantSearch: Callbacks.ConstantAffectionResolver?
         get() = object : Callbacks.ConstantAffectionResolver {
             override fun request(

jps/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java

@@ -892,6 +892,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest {
                 doTest(fileName);
             }
 
+            @TestMetadata("jvmFieldChanged")
+            public void testJvmFieldChanged() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/");
+                doTest(fileName);
+            }
+
+            @TestMetadata("jvmFieldUnchanged")
+            public void testJvmFieldUnchanged() throws Exception {
+                String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/");
+                doTest(fileName);
+            }
+
             @TestMetadata("methodAddedInSuper")
             public void testMethodAddedInSuper() throws Exception {
                 String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/");

jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt

@@ -3,6 +3,6 @@ package test
 class Klass {
     companion object {
         // Old and new constant values are different, but their hashes are the same
-        val CONST = "BF"
+        const val CONST = "BF"
     }
 }

jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new

@@ -3,6 +3,6 @@ package test
 class Klass {
     companion object {
         // Old and new constant values are different, but their hashes are the same
-        val CONST = "Ae"
+        const val CONST = "Ae"
     }
 }

jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt

@@ -2,6 +2,6 @@ package test
 
 class Klass {
     companion object {
-        val CONST = "bar"
+        const val CONST = "bar"
     }
 }

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/Usage.java

@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/build.log

@@ -0,0 +1,13 @@
+Cleaning output files:
+out/production/module/test/Klass$Companion.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+End of files
+Compiling files:
+src/Usage.java
+End of files

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt

@@ -0,0 +1,9 @@
+package test
+
+class Klass {
+    companion object {
+        // Old and new constant values are different, but their hashes are the same
+        @JvmField
+        val CONST = "BF"
+    }
+}

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldChangedUsedInJava/const.kt.new

@@ -0,0 +1,9 @@
+package test
+
+class Klass {
+    companion object {
+        // Old and new constant values are different, but their hashes are the same
+        @JvmField
+        val CONST = "Ae"
+    }
+}

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/Usage.java

@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/Klass$Companion.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files

jps/jps-plugin/testData/incremental/custom/kotlinJvmFieldUnchangedUsedInJava/const.kt

@@ -0,0 +1,8 @@
+package test
+
+class Klass {
+    companion object {
+        @JvmField
+        val CONST = "bar"
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt

@@ -3,6 +3,6 @@ package test
 class Klass {
     companion object {
         // Old and new constant values are different, but their hashes are the same
-        val CONST = "BF"
+        const val CONST = "BF"
     }
 }

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new

@@ -3,6 +3,6 @@ package test
 class Klass {
     companion object {
         // Old and new constant values are different, but their hashes are the same
-        val CONST = "Ae"
+        const val CONST = "Ae"
     }
 }

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt

@@ -2,6 +2,6 @@ package test
 
 class Klass {
     companion object {
-        val CONST = "bar"
+        const val CONST = "bar"
     }
 }

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/Usage.java

@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/build.log

@@ -0,0 +1,18 @@
+Cleaning output files:
+out/production/module/test/Klass$Companion.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Cleaning output files:
+out/production/module/Usage.class
+out/production/module/test/Klass$Companion.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files
+Compiling files:
+src/Usage.java
+End of files

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt

@@ -0,0 +1,9 @@
+package test
+
+class Klass {
+    companion object {
+        // Old and new constant values are different, but their hashes are the same
+        @JvmField
+        val CONST = "BF"
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldChanged/const.kt.new

@@ -0,0 +1,9 @@
+package test
+
+class Klass {
+    companion object {
+        // Old and new constant values are different, but their hashes are the same
+        @JvmField
+        val CONST = "Ae"
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/Usage.java

@@ -0,0 +1,7 @@
+import test.*;
+
+class Usage {
+    public static void main(String[] args) {
+        System.out.println(Klass.CONST + Klass.CONST);
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/build.log

@@ -0,0 +1,7 @@
+Cleaning output files:
+out/production/module/test/Klass$Companion.class
+out/production/module/test/Klass.class
+End of files
+Compiling files:
+src/const.kt
+End of files

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/jvmFieldUnchanged/const.kt

@@ -0,0 +1,8 @@
+package test
+
+class Klass {
+    companion object {
+        @JvmField
+        val CONST = "bar"
+    }
+}