From e41e37932a37b074b22b62481365b3342d5cec63 Mon Sep 17 00:00:00 2001 From: Michael Bogdanov Date: Wed, 24 Sep 2014 18:35:51 +0400 Subject: [PATCH] Generate static backing fields for properties in object #KT-4973 Fixed Original commit: 5412a67d2991b2849c76fe7bd829c7074ed1b8f5 --- .../jet/jps/build/IncrementalJpsTestGenerated.java | 6 +++--- .../pureKotlin/objectConstantChanged/build.log | 14 ++++++++++++++ .../pureKotlin/objectConstantChanged/const.kt | 5 +++++ .../pureKotlin/objectConstantChanged/const.kt.new | 5 +++++ .../pureKotlin/objectConstantChanged/usage.kt | 4 ++++ .../pureKotlin/objectValChanged/build.log | 6 ------ .../pureKotlin/objectValChanged/const.kt | 6 ------ .../pureKotlin/objectValChanged/const.kt.new | 6 ------ .../pureKotlin/objectValChanged/usage.kt | 5 ----- 9 files changed, 31 insertions(+), 26 deletions(-) create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new create mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new delete mode 100644 jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt diff --git a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java index 657bdd96262..44089d4fe3b 100644 --- a/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java +++ b/jps/jps-plugin/test/org/jetbrains/jet/jps/build/IncrementalJpsTestGenerated.java @@ -201,9 +201,9 @@ public class IncrementalJpsTestGenerated extends AbstractIncrementalJpsTest { doTest(fileName); } - @TestMetadata("objectValChanged") - public void testObjectValChanged() throws Exception { - String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectValChanged/"); + @TestMetadata("objectConstantChanged") + public void testObjectConstantChanged() throws Exception { + String fileName = JetTestUtils.navigationMetadata("jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/"); doTest(fileName); } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log new file mode 100644 index 00000000000..14b397d0268 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/build.log @@ -0,0 +1,14 @@ +Cleaning output files: +out/production/module/test/Object.class +End of files +Compiling files: +src/const.kt +End of files +Cleaning output files: +out/production/module/test/Object.class +out/production/module/test/Usage.class +End of files +Compiling files: +src/const.kt +src/usage.kt +End of files \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt new file mode 100644 index 00000000000..13a01eb1ac1 --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt @@ -0,0 +1,5 @@ +package test + +object Object { + val CONST = "old" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new new file mode 100644 index 00000000000..d604ca1244f --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/const.kt.new @@ -0,0 +1,5 @@ +package test + +object Object { + val CONST = "new" +} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt new file mode 100644 index 00000000000..50ae79cf3fb --- /dev/null +++ b/jps/jps-plugin/testData/incremental/pureKotlin/objectConstantChanged/usage.kt @@ -0,0 +1,4 @@ +package test + +deprecated(Object.CONST + Object.CONST) +class Usage \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log deleted file mode 100644 index 06bb7395a25..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/build.log +++ /dev/null @@ -1,6 +0,0 @@ -Cleaning output files: -out/production/module/test/Object.class -End of files -Compiling files: -src/const.kt -End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt deleted file mode 100644 index 3f27946befb..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt +++ /dev/null @@ -1,6 +0,0 @@ -package test - -object Object { - // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined - val CONST = "old" -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new deleted file mode 100644 index 19580fc7c09..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/const.kt.new +++ /dev/null @@ -1,6 +0,0 @@ -package test - -object Object { - // Value is changed, but we don't care, it is not compile-time constant, and therefore can't be inlined - val CONST = "new" -} diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt b/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt deleted file mode 100644 index 581511cf244..00000000000 --- a/jps/jps-plugin/testData/incremental/pureKotlin/objectValChanged/usage.kt +++ /dev/null @@ -1,5 +0,0 @@ -package test - -fun main(args: Array) { - val x = Object.CONST + Object.CONST -} \ No newline at end of file