diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt index 64c576e5a28..01f1c196df6 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/GenerateTests.kt @@ -813,6 +813,7 @@ fun main(args: Array) { model("incremental/multiModule", extension = null, excludeParentDirs = true) model("incremental/pureKotlin", extension = null, excludeParentDirs = true) model("incremental/withJava", extension = null, excludeParentDirs = true) + model("incremental/inlineFunCallSite", extension = null, excludeParentDirs = true) } testClass(javaClass()) { model("incremental/lookupTracker", extension = null, excludeParentDirs = true) diff --git a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java index 956059104c1..53dcf07793c 100644 --- a/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java +++ b/jps-plugin/test/org/jetbrains/kotlin/jps/build/IncrementalJpsTestGenerated.java @@ -305,12 +305,6 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("inlineToTopLevelVal") - public void testInlineToTopLevelVal() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/"); - doTest(fileName); - } - @TestMetadata("inlineTwoFunctionsOneChanged") public void testInlineTwoFunctionsOneChanged() throws Exception { String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/inlineTwoFunctionsOneChanged/"); @@ -750,4 +744,92 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { } } + + @TestMetadata("jps-plugin/testData/incremental/inlineFunCallSite") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class InlineFunCallSite extends AbstractIncrementalJpsTest { + public void testAllFilesPresentInInlineFunCallSite() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("jps-plugin/testData/incremental/inlineFunCallSite"), Pattern.compile("^([^\\.]+)$"), true); + } + + @TestMetadata("classProperty") + public void testClassProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/classProperty/"); + doTest(fileName); + } + + @TestMetadata("companionObjectProperty") + public void testCompanionObjectProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("function") + public void testFunction() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/function/"); + doTest(fileName); + } + + @TestMetadata("getter") + public void testGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/getter/"); + doTest(fileName); + } + + @TestMetadata("lambda") + public void testLambda() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/lambda/"); + doTest(fileName); + } + + @TestMetadata("localFun") + public void testLocalFun() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/localFun/"); + doTest(fileName); + } + + @TestMetadata("method") + public void testMethod() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/method/"); + doTest(fileName); + } + + @TestMetadata("parameterDefaultValue") + public void testParameterDefaultValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("primaryConstructorParameterDefaultValue") + public void testPrimaryConstructorParameterDefaultValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/"); + doTest(fileName); + } + + @TestMetadata("superCall") + public void testSuperCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/superCall/"); + doTest(fileName); + } + + @TestMetadata("thisCall") + public void testThisCall() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/thisCall/"); + doTest(fileName); + } + + @TestMetadata("topLevelObjectProperty") + public void testTopLevelObjectProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/"); + doTest(fileName); + } + + @TestMetadata("topLevelProperty") + public void testTopLevelProperty() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/"); + doTest(fileName); + } + + } } diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt new file mode 100644 index 00000000000..0e9fabbe7c9 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage { + val x = inline.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt rename to jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/inline.kt.new rename to jps-plugin/testData/incremental/inlineFunCallSite/classProperty/inline.kt.new diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/other.kt rename to jps-plugin/testData/incremental/inlineFunCallSite/classProperty/other.kt diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt new file mode 100644 index 00000000000..f628d09621e --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/Usage.kt @@ -0,0 +1,7 @@ +package usage + +class Usage { + companion object { + val x = inline.f() + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log new file mode 100644 index 00000000000..9c606a33ab8 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/build.log @@ -0,0 +1,15 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage$Companion.class +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/companionObjectProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log similarity index 54% rename from jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log rename to jps-plugin/testData/incremental/inlineFunCallSite/function/build.log index 5720130d7a4..c898540bf6a 100644 --- a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/build.log +++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/build.log @@ -1,14 +1,16 @@ Cleaning output files: -out/production/module/inline/InlinePackage$inline$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class out/production/module/inline/InlinePackage.class End of files Compiling files: src/inline.kt End of files Cleaning output files: -out/production/module/usage/UsagePackage$usage$*.class +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class out/production/module/usage/UsagePackage.class End of files Compiling files: src/usage.kt -End of files +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt new file mode 100644 index 00000000000..67356ea2553 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/function/usage.kt @@ -0,0 +1,5 @@ +package usage + +fun usage() { + val x = inline.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt new file mode 100644 index 00000000000..9ea5cdf8614 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/Usage.kt @@ -0,0 +1,6 @@ +package usage + +class Usage { + val x: Int + get() = inline.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log new file mode 100644 index 00000000000..2f1bb65b15e --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/build.log @@ -0,0 +1,18 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/TopLevelUsageKt.class +out/production/module/usage/Usage.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/Usage.kt +src/topLevelUsage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt new file mode 100644 index 00000000000..9d20c670526 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/getter/topLevelUsage.kt @@ -0,0 +1,4 @@ +package usage + +val y: Int + get() = inline.f() \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log new file mode 100644 index 00000000000..73c24d79a1d --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt$usage$use$1.class +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt new file mode 100644 index 00000000000..4a90efe14ec --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/lambda/usage.kt @@ -0,0 +1,6 @@ +package usage + +fun usage() { + val use = { inline.f() } + use() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log new file mode 100644 index 00000000000..e03d85b028e --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/build.log @@ -0,0 +1,17 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt$usage$1.class +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt new file mode 100644 index 00000000000..fd3041c6fb8 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/localFun/usage.kt @@ -0,0 +1,9 @@ +package usage + +fun usage() { + fun use() { + inline.f() + } + + use() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt new file mode 100644 index 00000000000..56dcd914697 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/Usage.kt @@ -0,0 +1,7 @@ +package usage + +class Usage { + fun use() { + val x = inline.f() + } +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/method/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log new file mode 100644 index 00000000000..c898540bf6a --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt new file mode 100644 index 00000000000..d321c08ca16 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/parameterDefaultValue/usage.kt @@ -0,0 +1,3 @@ +package usage + +fun usage(x: Int = inline.f()) {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt new file mode 100644 index 00000000000..cd3d8b3b67a --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/Usage.kt @@ -0,0 +1,3 @@ +package usage + +class Usage(val x: Int = inline.f()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/primaryConstructorParameterDefaultValue/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt new file mode 100644 index 00000000000..104a3571973 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/Usage.kt @@ -0,0 +1,3 @@ +package usage + +class Usage : UsageBase(inline.f()) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt new file mode 100644 index 00000000000..0febecdaee8 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/UsageBase.kt @@ -0,0 +1,3 @@ +package usage + +abstract class UsageBase(val x: Int) \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/superCall/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt new file mode 100644 index 00000000000..97ca7c60ca7 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/Usage.kt @@ -0,0 +1,5 @@ +package usage + +class Usage(val x: Int) { + constructor() : this(inline.f()) +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/thisCall/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt new file mode 100644 index 00000000000..5d0fdd64d4d --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/Usage.kt @@ -0,0 +1,5 @@ +package usage + +object Usage { + val x = inline.f() +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log new file mode 100644 index 00000000000..189cef9935f --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/usage/Usage.class +End of files +Compiling files: +src/Usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelObjectProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log new file mode 100644 index 00000000000..c898540bf6a --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/build.log @@ -0,0 +1,16 @@ +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/inline/InlineKt.class +out/production/module/inline/InlinePackage.class +End of files +Compiling files: +src/inline.kt +End of files +Cleaning output files: +out/production/module/META-INF/module.kotlin_module +out/production/module/usage/UsageKt.class +out/production/module/usage/UsagePackage.class +End of files +Compiling files: +src/usage.kt +End of files \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt new file mode 100644 index 00000000000..a242c7c7b32 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 0 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new new file mode 100644 index 00000000000..91d8140528c --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/inline.kt.new @@ -0,0 +1,5 @@ +package inline + +inline fun f(): Int { + return 1 +} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt new file mode 100644 index 00000000000..ba9f1988a49 --- /dev/null +++ b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/other.kt @@ -0,0 +1,3 @@ +package usage + +fun other() {} \ No newline at end of file diff --git a/jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt b/jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt similarity index 100% rename from jps-plugin/testData/incremental/pureKotlin/inlineToTopLevelVal/usage.kt rename to jps-plugin/testData/incremental/inlineFunCallSite/topLevelProperty/usage.kt