From 24f63e82e16374979cd62e79e70ab8bc11e52717 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Mon, 16 Mar 2015 14:56:06 +0300 Subject: [PATCH] default -> companion: replace all mentions of default and default object Original commit: 06916d98c6deacedcdbc341cd945a4bc7e2d231c --- .../custom/kotlinConstantChangedUsedInJava/build.log | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantChangedUsedInJava/const.kt.new | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/build.log | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt | 2 +- .../custom/kotlinConstantUnchangedUsedInJava/const.kt.new | 2 +- .../pureKotlin/classObjectConstantChanged/build.log | 4 ++-- .../pureKotlin/classObjectConstantChanged/const.kt | 2 +- .../pureKotlin/classObjectConstantChanged/const.kt.new | 2 +- .../incremental/pureKotlin/constantsUnchanged/build.log | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt | 2 +- .../incremental/pureKotlin/constantsUnchanged/const.kt.new | 2 +- .../pureKotlin/traitClassObjectConstantChanged/build.log | 4 ++-- .../pureKotlin/traitClassObjectConstantChanged/const.kt | 2 +- .../pureKotlin/traitClassObjectConstantChanged/const.kt.new | 2 +- .../javaUsedInKotlin/samConversions/methodAdded/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantChanged/build.log | 4 ++-- .../withJava/kotlinUsedInJava/constantChanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantChanged/const.kt.new | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/build.log | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt | 2 +- .../withJava/kotlinUsedInJava/constantUnchanged/const.kt.new | 2 +- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log index 687d949283e..29b384519d1 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantChangedUsedInJava/const.kt index dceaef294f2..4680ae2c26f 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 { - default object { + companion 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 bb50d7fc183..e9ccf1ab8db 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 { - default object { + companion 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/build.log b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log +++ b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: diff --git a/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt b/jps/jps-plugin/testData/incremental/custom/kotlinConstantUnchangedUsedInJava/const.kt index 7f4d76ba88b..7dd5eac1a73 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 { - default object { + companion 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 7f4d76ba88b..7dd5eac1a73 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 { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log index 1049b7f2a22..0a26a20ac94 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/build.log @@ -1,12 +1,12 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: src/const.kt End of files Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/classObjectConstantChanged/const.kt index dceaef294f2..4680ae2c26f 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 { - default object { + companion 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 bb50d7fc183..e9ccf1ab8db 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 { - default object { + companion 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/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log index cce56fbf9fd..9e65adcda6c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class out/production/module/test/TestPackage$const$*.class out/production/module/test/TestPackage.class diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/constantsUnchanged/const.kt index 3ce58ed9dc9..40bbe8de705 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 { - default object { + companion 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 3ce58ed9dc9..40bbe8de705 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 { - default object { + companion object { val CONST = "bar" } } diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log index 01ea0f084d3..673b3dfee4c 100644 --- a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/build.log @@ -1,6 +1,6 @@ Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class End of files Compiling files: @@ -8,7 +8,7 @@ src/const.kt End of files Cleaning output files: out/production/module/test/Trait$$TImpl.class -out/production/module/test/Trait$Default.class +out/production/module/test/Trait$Companion.class out/production/module/test/Trait.class out/production/module/test/Usage.class End of files diff --git a/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt b/jps/jps-plugin/testData/incremental/pureKotlin/traitClassObjectConstantChanged/const.kt index dcbca7fe3a7..073204a43e1 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 { - default object { + companion 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 926b500fbf0..86cc1439efd 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 { - default object { + companion 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/javaUsedInKotlin/samConversions/methodAdded/build.log b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log index 28ca5a5e406..d46aaad630c 100644 --- a/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/javaUsedInKotlin/samConversions/methodAdded/build.log @@ -18,6 +18,6 @@ src/usageWithFunctionLiteral.kt End of files COMPILATION FAILED Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object Expression 'SamInterface' cannot be invoked as a function. The function invoke() is not found -Please specify constructor invocation; classifier 'SamInterface' does not have a default object \ No newline at end of file +Please specify constructor invocation; classifier 'SamInterface' does not have a companion object \ No newline at end of file diff --git a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log index d7a173db691..e0426c17165 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantChanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: @@ -7,7 +7,7 @@ src/const.kt End of files Cleaning output files: out/production/module/Usage.class -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: 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 dceaef294f2..4680ae2c26f 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 { - default object { + companion 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 bb50d7fc183..e9ccf1ab8db 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 { - default object { + companion 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/build.log b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log index 6bc3a50bee0..8dfe7647a28 100644 --- a/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log +++ b/jps/jps-plugin/testData/incremental/withJava/kotlinUsedInJava/constantUnchanged/build.log @@ -1,5 +1,5 @@ Cleaning output files: -out/production/module/test/Klass$Default.class +out/production/module/test/Klass$Companion.class out/production/module/test/Klass.class End of files Compiling files: 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 7f4d76ba88b..7dd5eac1a73 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 { - default object { + companion 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 7f4d76ba88b..7dd5eac1a73 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 { - default object { + companion object { val CONST = "bar" } }