Rename: jps-plugin -> jps/jps-plugin

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/JavaUsage.java

@@ -0,0 +1,5 @@
+class JavaUsage {
+    public static void main(String[] args) {
+        test.FunKt.f("x");
+    }
+}

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

@@ -0,0 +1,19 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/FunKt.class
+End of files
+Compiling files:
+  src/fun.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/JavaUsage.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/JavaUsage.java
+End of files

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt

@@ -0,0 +1,5 @@
+package test
+
+fun f(a: String) {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/fun.kt.new

@@ -0,0 +1,6 @@
+package test
+
+@kotlin.jvm.JvmOverloads
+fun f(a: String, b: Int = 5) {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/addOptionalParameter/other.kt

@@ -0,0 +1,5 @@
+package test
+
+fun other() {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/NotUsage.java

@@ -0,0 +1,2 @@
+public class NotUsage {
+}

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

@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/FunKt.class
+End of files
+Compiling files:
+  src/fun.kt
+End of files
+Exit code: OK
+------------------------------------------

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt

@@ -0,0 +1,5 @@
+package test
+
+fun foo() {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeNotUsedSignature/fun.kt.new

@@ -0,0 +1,5 @@
+package test
+
+fun foo(): String {
+  return "Hello, world!"
+}

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

@@ -0,0 +1,5 @@
+public class Usage {
+    public static void main(String[] args) {
+        test.FunKt.foo();
+    }
+}

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

@@ -0,0 +1,19 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/FunKt.class
+End of files
+Compiling files:
+  src/fun.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/Usage.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt

@@ -0,0 +1,5 @@
+package test
+
+fun foo() {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/changeSignature/fun.kt.new

@@ -0,0 +1,5 @@
+package test
+
+fun foo(): String {
+  return "Hello, world!"
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/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/constantChanged/build.log

@@ -0,0 +1,20 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/Usage.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

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

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

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

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

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/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/constantUnchanged/build.log

@@ -0,0 +1,12 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------

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

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

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/WillBeUnresolved.java

@@ -0,0 +1,5 @@
+class WillBeUnresolved {
+    void main() {
+        test.FunKt.f(":(");
+    }
+}

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

@@ -0,0 +1,23 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/FunKt.class
+End of files
+Compiling files:
+  src/fun.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/WillBeUnresolved.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/WillBeUnresolved.java
+End of files
+COMPILATION FAILED
+cannot find symbol
+  symbol:   method f(java.lang.String)
+  location: class test.FunKt

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt

@@ -0,0 +1,5 @@
+package test
+
+fun f(s: String) {
+
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/funRenamed/fun.kt.new

@@ -0,0 +1,5 @@
+package test
+
+fun g(s: String) {
+
+}

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,12 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------

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,12 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/Klass$Companion.class
+  out/production/module/test/Klass.class
+End of files
+Compiling files:
+  src/const.kt
+End of files
+Exit code: OK
+------------------------------------------

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

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

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Sub.java

@@ -0,0 +1,5 @@
+public class Sub extends Super {
+    private void y() {
+
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt

@@ -0,0 +1,4 @@
+public open class Super {
+    public fun x() {
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/methodAddedInSuper/Super.kt.new

@@ -0,0 +1,7 @@
+public open class Super {
+    public fun x() {
+    }
+
+    public fun y() {
+    }
+}

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

@@ -0,0 +1,22 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/Super.class
+End of files
+Compiling files:
+  src/Super.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/Sub.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/Sub.java
+End of files
+COMPILATION FAILED
+y() in Sub cannot override y() in Super
+  overridden method is final

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

@@ -0,0 +1,5 @@
+public class Usage {
+    public static void main(String[] args) {
+        test.FunKt.foo();
+    }
+}

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

@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/FunKt.class
+End of files
+Compiling files:
+  src/fun.kt
+End of files
+Exit code: OK
+------------------------------------------

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/notChangeSignature/fun.kt

@@ -0,0 +1,5 @@
+package test
+
+fun foo() {
+
+}

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

@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        test.AKt.a();
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/a.kt

@@ -0,0 +1,4 @@
+package test
+
+fun a() {
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt

@@ -0,0 +1,4 @@
+package test
+
+fun b() {
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/onlyTopLevelFunctionInFileRemoved/b.kt.new

@@ -0,0 +1,2 @@
+package test
+

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

@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/BKt.class
+End of files
+Compiling files:
+  src/b.kt
+End of files
+Exit code: OK
+------------------------------------------

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

@@ -0,0 +1,5 @@
+class Usage {
+    void usage() {
+        test.AKt.a();
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/Usage.java.new

@@ -0,0 +1,6 @@
+class Usage {
+    void usage() {
+        test.AKt.a();
+        test.BKt.b();
+    }
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/a.kt

@@ -0,0 +1,4 @@
+package test
+
+fun a() {
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/packageFileAdded/b.kt.new

@@ -0,0 +1,4 @@
+package test
+
+fun b() {
+}

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

@@ -0,0 +1,13 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/Usage.class
+End of files
+Compiling files:
+  src/b.kt
+End of files
+Exit code: OK
+------------------------------------------
+Compiling files:
+  src/Usage.java
+End of files

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt

@@ -0,0 +1,6 @@
+package test
+
+public class ClassA {
+    public fun meth1() {}
+    private fun meth2() {}
+}

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/privateChanges/ClassA.kt.new

@@ -0,0 +1,6 @@
+package test
+
+public class ClassA {
+    public fun meth1() {}
+    private fun meth3() {}
+}

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

@@ -0,0 +1,7 @@
+package test;
+
+public class Usage {
+    public static void f() {
+        new ClassA().meth1();
+    }
+}

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

@@ -0,0 +1,11 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/ClassA.class
+End of files
+Compiling files:
+  src/ClassA.kt
+End of files
+Exit code: OK
+------------------------------------------

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/WillBeUnresolved.java

@@ -0,0 +1,5 @@
+class WillBeUnresolved {
+    void main() {
+        test.PropKt.getProp();
+    }
+}

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

@@ -0,0 +1,23 @@
+================ Step #1 =================
+
+Cleaning output files:
+  out/production/module/META-INF/module.kotlin_module
+  out/production/module/test/PropKt.class
+End of files
+Compiling files:
+  src/prop.kt
+End of files
+Exit code: OK
+------------------------------------------
+Cleaning output files:
+  out/production/module/WillBeUnresolved.class
+End of files
+Exit code: NOTHING_DONE
+------------------------------------------
+Compiling files:
+  src/WillBeUnresolved.java
+End of files
+COMPILATION FAILED
+cannot find symbol
+  symbol:   method getProp()
+  location: class test.PropKt

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt

@@ -0,0 +1,3 @@
+package test
+
+val prop = ":)"

jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/propertyRenamed/prop.kt.new

@@ -0,0 +1,3 @@
+package test
+
+val prop1 = ":)"