From b152211096693781438901eebd6a174834cad1ba Mon Sep 17 00:00:00 2001 From: Stanislav Erokhin Date: Wed, 1 Apr 2015 05:21:26 +0300 Subject: [PATCH] Added init keyword to testdata --- .../box/classes/classObjectAsStaticInitializer.kt | 2 +- .../testData/codegen/box/classes/initializerBlock.kt | 2 +- .../codegen/box/classes/initializerBlockDImpl.kt | 2 +- compiler/testData/codegen/box/classes/kt2384.kt | 2 +- compiler/testData/codegen/box/classes/kt501.kt | 2 +- .../codegen/box/closures/closureInsideConstrucor.kt | 2 +- compiler/testData/codegen/box/closures/kt3738.kt | 2 +- .../localFunctions/localFunctionInConstructor.kt | 2 +- .../box/localClasses/anonymousObjectInInitializer.kt | 2 +- .../box/localClasses/localClassInInitializer.kt | 2 +- compiler/testData/codegen/box/objects/kt1136.kt | 4 ++-- compiler/testData/codegen/box/objects/kt2663.kt | 2 +- compiler/testData/codegen/box/objects/kt535.kt | 2 +- compiler/testData/codegen/box/objects/kt640.kt | 2 +- .../objects/localFunctionInObjectInitializer_kt4516.kt | 2 +- compiler/testData/codegen/box/properties/kt1159.kt | 2 +- compiler/testData/codegen/box/properties/kt4252.kt | 2 +- compiler/testData/codegen/box/properties/kt4252_2.kt | 2 +- .../box/staticFields/anonymousInitializerIObject.kt | 2 +- .../staticFields/anonymousInitializerInClassObject.kt | 2 +- compiler/testData/codegen/box/super/kt4982.kt | 2 +- compiler/testData/codegen/box/typeInfo/kt511.kt | 4 ++-- .../function/local/constructorWithInitializer.kt | 2 +- .../enclosing/lambdaInLocalClassConstructor.kt | 2 +- .../reflection/enclosing/lambdaInObjectExpression.kt | 2 +- .../boxWithStdlib/synthetic/syntheticAccessorNames.kt | 2 +- compiler/testData/codegen/bytecodeText/kt3845.kt | 2 +- .../function/classObjectPrivate/privateFun.kt | 2 +- .../function/classObjectPrivate/privateVal.kt | 2 +- .../function/classObjectPrivate/privateVar.kt | 2 +- .../org/jetbrains/kotlin/codegen/MethodOrderTest.kt | 2 +- .../org/jetbrains/kotlin/codegen/PackageGenTest.java | 2 +- .../tests/generateTestDataForReservedWords.kt | 2 +- idea/testData/debugger/positionManager/classObject.kt | 2 +- .../multipleBreakpoints/withoutBodyProperties.kt | 2 +- .../tinyApp/src/filters/doNotSkipConstructors.kt | 2 +- .../debugger/tinyApp/src/filters/skipConstructors.kt | 2 +- idea/testData/highlighter/Variables.kt | 2 +- .../parameter/afterInClassInitializer.kt | 2 +- .../parameter/beforeInClassInitializer.kt | 2 +- .../variables/changeToBackingField/afterBFRequired.kt | 2 +- .../variables/changeToBackingField/afterKt510.kt | 2 +- .../variables/changeToBackingField/beforeBFRequired.kt | 2 +- .../variables/changeToBackingField/beforeKt510.kt | 2 +- .../equivalence/expressions/calls/bothReceivers.kt | 2 +- .../unifier/equivalence/expressions/conventions/inc.kt | 2 +- .../function/cases/constructorsWithArgs.kt | 4 ++-- .../testData/classObject/cases/accessing.kt | 2 +- ...closureLocalFunctionByInnerFunctionInConstructor.kt | 2 +- .../delegation/cases/delegationEvaluationOrder1.kt | 6 +++--- .../delegation/cases/delegationEvaluationOrder2.kt | 8 ++++---- .../testData/enum/cases/enumWithInheritance.kt | 2 +- .../testData/examples/cases/initializerBlock.kt | 2 +- .../testData/expression/misc/cases/KT-740.kt | 2 +- .../expression/misc/cases/classWithoutPackage.kt | 2 +- .../expression/misc/cases/funInConstructorBlock.kt | 2 +- .../testData/inheritance/cases/baseCallOrder.kt | 2 +- .../inheritance/cases/complexInitializationOrder.kt | 10 +++++----- .../testData/inheritance/cases/definitionOrder.kt | 10 +++++----- .../testData/inheritance/cases/initializationOrder.kt | 6 +++--- .../testData/initialize/cases/classInitializer.kt | 2 +- .../propertyAccess/cases/classUsesPackageProperties.kt | 2 +- .../propertyAccess/cases/initValInConstructor.kt | 4 ++-- .../cases/initOverrideInConstructor.kt | 2 +- .../cases/initOverrideInConstructorComplex.kt | 4 ++-- .../cases/initOverrideInConstructorExplicitThis.kt | 2 +- .../cases/initOverrideVarInConstructor.kt | 2 +- .../testData/reservedWords/cases/dataClassParamIf.kt | 2 +- .../testData/reservedWords/cases/dataClassParamIn.kt | 2 +- .../testData/reservedWords/cases/dataClassParamWith.kt | 2 +- .../reservedWords/cases/dataClassParamYield.kt | 2 +- .../testData/reservedWords/cases/dataClassValDo.kt | 2 +- .../testData/reservedWords/cases/dataClassValElse.kt | 2 +- .../testData/reservedWords/cases/dataClassValSwitch.kt | 2 +- .../testData/reservedWords/cases/dataClassValTypeof.kt | 2 +- .../testData/reservedWords/cases/dataClassVarFalse.kt | 2 +- .../testData/reservedWords/cases/dataClassVarFor.kt | 2 +- .../reservedWords/cases/dataClassVarUndefined.kt | 2 +- .../testData/reservedWords/cases/dataClassVarVoid.kt | 2 +- .../testData/simple/cases/simpleInitializer.kt | 2 +- .../testData/trait/cases/definitionOrder.kt | 10 +++++----- .../testData/webDemoCanvasExamples/cases/Creatures.kt | 4 ++-- .../webDemoCanvasExamples/cases/Hello, Kotlin.kt | 2 +- .../webDemoCanvasExamples/cases/Traffic light.kt | 4 ++-- .../testData/webDemoExamples2/cases/life.kt | 2 +- .../testData/codegen/bytecodeShape/simple/simple.kt | 2 +- .../bytecodeShape/simpleFragment/simpleFragment.kt | 2 +- .../codegen/bytecodeShape/simpleView/simpleView.kt | 2 +- 88 files changed, 114 insertions(+), 114 deletions(-) diff --git a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt index 5b19fef6a5f..d9175424f8e 100644 --- a/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt +++ b/compiler/testData/codegen/box/classes/classObjectAsStaticInitializer.kt @@ -2,7 +2,7 @@ var global = 0; class C { companion object { - { + init { global = 1; } } diff --git a/compiler/testData/codegen/box/classes/initializerBlock.kt b/compiler/testData/codegen/box/classes/initializerBlock.kt index c89deeda87d..5aa7aa1e3c0 100644 --- a/compiler/testData/codegen/box/classes/initializerBlock.kt +++ b/compiler/testData/codegen/box/classes/initializerBlock.kt @@ -1,7 +1,7 @@ class C() { public var f: Int - { + init { $f = 610 } } diff --git a/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt b/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt index f018e7e5030..47cd1553ed5 100644 --- a/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt +++ b/compiler/testData/codegen/box/classes/initializerBlockDImpl.kt @@ -5,7 +5,7 @@ class World() { public val items: ArrayList = ArrayList() inner class Item() { - { + init { items.add(this) } } diff --git a/compiler/testData/codegen/box/classes/kt2384.kt b/compiler/testData/codegen/box/classes/kt2384.kt index 67b1df3973e..d990d4cbc00 100644 --- a/compiler/testData/codegen/box/classes/kt2384.kt +++ b/compiler/testData/codegen/box/classes/kt2384.kt @@ -3,7 +3,7 @@ class A { val b = 0 val c = b - { + init { val d = b } } diff --git a/compiler/testData/codegen/box/classes/kt501.kt b/compiler/testData/codegen/box/classes/kt501.kt index ef6c092cedb..e9015d8d69f 100644 --- a/compiler/testData/codegen/box/classes/kt501.kt +++ b/compiler/testData/codegen/box/classes/kt501.kt @@ -1,5 +1,5 @@ class Reluctant() { - { + init { throw Exception("I'm not coming out") } } diff --git a/compiler/testData/codegen/box/closures/closureInsideConstrucor.kt b/compiler/testData/codegen/box/closures/closureInsideConstrucor.kt index fd99329f1ca..38192dd47b0 100644 --- a/compiler/testData/codegen/box/closures/closureInsideConstrucor.kt +++ b/compiler/testData/codegen/box/closures/closureInsideConstrucor.kt @@ -1,7 +1,7 @@ //adopted snippet from kdoc open class KModel { val sourcesInfo: String - ;{ + init { fun relativePath(psiFile: String): String { return psiFile; } diff --git a/compiler/testData/codegen/box/closures/kt3738.kt b/compiler/testData/codegen/box/closures/kt3738.kt index 04fc2661147..a05dbde0ae1 100644 --- a/compiler/testData/codegen/box/closures/kt3738.kt +++ b/compiler/testData/codegen/box/closures/kt3738.kt @@ -5,7 +5,7 @@ class A { class B { class D { - { + init { A().bar { this.foo() } diff --git a/compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt b/compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt index 34789b96480..5f294911561 100644 --- a/compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt +++ b/compiler/testData/codegen/box/functions/localFunctions/localFunctionInConstructor.kt @@ -1,7 +1,7 @@ class Test { val property:Int - ;{ + init { fun local():Int { return 10; } diff --git a/compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt b/compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt index 632670b783b..ef9b826ff07 100644 --- a/compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt +++ b/compiler/testData/codegen/box/localClasses/anonymousObjectInInitializer.kt @@ -1,7 +1,7 @@ class A { var a: String = "Fail" - { + init { a = object { override fun toString(): String = "OK" }.toString() diff --git a/compiler/testData/codegen/box/localClasses/localClassInInitializer.kt b/compiler/testData/codegen/box/localClasses/localClassInInitializer.kt index f50e52be630..0dafae38048 100644 --- a/compiler/testData/codegen/box/localClasses/localClassInInitializer.kt +++ b/compiler/testData/codegen/box/localClasses/localClassInInitializer.kt @@ -1,7 +1,7 @@ class A { var a: String = "Fail" - { + init { open class B() { open fun s() : String = "O" } diff --git a/compiler/testData/codegen/box/objects/kt1136.kt b/compiler/testData/codegen/box/objects/kt1136.kt index e108facf9fd..9b15a2b1133 100644 --- a/compiler/testData/codegen/box/objects/kt1136.kt +++ b/compiler/testData/codegen/box/objects/kt1136.kt @@ -7,7 +7,7 @@ public object SomeObject { } } - { + init { workerThread.start() } @@ -35,7 +35,7 @@ public class SomeClass() { } } - { + init { workerThread.start() workerThread.join() } diff --git a/compiler/testData/codegen/box/objects/kt2663.kt b/compiler/testData/codegen/box/objects/kt2663.kt index e21643c26ce..b7dad56133f 100644 --- a/compiler/testData/codegen/box/objects/kt2663.kt +++ b/compiler/testData/codegen/box/objects/kt2663.kt @@ -2,7 +2,7 @@ fun box() : String { var a = 1 object { - { + init { a = 2 } } diff --git a/compiler/testData/codegen/box/objects/kt535.kt b/compiler/testData/codegen/box/objects/kt535.kt index 97a18485384..b36b61f88ec 100644 --- a/compiler/testData/codegen/box/objects/kt535.kt +++ b/compiler/testData/codegen/box/objects/kt535.kt @@ -9,7 +9,7 @@ class Identifier(t : T?, myHasDollar : Boolean) { return __ } } - { + init { $myT = t } } diff --git a/compiler/testData/codegen/box/objects/kt640.kt b/compiler/testData/codegen/box/objects/kt640.kt index dba2c75f913..5387916f161 100644 --- a/compiler/testData/codegen/box/objects/kt640.kt +++ b/compiler/testData/codegen/box/objects/kt640.kt @@ -5,7 +5,7 @@ public open class Identifier(myName : T?, myHasDollar : Boolean) { private var myHasDollar : Boolean private var myNullable : Boolean = true - { + init { $myName = myName $myHasDollar = myHasDollar } diff --git a/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt b/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt index 1b2d80b876f..2a91e67bd22 100644 --- a/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt +++ b/compiler/testData/codegen/box/objects/localFunctionInObjectInitializer_kt4516.kt @@ -3,7 +3,7 @@ import java.util.HashMap object O { val mmmap = HashMap(); - { + init { fun doStuff() { mmmap.put("two", 2) } diff --git a/compiler/testData/codegen/box/properties/kt1159.kt b/compiler/testData/codegen/box/properties/kt1159.kt index 67fb822baeb..35f70f4d784 100644 --- a/compiler/testData/codegen/box/properties/kt1159.kt +++ b/compiler/testData/codegen/box/properties/kt1159.kt @@ -5,7 +5,7 @@ public object RefreshQueue { } }); - { + init { workerThread.start() } } diff --git a/compiler/testData/codegen/box/properties/kt4252.kt b/compiler/testData/codegen/box/properties/kt4252.kt index 2df15e1e331..2780832a23c 100644 --- a/compiler/testData/codegen/box/properties/kt4252.kt +++ b/compiler/testData/codegen/box/properties/kt4252.kt @@ -6,7 +6,7 @@ public class Foo private var bar = 0 } - { + init { ++bar } diff --git a/compiler/testData/codegen/box/properties/kt4252_2.kt b/compiler/testData/codegen/box/properties/kt4252_2.kt index f6271ec39d9..c86578a72ce 100644 --- a/compiler/testData/codegen/box/properties/kt4252_2.kt +++ b/compiler/testData/codegen/box/properties/kt4252_2.kt @@ -9,7 +9,7 @@ class Foo() { val c: String var d: String - { + init { c = bar d = Foo.bar boo = "O" diff --git a/compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt b/compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt index 79f6112d402..72aa88ec05b 100644 --- a/compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt +++ b/compiler/testData/codegen/box/staticFields/anonymousInitializerIObject.kt @@ -1,7 +1,7 @@ object Foo { val bar: String - { + init { bar = "OK" } } diff --git a/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt b/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt index 38fd75f040f..3b3559b2895 100644 --- a/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt +++ b/compiler/testData/codegen/box/staticFields/anonymousInitializerInClassObject.kt @@ -2,7 +2,7 @@ class Foo { companion object { val bar: String - { + init { bar = "OK" } } diff --git a/compiler/testData/codegen/box/super/kt4982.kt b/compiler/testData/codegen/box/super/kt4982.kt index ee67309c429..73b7df5c660 100644 --- a/compiler/testData/codegen/box/super/kt4982.kt +++ b/compiler/testData/codegen/box/super/kt4982.kt @@ -1,5 +1,5 @@ abstract class WaitFor { - { + init { condition() } diff --git a/compiler/testData/codegen/box/typeInfo/kt511.kt b/compiler/testData/codegen/box/typeInfo/kt511.kt index 0fe6d87cc32..ce4e802ff6b 100644 --- a/compiler/testData/codegen/box/typeInfo/kt511.kt +++ b/compiler/testData/codegen/box/typeInfo/kt511.kt @@ -2,13 +2,13 @@ package one_extends_base open class Base(name : T?) { var myName : T? - { + init { $myName = name } } open class One(name : T?, second : K?) : Base(name) { var mySecond : K? - { + init { $mySecond = second } } diff --git a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt index fd37b2b28d8..0e8c0a25839 100644 --- a/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt +++ b/compiler/testData/codegen/boxWithStdlib/callableReference/function/local/constructorWithInitializer.kt @@ -1,7 +1,7 @@ fun box(): String { class A { var result: String = "Fail"; - { + init { result = "OK" } } diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt index b67711c1198..067c35f3822 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInLocalClassConstructor.kt @@ -4,7 +4,7 @@ fun box(): String { class L : C() { val a: Any - { + init { a = {} } } diff --git a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt index f5ec547b225..dc13bfe9571 100644 --- a/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt +++ b/compiler/testData/codegen/boxWithStdlib/reflection/enclosing/lambdaInObjectExpression.kt @@ -6,7 +6,7 @@ fun box(): String { val l = object : C { override val a: Any - { + init { a = {} } } diff --git a/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt b/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt index 612c68b7a68..f7499261bb1 100644 --- a/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt +++ b/compiler/testData/codegen/boxWithStdlib/synthetic/syntheticAccessorNames.kt @@ -15,7 +15,7 @@ class PrivatePropertyGet { class PrivatePropertySet { private var x = "a" - inner class Inner { { x = "b" } } + inner class Inner { init { x = "b" } } } class PrivateMethod { diff --git a/compiler/testData/codegen/bytecodeText/kt3845.kt b/compiler/testData/codegen/bytecodeText/kt3845.kt index d08211d8575..be2bdbaf62d 100644 --- a/compiler/testData/codegen/bytecodeText/kt3845.kt +++ b/compiler/testData/codegen/bytecodeText/kt3845.kt @@ -23,7 +23,7 @@ class Example private set - { + init { a1 = 1 a2 = 1 a3 = 1 diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt index 7db0e803903..bea70783b95 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateFun.kt @@ -1,6 +1,6 @@ class Foo { - {Foo.test()} + init {Foo.test()} companion object { private fun test() { diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt index 19cc387a84e..63a3331c8ac 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateVal.kt @@ -1,6 +1,6 @@ class Foo { - {Foo.test} + init {Foo.test} companion object { private val test = "String" diff --git a/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt b/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt index a22eefa5b65..729f2eca67f 100644 --- a/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt +++ b/compiler/testData/writeFlags/function/classObjectPrivate/privateVar.kt @@ -1,6 +1,6 @@ class Foo { - {Foo.test} + init {Foo.test} companion object { private var test = "String" diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt index e9a5a7558cd..aa959b67bb4 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt +++ b/compiler/tests/org/jetbrains/kotlin/codegen/MethodOrderTest.kt @@ -88,7 +88,7 @@ public class MethodOrderTest: CodegenTestCase() { } inner class Inner() { - { + init { b = b + a c() } diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java index a82019c6c5f..ce54741490c 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/PackageGenTest.java @@ -388,7 +388,7 @@ public class PackageGenTest extends CodegenTestCase { } public void testPutBooleanAsVoid() throws Exception { - loadText("class C(val x: Int) { { x > 0 } } fun box() { val c = C(0) } "); + loadText("class C(val x: Int) { init { x > 0 } } fun box() { val c = C(0) } "); Method main = generateFunction(); main.invoke(null); // must not fail } diff --git a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt index 31e5f9659df..b0118856cc4 100644 --- a/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt +++ b/generators/src/org/jetbrains/kotlin/generators/tests/generateTestDataForReservedWords.kt @@ -142,7 +142,7 @@ fun box(): String { suite("dataClass", """ data class DataClass($DEFINITION_MARKER: String) { - { + init { $TEST_BLOCK_MARKER } } diff --git a/idea/testData/debugger/positionManager/classObject.kt b/idea/testData/debugger/positionManager/classObject.kt index 33c62ae8708..12fa25440b8 100644 --- a/idea/testData/debugger/positionManager/classObject.kt +++ b/idea/testData/debugger/positionManager/classObject.kt @@ -1,7 +1,7 @@ class A { companion object { - { + init { 1 + 1 // A val a = 1 // A fun foo() { diff --git a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt index 09ef542cb32..28cfcfad581 100644 --- a/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt +++ b/idea/testData/debugger/tinyApp/src/evaluate/multipleBreakpoints/withoutBodyProperties.kt @@ -18,7 +18,7 @@ var aDelegate: Int by Delegates.notNull() val aLambda = { 1 + 1 } class A { - { + init { // EXPRESSION: i // RESULT: 1: I diff --git a/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt b/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt index 2dc96ad1e81..958f3a17904 100644 --- a/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt +++ b/idea/testData/debugger/tinyApp/src/filters/doNotSkipConstructors.kt @@ -7,7 +7,7 @@ fun main(args: Array) { } class A { - { + init { val a = 1 } } diff --git a/idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt b/idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt index 439c3cfeb94..c98b29e0629 100644 --- a/idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt +++ b/idea/testData/debugger/tinyApp/src/filters/skipConstructors.kt @@ -7,7 +7,7 @@ fun main(args: Array) { } class A { - { + init { val a = 1 } } diff --git a/idea/testData/highlighter/Variables.kt b/idea/testData/highlighter/Variables.kt index dc985c3af94..fde4f8b9dcf 100644 --- a/idea/testData/highlighter/Variables.kt +++ b/idea/testData/highlighter/Variables.kt @@ -11,7 +11,7 @@ val Foo(val a : Int, b : String) { - { + init { b } diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt index 4f7ca04238a..03c7c80e178 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/afterInClassInitializer.kt @@ -1,7 +1,7 @@ // "Create parameter 'foo'" "true" class A(foo: Int) { - { + init { val t: Int = foo } } \ No newline at end of file diff --git a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt index a8134e0f55f..a5d1b6063c5 100644 --- a/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt +++ b/idea/testData/quickfix/createFromUsage/createVariable/parameter/beforeInClassInitializer.kt @@ -1,7 +1,7 @@ // "Create parameter 'foo'" "true" class A { - { + init { val t: Int = foo } } \ No newline at end of file diff --git a/idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt b/idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt index 87c441a372c..2ceced11a7b 100644 --- a/idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt +++ b/idea/testData/quickfix/variables/changeToBackingField/afterBFRequired.kt @@ -2,7 +2,7 @@ class A() { var a : Int set(v) {} - { + init { $a = 1 } } \ No newline at end of file diff --git a/idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt b/idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt index 5ce1e112210..a43c6b01824 100644 --- a/idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt +++ b/idea/testData/quickfix/variables/changeToBackingField/afterKt510.kt @@ -2,7 +2,7 @@ public open class Identifier() { var field : Boolean set(v) {} - { + init { this.$field = false; } } \ No newline at end of file diff --git a/idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt b/idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt index 48fdd186232..2d848e9c758 100644 --- a/idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt +++ b/idea/testData/quickfix/variables/changeToBackingField/beforeBFRequired.kt @@ -2,7 +2,7 @@ class A() { var a : Int set(v) {} - { + init { a = 1 } } \ No newline at end of file diff --git a/idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt b/idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt index ad1ef0139cd..5c5780fe6f8 100644 --- a/idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt +++ b/idea/testData/quickfix/variables/changeToBackingField/beforeKt510.kt @@ -2,7 +2,7 @@ public open class Identifier() { var field : Boolean set(v) {} - { + init { this.field = false; } } \ No newline at end of file diff --git a/idea/testData/unifier/equivalence/expressions/calls/bothReceivers.kt b/idea/testData/unifier/equivalence/expressions/calls/bothReceivers.kt index 6af4b5f888d..799281857f2 100644 --- a/idea/testData/unifier/equivalence/expressions/calls/bothReceivers.kt +++ b/idea/testData/unifier/equivalence/expressions/calls/bothReceivers.kt @@ -1,5 +1,5 @@ class Bar { - { + init { Foo()() } } diff --git a/idea/testData/unifier/equivalence/expressions/conventions/inc.kt b/idea/testData/unifier/equivalence/expressions/conventions/inc.kt index 46f5aea16a1..37e8876bf45 100644 --- a/idea/testData/unifier/equivalence/expressions/conventions/inc.kt +++ b/idea/testData/unifier/equivalence/expressions/conventions/inc.kt @@ -1,7 +1,7 @@ fun String.inc() = this + "+" class Foo { - { + init { var s = "" s++ s.inc() diff --git a/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt b/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt index b50439dafc2..7e828bb6186 100644 --- a/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt +++ b/js/js.translator/testData/callableReference/function/cases/constructorsWithArgs.kt @@ -2,14 +2,14 @@ package foo class A(val x:Int) { var s = "sA" - { + init { s += ":init:" + x } } class B(val arg1:String, val arg2:String) { var msg = "" - { + init { msg = arg1 + arg2 } } diff --git a/js/js.translator/testData/classObject/cases/accessing.kt b/js/js.translator/testData/classObject/cases/accessing.kt index a6b43e4ceba..45e85f62738 100644 --- a/js/js.translator/testData/classObject/cases/accessing.kt +++ b/js/js.translator/testData/classObject/cases/accessing.kt @@ -25,7 +25,7 @@ class Foo() { val e: String val f: String - { + init { e = bar f = Foo.bar boo = "O" diff --git a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt index eb83c4dcde5..c631443b260 100644 --- a/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt +++ b/js/js.translator/testData/closure/cases/closureLocalFunctionByInnerFunctionInConstructor.kt @@ -3,7 +3,7 @@ package foo class Foo { val OK = "OK"; var result: String = "" - { + init { fun bar(s: String? = null) { if (s != null) { result = s diff --git a/js/js.translator/testData/delegation/cases/delegationEvaluationOrder1.kt b/js/js.translator/testData/delegation/cases/delegationEvaluationOrder1.kt index 263fe58e750..4142f3eb395 100644 --- a/js/js.translator/testData/delegation/cases/delegationEvaluationOrder1.kt +++ b/js/js.translator/testData/delegation/cases/delegationEvaluationOrder1.kt @@ -11,7 +11,7 @@ class BaseImpl(val s: String) : Base { var global = "" open class DerivedBase() { - { + init { global += ":DerivedBase" } } @@ -22,13 +22,13 @@ fun newBase(): Base { } class Derived() : DerivedBase(), Base by newBase() { - { + init { global += ":Derived" } } class Derived1() : Base by newBase(), DerivedBase() { - { + init { global += ":Derived" } } diff --git a/js/js.translator/testData/delegation/cases/delegationEvaluationOrder2.kt b/js/js.translator/testData/delegation/cases/delegationEvaluationOrder2.kt index e122d87effa..915c9ea1afd 100644 --- a/js/js.translator/testData/delegation/cases/delegationEvaluationOrder2.kt +++ b/js/js.translator/testData/delegation/cases/delegationEvaluationOrder2.kt @@ -19,7 +19,7 @@ class Base2Impl(val s: String) : Base2 { var global = "" open class DerivedBase() { - { + init { global += ":DerivedBase" } } @@ -35,19 +35,19 @@ fun newBase2(): Base2 { } class Derived() : DerivedBase(), Base by newBase(), Base2 by newBase2() { - { + init { global += ":Derived" } } class Derived1() : Base by newBase(), DerivedBase(), Base2 by newBase2() { - { + init { global += ":Derived" } } class Derived2() : Base by newBase(), Base2 by newBase2(), DerivedBase() { - { + init { global += ":Derived" } } diff --git a/js/js.translator/testData/enum/cases/enumWithInheritance.kt b/js/js.translator/testData/enum/cases/enumWithInheritance.kt index e4327693400..9c29ae94923 100644 --- a/js/js.translator/testData/enum/cases/enumWithInheritance.kt +++ b/js/js.translator/testData/enum/cases/enumWithInheritance.kt @@ -5,7 +5,7 @@ enum class B(open val bar: Int) { var y = 12; a : B(0) { override val bar = 3 - { + init { y = 0 } } diff --git a/js/js.translator/testData/examples/cases/initializerBlock.kt b/js/js.translator/testData/examples/cases/initializerBlock.kt index 4f7a24370d5..bb906e5c1ea 100644 --- a/js/js.translator/testData/examples/cases/initializerBlock.kt +++ b/js/js.translator/testData/examples/cases/initializerBlock.kt @@ -1,7 +1,7 @@ class C() { public var f: Int - { + init { $f = 610 } } diff --git a/js/js.translator/testData/expression/misc/cases/KT-740.kt b/js/js.translator/testData/expression/misc/cases/KT-740.kt index e2d200827bd..5da03933f15 100644 --- a/js/js.translator/testData/expression/misc/cases/KT-740.kt +++ b/js/js.translator/testData/expression/misc/cases/KT-740.kt @@ -4,7 +4,7 @@ var c = 0 class A() { var p = 0; - { + init { c++; } } diff --git a/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt b/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt index 89ed979706e..8cc99b0469b 100644 --- a/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt +++ b/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt @@ -1,5 +1,5 @@ class A(var a: Int) { - { + init { $a = 3 } } diff --git a/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt b/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt index 24a288efc6e..11b9b452c72 100644 --- a/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt +++ b/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt @@ -3,7 +3,7 @@ package foo class A() { fun lold() = true val p: () -> Boolean - { + init { $p = { { lold() }() } } } diff --git a/js/js.translator/testData/inheritance/cases/baseCallOrder.kt b/js/js.translator/testData/inheritance/cases/baseCallOrder.kt index 0db11a6dca6..824d988c56a 100644 --- a/js/js.translator/testData/inheritance/cases/baseCallOrder.kt +++ b/js/js.translator/testData/inheritance/cases/baseCallOrder.kt @@ -3,7 +3,7 @@ package foo var x = false open class A { - { + init { x = (this as B).a != 3 } } diff --git a/js/js.translator/testData/inheritance/cases/complexInitializationOrder.kt b/js/js.translator/testData/inheritance/cases/complexInitializationOrder.kt index bc7c83c7266..08bc6e39716 100644 --- a/js/js.translator/testData/inheritance/cases/complexInitializationOrder.kt +++ b/js/js.translator/testData/inheritance/cases/complexInitializationOrder.kt @@ -3,31 +3,31 @@ package foo open class A() { var order = "" - { + init { order = order + "A" } } open class B() : A() { - { + init { order = order + "B" } } class C() : B() { - { + init { order = order + "C" } } class D() : B() { - { + init { order = order + "D" } } class E() : A() { - { + init { order = order + "E" } } diff --git a/js/js.translator/testData/inheritance/cases/definitionOrder.kt b/js/js.translator/testData/inheritance/cases/definitionOrder.kt index 7a64ff234d9..4eb64a677a3 100644 --- a/js/js.translator/testData/inheritance/cases/definitionOrder.kt +++ b/js/js.translator/testData/inheritance/cases/definitionOrder.kt @@ -1,25 +1,25 @@ package foo class C() : B() { - { + init { order = order + "C" } } class D() : B() { - { + init { order = order + "D" } } class E() : A() { - { + init { order = order + "E" } } open class B() : A() { - { + init { order = order + "B" } } @@ -27,7 +27,7 @@ open class B() : A() { open class A() : G() { var order = "" - { + init { order = order + "A" } } diff --git a/js/js.translator/testData/inheritance/cases/initializationOrder.kt b/js/js.translator/testData/inheritance/cases/initializationOrder.kt index 4a47185a814..b82a8ec7955 100644 --- a/js/js.translator/testData/inheritance/cases/initializationOrder.kt +++ b/js/js.translator/testData/inheritance/cases/initializationOrder.kt @@ -3,20 +3,20 @@ package foo open class A() { var order = "" - { + init { order = order + "A" } } open class B() : A() { - { + init { order = order + "B" } } class C() : B() { - { + init { order = order + "C" } } diff --git a/js/js.translator/testData/initialize/cases/classInitializer.kt b/js/js.translator/testData/initialize/cases/classInitializer.kt index e1c6b1e02f8..7e83c4b7175 100644 --- a/js/js.translator/testData/initialize/cases/classInitializer.kt +++ b/js/js.translator/testData/initialize/cases/classInitializer.kt @@ -4,7 +4,7 @@ class B(val name: String) class A(val a: Int, var b: B) { var copyB: B - { + init { copyB = b } } diff --git a/js/js.translator/testData/propertyAccess/cases/classUsesPackageProperties.kt b/js/js.translator/testData/propertyAccess/cases/classUsesPackageProperties.kt index 669ddd04053..5628a78c6c7 100644 --- a/js/js.translator/testData/propertyAccess/cases/classUsesPackageProperties.kt +++ b/js/js.translator/testData/propertyAccess/cases/classUsesPackageProperties.kt @@ -3,7 +3,7 @@ package foo var a = 0 class A() { - { + init { a++ } diff --git a/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt b/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt index ac76b00c72f..e6643d790ad 100644 --- a/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt +++ b/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt @@ -9,7 +9,7 @@ class A { var aR = 0 var aaR = 0 - { + init { a = 1 $aa = 2 @@ -27,7 +27,7 @@ class B { var aR = 0 var aaR = 0 - { + init { a = 3 $aa = 4 diff --git a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructor.kt b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructor.kt index 821a5ea5f2f..224091f6997 100644 --- a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructor.kt +++ b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructor.kt @@ -9,7 +9,7 @@ trait Holder { class BasicHolder : Holder { override val element: String - { + init { element = "ok" } } diff --git a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorComplex.kt b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorComplex.kt index 0e7e76131ce..3a2a37ccbf0 100644 --- a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorComplex.kt +++ b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorComplex.kt @@ -10,7 +10,7 @@ open class BasicHolder : Holder { override val element: String get() = $element + $element - { + init { element = "1" } } @@ -18,7 +18,7 @@ open class BasicHolder : Holder { class AdvancedHolder : BasicHolder() { override val element: String - { + init { element = super.element + super.element } } diff --git a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorExplicitThis.kt b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorExplicitThis.kt index 02969103ed6..f8eb7e1c39c 100644 --- a/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorExplicitThis.kt +++ b/js/js.translator/testData/propertyOverride/cases/initOverrideInConstructorExplicitThis.kt @@ -9,7 +9,7 @@ trait Holder { class BasicHolder : Holder { override val element: String - { + init { this.element = "ok" } } diff --git a/js/js.translator/testData/propertyOverride/cases/initOverrideVarInConstructor.kt b/js/js.translator/testData/propertyOverride/cases/initOverrideVarInConstructor.kt index 362ab1337f3..bf7c39aadf0 100644 --- a/js/js.translator/testData/propertyOverride/cases/initOverrideVarInConstructor.kt +++ b/js/js.translator/testData/propertyOverride/cases/initOverrideVarInConstructor.kt @@ -9,7 +9,7 @@ trait Holder { class BasicHolder : Holder { override var element: String = "not ok" - { + init { element = "ok" } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamIf.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamIf.kt index 1a163776643..795f017a99f 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamIf.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassParamIf.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(`if`: String) { - { + init { testRenamed("if", { `if` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamIn.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamIn.kt index c193c3d815e..b1912eae402 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamIn.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassParamIn.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(`in`: String) { - { + init { testRenamed("in", { `in` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamWith.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamWith.kt index 085e3964708..f2cdfd01b98 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamWith.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassParamWith.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(with: String) { - { + init { testRenamed("with", { with }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassParamYield.kt b/js/js.translator/testData/reservedWords/cases/dataClassParamYield.kt index 90fd307552b..30baf815ebf 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassParamYield.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassParamYield.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(yield: String) { - { + init { testRenamed("yield", { yield }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValDo.kt b/js/js.translator/testData/reservedWords/cases/dataClassValDo.kt index fe6a887f9ab..5f6c009a626 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValDo.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValDo.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(val `do`: String) { - { + init { testNotRenamed("do", { `do` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValElse.kt b/js/js.translator/testData/reservedWords/cases/dataClassValElse.kt index 6babde14a2f..35140593388 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValElse.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValElse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(val `else`: String) { - { + init { testNotRenamed("else", { `else` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValSwitch.kt b/js/js.translator/testData/reservedWords/cases/dataClassValSwitch.kt index 97bb4ef24ec..0b1f109b248 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValSwitch.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValSwitch.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(val switch: String) { - { + init { testNotRenamed("switch", { switch }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt b/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt index cd5aee13cb4..4e1f6d16e82 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassValTypeof.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(val typeof: String) { - { + init { testNotRenamed("typeof", { typeof }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarFalse.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarFalse.kt index 1c2d643a108..8f3db19daec 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarFalse.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarFalse.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(var `false`: String) { - { + init { testNotRenamed("false", { `false` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarFor.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarFor.kt index 1c8a2d98bd7..0e5db46cfc2 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarFor.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarFor.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(var `for`: String) { - { + init { testNotRenamed("for", { `for` }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarUndefined.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarUndefined.kt index b628e1469e9..233a766c7f5 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarUndefined.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarUndefined.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(var undefined: String) { - { + init { testNotRenamed("undefined", { undefined }) } } diff --git a/js/js.translator/testData/reservedWords/cases/dataClassVarVoid.kt b/js/js.translator/testData/reservedWords/cases/dataClassVarVoid.kt index 7549895d87e..9bc1d389e3e 100644 --- a/js/js.translator/testData/reservedWords/cases/dataClassVarVoid.kt +++ b/js/js.translator/testData/reservedWords/cases/dataClassVarVoid.kt @@ -3,7 +3,7 @@ package foo // NOTE THIS FILE IS AUTO-GENERATED by the generateTestDataForReservedWords.kt. DO NOT EDIT! data class DataClass(var void: String) { - { + init { testNotRenamed("void", { void }) } } diff --git a/js/js.translator/testData/simple/cases/simpleInitializer.kt b/js/js.translator/testData/simple/cases/simpleInitializer.kt index edd388072b8..3b26837109c 100644 --- a/js/js.translator/testData/simple/cases/simpleInitializer.kt +++ b/js/js.translator/testData/simple/cases/simpleInitializer.kt @@ -2,7 +2,7 @@ package foo class Test() { var a: Int - { + init { $a = 3 } } diff --git a/js/js.translator/testData/trait/cases/definitionOrder.kt b/js/js.translator/testData/trait/cases/definitionOrder.kt index 9dd085bc4d1..7724f06f539 100644 --- a/js/js.translator/testData/trait/cases/definitionOrder.kt +++ b/js/js.translator/testData/trait/cases/definitionOrder.kt @@ -1,25 +1,25 @@ package foo class C() : B() { - { + init { order = order + "C" } } class D() : B() { - { + init { order = order + "D" } } class E() : A() { - { + init { order = order + "E" } } open class B() : A(), F { - { + init { order = order + "B" } } @@ -27,7 +27,7 @@ open class B() : A(), F { open class A() : F { var order = "" - { + init { order = order + "A" } } diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt index 75c6ae1dda9..38657e33326 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Creatures.kt @@ -210,7 +210,7 @@ class CanvasState(val canvas: HTMLCanvasElement) { var dragOff = Vector() val interval = 1000 / 30 - { + init { jq(canvas).mousedown { valid = false selection = null @@ -295,7 +295,7 @@ class RadialGradientGenerator(val context: CanvasContext) { gradients.add(colorStops) } - { + init { newColorStops(Pair(0.0, "#F59898"), Pair(0.5, "#F57373"), Pair(1.0, "#DB6B6B")) newColorStops(Pair(0.39, "rgb(140,167,209)"), Pair(0.7, "rgb(104,139,209)"), Pair(0.85, "rgb(67,122,217)")) newColorStops(Pair(0.0, "rgb(255,222,255)"), Pair(0.5, "rgb(255,185,222)"), Pair(1.0, "rgb(230,154,185)")) diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt index f8075958dd1..1e4617ebd4c 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Hello, Kotlin.kt @@ -45,7 +45,7 @@ class HelloKotlin() { val message = "Hello, Kotlin!" val textHeightInPixels = 20 - { + init { context.font = "bold ${textHeightInPixels}px Georgia, serif" } val textWidthInPixels = context.measureText(message)!!.width diff --git a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt index 38b572830fd..b61647ed32e 100644 --- a/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt +++ b/js/js.translator/testData/webDemoCanvasExamples/cases/Traffic light.kt @@ -177,7 +177,7 @@ class TrafficLight(override var pos: Vector, val direction: String, val startCol var isForceColorChange = false var changeColorForward = (startColor == "red") - { + init { list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "red_color.png")) list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "yellow_color.png")) list.add(TrafficLightItem(v(pos.x, pos.y), PATH_TO_IMAGES + "green_color.png")) @@ -378,7 +378,7 @@ class CanvasState(val canvas: HTMLCanvasElement) { shapes.add(shape) } - { + init { jq(canvas).click { val mousePos = mousePos(it) @shapeLoop for (shape in shapes) { diff --git a/js/js.translator/testData/webDemoExamples2/cases/life.kt b/js/js.translator/testData/webDemoExamples2/cases/life.kt index 3eadd4f3746..f72c90fd0c5 100644 --- a/js/js.translator/testData/webDemoExamples2/cases/life.kt +++ b/js/js.translator/testData/webDemoExamples2/cases/life.kt @@ -17,7 +17,7 @@ class Field( init: (Int, Int) -> Boolean ) { private val live: Array> - { + init { live = Array(height) { i -> Array(width) { j -> init(i, j) } } } diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt index ea9563b64f0..ef30a2dfc6c 100644 --- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt +++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simple/simple.kt @@ -6,7 +6,7 @@ import java.io.File import kotlinx.android.synthetic.layout.* public class MyActivity : Activity() { - {login} + init {login} } // 1 public _\$_findCachedViewById diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt index b34a70ec388..fc040a81304 100644 --- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt +++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleFragment/simpleFragment.kt @@ -5,7 +5,7 @@ import java.io.File import kotlinx.android.synthetic.layout.* public class MyFragment : Fragment() { - {login} + init {login} } // 1 public _\$_findCachedViewById diff --git a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt index 70d5a5dd089..72ae25a8746 100644 --- a/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt +++ b/plugins/android-compiler-plugin/testData/codegen/bytecodeShape/simpleView/simpleView.kt @@ -5,7 +5,7 @@ import android.app.Activity import kotlinx.android.synthetic.layout.view.* public class MyActivity : Activity() { - { View(this).login } + init { View(this).login } } // 1 public _\$_findCachedViewById