diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java index 4daade82888..c8b4fab5886 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/ExperimentalIncrementalJpsTestGenerated.java @@ -443,6 +443,18 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlineClassValProperty") + public void testInlineClassValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineClassVarProperty") + public void testInlineClassVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -479,6 +491,30 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValProperty") + public void testInlineTopLevelValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelVarProperty") + public void testInlineTopLevelVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -845,6 +881,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -857,6 +899,12 @@ public class ExperimentalIncrementalJpsTestGenerated extends AbstractExperimenta doTest(fileName); } + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); diff --git a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index bcc80c08637..cd72810ef37 100644 --- a/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/jps-tests/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -443,6 +443,18 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineClassValProperty") + public void testInlineClassValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineClassVarProperty") + public void testInlineClassVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineFunctionRemoved") public void testInlineFunctionRemoved() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineFunctionRemoved/"); @@ -479,6 +491,30 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("inlineTopLevelFunctionWithJvmName") + public void testInlineTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValProperty") + public void testInlineTopLevelValProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelValPropertyWithJvmName") + public void testInlineTopLevelValPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/"); + doTest(fileName); + } + + @TestMetadata("inlineTopLevelVarProperty") + public void testInlineTopLevelVarProperty() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/"); + doTest(fileName); + } + @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -845,6 +881,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("topLevelFunctionWithJvmName") + public void testTopLevelFunctionWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/"); + doTest(fileName); + } + @TestMetadata("topLevelMembersInTwoFiles") public void testTopLevelMembersInTwoFiles() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelMembersInTwoFiles/"); @@ -857,6 +899,12 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } + @TestMetadata("topLevelPropertyWithJvmName") + public void testTopLevelPropertyWithJvmName() throws Exception { + String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/"); + doTest(fileName); + } + @TestMetadata("traitClassObjectConstantChanged") public void testTraitClassObjectConstantChanged() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/"); diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt new file mode 100644 index 00000000000..dc4eb09fea5 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage { + val x = inline.A().f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log new file mode 100644 index 00000000000..eb7f0e8375e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/inline/A.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/Usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/usage/Usage.class +End of files +Compiling files: + src/Usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt new file mode 100644 index 00000000000..bdf6a30ec34 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt @@ -0,0 +1,6 @@ +package inline + +class A { + inline val f: Int + get() = 0 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new new file mode 100644 index 00000000000..e3476a57ae1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassValProperty/inline.kt.new @@ -0,0 +1,6 @@ +package inline + +class A { + inline val f: Int + get() = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log new file mode 100644 index 00000000000..12ab1564d06 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/build.log @@ -0,0 +1,21 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/inline/A.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt new file mode 100644 index 00000000000..f5e8fa6a4b1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt @@ -0,0 +1,9 @@ +package inline + +class A { + inline var f: Int + get() = 0 + set(p: Int) { + 0 + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new new file mode 100644 index 00000000000..05b3f2c0365 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/inline.kt.new @@ -0,0 +1,9 @@ +package inline + +class A { + inline var f: Int + get() = 0 + set(p: Int) { + 1 + } +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt new file mode 100644 index 00000000000..131c1a19732 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun a() { + inline.A().f = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt new file mode 100644 index 00000000000..1043725e397 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineClassVarProperty/usageNotChanged.kt @@ -0,0 +1,5 @@ +package usage2 + +fun b() { + inline.A().f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt new file mode 100644 index 00000000000..dbc194da3a1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt @@ -0,0 +1,3 @@ +package inline + + @JvmName("test") inline fun g() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new new file mode 100644 index 00000000000..a7cdecaf3fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/inline.kt.new @@ -0,0 +1,3 @@ +package inline + +@JvmName("test") inline fun g() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt new file mode 100644 index 00000000000..abd575668fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelFunctionWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.g() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt new file mode 100644 index 00000000000..511d4f1d576 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new new file mode 100644 index 00000000000..033295b3f34 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/inline.kt.new @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + get() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt new file mode 100644 index 00000000000..b11c96eea3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValProperty/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt new file mode 100644 index 00000000000..ced1160f719 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + @JvmName("getG") get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new new file mode 100644 index 00000000000..7fe7e429c94 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/inline.kt.new @@ -0,0 +1,4 @@ +package inline + +inline val f: Int + @JvmName("getG") get() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt new file mode 100644 index 00000000000..b11c96eea3d --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelValPropertyWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.f \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log new file mode 100644 index 00000000000..98c5e9ece93 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/InlineKt.class +End of files +Compiling files: + src/inline.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt new file mode 100644 index 00000000000..e345852dbb9 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline var f: Int + get() = 0 + set(p: Int) {0} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new new file mode 100644 index 00000000000..bf8d995196a --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline var f: Int + get() = 0 + set(p: Int) { 1 } \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt new file mode 100644 index 00000000000..8f373aa1881 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun a() { + inline.f = 1 +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt new file mode 100644 index 00000000000..418b02b95f0 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/inlineTopLevelVarProperty/usageNotChanged.kt @@ -0,0 +1,5 @@ +package usage2 + +fun b() { + inline.f +} \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log new file mode 100644 index 00000000000..1462c579df1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/FunctionKt.class +End of files +Compiling files: + src/function.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log new file mode 100644 index 00000000000..cce51e9e605 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/inline/FunctionKt.class +End of files +Compiling files: + src/function.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt new file mode 100644 index 00000000000..b548d641698 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt @@ -0,0 +1,3 @@ +package inline + +@JvmName("oldName") fun g() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new new file mode 100644 index 00000000000..1f04d228c28 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/function.kt.new @@ -0,0 +1,3 @@ +package inline + +@JvmName("newName") fun g() = 1 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt new file mode 100644 index 00000000000..abd575668fd --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelFunctionWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = inline.g() \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log new file mode 100644 index 00000000000..980c6527681 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/build.log @@ -0,0 +1,20 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PropertyKt.class +End of files +Compiling files: + src/property.kt +End of files +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log new file mode 100644 index 00000000000..c9ee99392d6 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/experimental-ic-build.log @@ -0,0 +1,22 @@ +================ Step #1 ================= + +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/test/PropertyKt.class +End of files +Compiling files: + src/property.kt +End of files +Marked as dirty by Kotlin: + src/usage.kt +Exit code: ADDITIONAL_PASS_REQUIRED +------------------------------------------ +Cleaning output files: + out/production/module/META-INF/module.kotlin_module + out/production/module/usage/UsageKt.class +End of files +Compiling files: + src/usage.kt +End of files +Exit code: OK +------------------------------------------ \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt new file mode 100644 index 00000000000..da702f5f509 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt @@ -0,0 +1,4 @@ +package test + +val g: Int + @JvmName("oldName") get() = 0 diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new new file mode 100644 index 00000000000..39bbfb29c7e --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/property.kt.new @@ -0,0 +1,4 @@ +package test + +val g: Int + @JvmName("newName") get() = 0 \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt new file mode 100644 index 00000000000..06dfeea7c86 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/topLevelPropertyWithJvmName/usage.kt @@ -0,0 +1,3 @@ +package usage + +val x = test.g \ No newline at end of file