From ebb37aed1d0c85358ffb6440faf6111e1e2de123 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Fri, 6 Mar 2015 12:51:59 +0300 Subject: [PATCH] Replace 'class object' with 'default object' in renderers and test data Includes changes to decompiled text Old syntax is used in builtins and project code for now Original commit: 59f192ef900c2239649c3628d09c343264367a37 --- .../incremental/custom/kotlinConstantChangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt.new | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt.new | 2 +- .../incremental/pureKotlin/classObjectConstantChanged/const.kt | 2 +- .../pureKotlin/classObjectConstantChanged/const.kt.new | 2 +- .../testData/incremental/pureKotlin/constantsUnchanged/const.kt | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt.new | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt.new | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 8261acd68a1..3ce58ed9dc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new index 8261acd68a1..3ce58ed9dc9 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt.new @@ -3,7 +3,7 @@ package test val CONST = "foo" class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index 71c8e2eaa7c..dcbca7fe3a7 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt @@ -1,7 +1,7 @@ package test trait Trait { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new index 0ef22fbf6b8..926b500fbf0 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt.new @@ -1,7 +1,7 @@ package test trait Trait { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt index a3b30360e52..dceaef294f2 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "BF" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new index 8835b725265..bb50d7fc183 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { // Old and new constant values are different, but their hashes are the same val CONST = "Ae" } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new index b13ee1c3c3b..7f4d76ba88b 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/const.kt.new @@ -1,7 +1,7 @@ package test class Klass { - class object { + default object { val CONST = "bar" } }