From 6914d09297f678bd5b8fed9c22c67729592bc9ed Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Thu, 8 Oct 2015 19:51:02 +0300 Subject: [PATCH] Old backing field with dollar is now forbidden --- .../cfg/JetFlowInformationProvider.java | 2 +- .../jetbrains/kotlin/diagnostics/Errors.java | 4 +- .../rendering/DefaultErrorMessages.java | 4 +- .../kotlin/resolve/BodyResolver.java | 2 +- .../codegen/box/classes/initializerBlock.kt | 2 +- .../testData/codegen/box/objects/kt535.kt | 21 --- .../testData/codegen/box/objects/kt640.kt | 29 --- .../box/properties/classObjectProperties.kt | 2 +- .../codegen/box/properties/generalAccess.kt | 2 +- .../box/staticFields/incInClassObject.kt | 10 +- .../codegen/box/staticFields/incInObject.kt | 10 +- .../testData/codegen/box/typeInfo/kt511.kt | 16 -- .../tests/AnonymousInitializers.kt | 3 +- .../tests/AnonymousInitializers.txt | 2 +- .../diagnostics/tests/Constructors.kt | 1 - .../diagnostics/tests/Constructors.txt | 1 - compiler/testData/diagnostics/tests/Dollar.kt | 5 +- .../testData/diagnostics/tests/Properties.kt | 8 +- .../diagnostics/tests/UnusedVariables.kt | 9 - .../diagnostics/tests/UnusedVariables.txt | 1 - .../tests/backingField/CustomGetSet.kt | 11 -- .../tests/backingField/CustomGetSet.txt | 10 - .../backingField/ReadForwardInAnonymous.kt | 7 - .../backingField/ReadForwardInAnonymous.txt | 9 - .../ReadForwardInPropertyInitializer.kt | 4 - .../ReadForwardInPropertyInitializer.txt | 10 - .../tests/backingField/ReadInAnonymous.kt | 6 - .../tests/backingField/ReadInAnonymous.txt | 9 - .../ReadInAnotherPropertyIntializer.kt | 4 - .../ReadInAnotherPropertyIntializer.txt | 10 - .../tests/backingField/ReadInFunction.kt | 4 - .../tests/backingField/ReadInFunction.txt | 10 - .../backingField/kt462BackingFieldsResolve.kt | 172 ------------------ .../kt462BackingFieldsResolve.txt | 66 ------- .../UninitializedOrReassignedVariables.kt | 40 ++-- .../checkBackingFieldException.kt | 2 +- .../diagnostics/tests/regressions/Jet17.kt | 2 +- .../diagnostics/tests/regressions/kt575.kt | 4 +- .../diagnostics/tests/scopes/kt421Scopes.kt | 8 - .../diagnostics/tests/scopes/kt421Scopes.txt | 11 -- .../classObjectInClassStaticFields.kt | 2 +- .../classObjectInTraitStaticFields.kt | 2 +- .../checkers/JetDiagnosticsTestGenerated.java | 48 ----- .../BlackBoxCodegenTestGenerated.java | 18 -- eval4j/src/org/jetbrains/eval4j/values.kt | 2 +- .../highlight/KotlinHistoryHighlighter.kt | 2 +- .../inspections/KotlinCleanupInspection.kt | 2 +- .../kotlin/idea/quickfix/QuickFixRegistrar.kt | 6 +- .../changeSignature/JetChangeInfo.kt | 4 +- .../changeSignature/JetChangeSignatureData.kt | 2 +- .../JetMutableMethodDescriptor.kt | 2 +- .../KotlinInplaceParameterIntroducer.kt | 4 +- .../KotlinInplacePropertyIntroducer.kt | 2 +- .../testData/checker/AnonymousInitializers.kt | 2 +- idea/testData/checker/Constructors.kt | 2 +- idea/testData/checker/regression/Jet17.kt | 2 +- .../src/stepping/stepInto/accessors.kt | 2 +- idea/testData/highlighter/Variables.kt | 2 +- .../backingFieldRef.kt | 8 +- .../backingFieldRef.kt.after | 4 - .../backingField.kt | 9 - .../backingField.kt.after | 8 - .../abstract/abstractPropertyWithGetter1.kt | 2 +- .../abstractPropertyWithGetter1.kt.after | 2 +- .../renameFieldIdentifier/after/test.kt | 2 +- .../renameFieldIdentifier/before/test.kt | 2 +- .../intentions/IntentionTestGenerated.java | 6 - .../org/jetbrains/kotlin/j2k/ast/Element.kt | 4 +- .../lookupTracker/classifierMembers/foo.kt | 4 +- .../test/semantics/DefaultArgumentsTest.java | 4 - .../cases/overrideValWithDefaultValue.kt | 15 -- .../examples/cases/initializerBlock.kt | 2 +- .../misc/cases/classWithoutPackage.kt | 2 +- .../misc/cases/funInConstructorBlock.kt | 2 +- .../propertyAccess/cases/backendField.kt | 4 +- .../cases/initValInConstructor.kt | 4 +- .../simple/cases/simpleInitializer.kt | 2 +- 77 files changed, 88 insertions(+), 637 deletions(-) delete mode 100644 compiler/testData/codegen/box/objects/kt535.kt delete mode 100644 compiler/testData/codegen/box/objects/kt640.kt delete mode 100644 compiler/testData/codegen/box/typeInfo/kt511.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/ReadInFunction.txt delete mode 100644 compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt delete mode 100644 compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.txt delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt delete mode 100644 compiler/testData/diagnostics/tests/scopes/kt421Scopes.txt delete mode 100644 idea/testData/intentions/moveAssignmentToInitializer/backingField.kt delete mode 100644 idea/testData/intentions/moveAssignmentToInitializer/backingField.kt.after delete mode 100644 js/js.translator/testData/defaultArguments/cases/overrideValWithDefaultValue.kt diff --git a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java index 6888097a201..65faff403dd 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/cfg/JetFlowInformationProvider.java @@ -556,7 +556,7 @@ public class JetFlowInformationProvider { if ((containingDeclaration instanceof ClassDescriptor) && DescriptorUtils.isAncestor(containingDeclaration, declarationDescriptor, false)) { if (element instanceof JetSimpleNameExpression) { - report(Errors.BACKING_FIELD_USAGE_DEPRECATED.on((JetSimpleNameExpression) element), cxtx); + report(Errors.BACKING_FIELD_USAGE_FORBIDDEN.on((JetSimpleNameExpression) element), cxtx); } return false; } diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index e359a09ad8c..0ba5aa13957 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -346,8 +346,8 @@ public interface Errors { DiagnosticFactory0 PRIVATE_PROPERTY_IN_INTERFACE = DiagnosticFactory0.create(ERROR, PRIVATE_MODIFIER); DiagnosticFactory0 BACKING_FIELD_IN_TRAIT = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE); - DiagnosticFactory0 BACKING_FIELD_SYNTAX_DEPRECATED = DiagnosticFactory0.create(WARNING); - DiagnosticFactory0 BACKING_FIELD_USAGE_DEPRECATED = DiagnosticFactory0.create(WARNING); + DiagnosticFactory0 BACKING_FIELD_OLD_SYNTAX = DiagnosticFactory0.create(ERROR); + DiagnosticFactory0 BACKING_FIELD_USAGE_FORBIDDEN = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 INAPPLICABLE_LATEINIT_MODIFIER = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 INAPPLICABLE_LATEINIT_MODIFIER_IMMUTABLE = DiagnosticFactory0.create(ERROR); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 56d220fd1df..b5158340ebc 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -169,8 +169,8 @@ public class DefaultErrorMessages { MAP.put(INACCESSIBLE_BACKING_FIELD, "The backing field is not accessible here"); MAP.put(NOT_PROPERTY_BACKING_FIELD, "The referenced variable is not a property and doesn't have backing field"); - MAP.put(BACKING_FIELD_SYNTAX_DEPRECATED, "This backing field syntax is deprecated, use 'field' instead"); - MAP.put(BACKING_FIELD_USAGE_DEPRECATED, "Backing field usage is deprecated here, soon it will be possible only in property accessors"); + MAP.put(BACKING_FIELD_OLD_SYNTAX, "This backing field syntax is forbidden, use 'field' instead"); + MAP.put(BACKING_FIELD_USAGE_FORBIDDEN, "Backing field usage is forbidden here"); MAP.put(MIXING_NAMED_AND_POSITIONED_ARGUMENTS, "Mixing named and positioned arguments is not allowed"); MAP.put(ARGUMENT_PASSED_TWICE, "An argument is already passed for this parameter"); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java index 3c1a9662abc..a218d037021 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/BodyResolver.java @@ -655,7 +655,7 @@ public class BodyResolver { // This check may be considered redundant as long as $x is only accessible from accessors to $x if (descriptor == propertyDescriptor) { // TODO : original? trace.record(BindingContext.BACKING_FIELD_REQUIRED, propertyDescriptor); // TODO: this trace? - trace.report(Errors.BACKING_FIELD_SYNTAX_DEPRECATED.on(simpleNameExpression)); + trace.report(Errors.BACKING_FIELD_OLD_SYNTAX.on(simpleNameExpression)); } } if (descriptor instanceof SyntheticFieldDescriptor) { diff --git a/compiler/testData/codegen/box/classes/initializerBlock.kt b/compiler/testData/codegen/box/classes/initializerBlock.kt index 5aa7aa1e3c0..ccaac7f0473 100644 --- a/compiler/testData/codegen/box/classes/initializerBlock.kt +++ b/compiler/testData/codegen/box/classes/initializerBlock.kt @@ -2,7 +2,7 @@ class C() { public var f: Int init { - $f = 610 + f = 610 } } diff --git a/compiler/testData/codegen/box/objects/kt535.kt b/compiler/testData/codegen/box/objects/kt535.kt deleted file mode 100644 index 7835106ad16..00000000000 --- a/compiler/testData/codegen/box/objects/kt535.kt +++ /dev/null @@ -1,21 +0,0 @@ -class Identifier(t : T?, myHasDollar : Boolean) { - private val myT : T? - - public fun getName() : T? { return myT } - - companion object { - open public fun init(name : T?) : Identifier { - val __ = Identifier(name, false) - return __ - } - } - init { - $myT = t - } -} - -fun box() : String { - var i3 : Identifier? = Identifier.init("name") - System.out?.println(i3?.getName()) - return "OK" -} diff --git a/compiler/testData/codegen/box/objects/kt640.kt b/compiler/testData/codegen/box/objects/kt640.kt deleted file mode 100644 index a3d9c3373fa..00000000000 --- a/compiler/testData/codegen/box/objects/kt640.kt +++ /dev/null @@ -1,29 +0,0 @@ -package demo - -public open class Identifier(myName : T?, myHasDollar : Boolean) { - private val myName : T? - private var myHasDollar : Boolean - private var myNullable : Boolean = true - - init { - $myName = myName - $myHasDollar = myHasDollar - } - - open public fun getName() : T? { - return myName - } - - companion object { - open public fun init(name : T?) : Identifier { - val __ = Identifier(name, false) - return __ - } - } -} - -fun box() : String { - var i3 : Identifier<*>? = Identifier.init("name") - System.out?.println("Hello, " + i3?.getName()) - return "OK" -} diff --git a/compiler/testData/codegen/box/properties/classObjectProperties.kt b/compiler/testData/codegen/box/properties/classObjectProperties.kt index 51661a5b3fc..1a48f5eb5f4 100644 --- a/compiler/testData/codegen/box/properties/classObjectProperties.kt +++ b/compiler/testData/codegen/box/properties/classObjectProperties.kt @@ -15,7 +15,7 @@ class Test { var prop4 : Int = 13 fun incProp4() { - $prop4++ + prop4++ } diff --git a/compiler/testData/codegen/box/properties/generalAccess.kt b/compiler/testData/codegen/box/properties/generalAccess.kt index cc35760d0eb..577d9ab7e13 100644 --- a/compiler/testData/codegen/box/properties/generalAccess.kt +++ b/compiler/testData/codegen/box/properties/generalAccess.kt @@ -38,7 +38,7 @@ open class B(init: String) : A("1") { } fun getWithBackingFieldProperty(): String { - return $property + return property } } diff --git a/compiler/testData/codegen/box/staticFields/incInClassObject.kt b/compiler/testData/codegen/box/staticFields/incInClassObject.kt index 3c3935c72c4..5ecff203cbc 100644 --- a/compiler/testData/codegen/box/staticFields/incInClassObject.kt +++ b/compiler/testData/codegen/box/staticFields/incInClassObject.kt @@ -20,7 +20,7 @@ class A { fun test2() : Int { r2++ ++r2 - return $r2 + return r2 } var r3: Int = 1; @@ -32,7 +32,7 @@ class A { fun test3() : Int { r3++ ++r3 - return $r3 + return r3 } var r4: Int = 1; @@ -49,7 +49,7 @@ class A { r4++ holder += ":" ++r4 - return $r4 + return r4 } } } @@ -60,7 +60,7 @@ fun box() : String { val p2 = A.test2() var holderValue = A.holder - if (p2 != 3 || holderValue != "getR2getR2getR2") return "fail 2: $p2 ${holderValue}" + if (p2 != 3 || holderValue != "getR2getR2getR2getR2") return "fail 2: $p2 ${holderValue}" A.holder = "" val p3 = A.test3() @@ -68,7 +68,7 @@ fun box() : String { A.holder = "" val p4 = A.test4() - if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4") return "fail 4: $p4 ${A.holder}" + if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4getR4") return "fail 4: $p4 ${A.holder}" return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/staticFields/incInObject.kt b/compiler/testData/codegen/box/staticFields/incInObject.kt index 072f003e380..f35b9bb83f7 100644 --- a/compiler/testData/codegen/box/staticFields/incInObject.kt +++ b/compiler/testData/codegen/box/staticFields/incInObject.kt @@ -18,7 +18,7 @@ object A { fun test2() : Int { r2++ ++r2 - return $r2 + return r2 } var r3: Int = 1; @@ -30,7 +30,7 @@ object A { fun test3() : Int { r3++ ++r3 - return $r3 + return r3 } var r4: Int = 1; @@ -47,7 +47,7 @@ object A { r4++ holder += ":" ++r4 - return $r4 + return r4 } } @@ -57,7 +57,7 @@ fun box() : String { val p2 = A.test2() val holderValue = A.holder - if (p2 != 3 || holderValue != "getR2getR2getR2") return "fail 2: $p2 ${holderValue}" + if (p2 != 3 || holderValue != "getR2getR2getR2getR2") return "fail 2: $p2 ${holderValue}" A.holder = "" val p3 = A.test3() @@ -65,7 +65,7 @@ fun box() : String { A.holder = "" val p4 = A.test4() - if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4") return "fail 4: $p4 ${A.holder}" + if (p4 != 3 || A.holder != "getR4setR4:getR4setR4getR4getR4") return "fail 4: $p4 ${A.holder}" return "OK" } \ No newline at end of file diff --git a/compiler/testData/codegen/box/typeInfo/kt511.kt b/compiler/testData/codegen/box/typeInfo/kt511.kt deleted file mode 100644 index ce4e802ff6b..00000000000 --- a/compiler/testData/codegen/box/typeInfo/kt511.kt +++ /dev/null @@ -1,16 +0,0 @@ -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 - } -} - -fun box() = if(One("ola", 0).myName == "ola") "OK" else "fail" diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializers.kt b/compiler/testData/diagnostics/tests/AnonymousInitializers.kt index 3d51c021e4d..5b54f982ae5 100644 --- a/compiler/testData/diagnostics/tests/AnonymousInitializers.kt +++ b/compiler/testData/diagnostics/tests/AnonymousInitializers.kt @@ -11,9 +11,8 @@ interface NoC { } class WithC() { - val x : Int + val x : Int = 1 init { - $x = 1 $y = 2 val b = x diff --git a/compiler/testData/diagnostics/tests/AnonymousInitializers.txt b/compiler/testData/diagnostics/tests/AnonymousInitializers.txt index 1760faf68c4..1f9752d07e6 100644 --- a/compiler/testData/diagnostics/tests/AnonymousInitializers.txt +++ b/compiler/testData/diagnostics/tests/AnonymousInitializers.txt @@ -10,7 +10,7 @@ public interface NoC { public final class WithC { public constructor WithC() public final val a: kotlin.Int - public final val x: kotlin.Int + public final val x: kotlin.Int = 1 public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String diff --git a/compiler/testData/diagnostics/tests/Constructors.kt b/compiler/testData/diagnostics/tests/Constructors.kt index b84839035da..9b0fd514a00 100644 --- a/compiler/testData/diagnostics/tests/Constructors.kt +++ b/compiler/testData/diagnostics/tests/Constructors.kt @@ -24,7 +24,6 @@ class WithCPI_Dup(x : Int) { class WithCPI(x : Int) { val a = 1 - val b : Int = $a val xy : Int = x } diff --git a/compiler/testData/diagnostics/tests/Constructors.txt b/compiler/testData/diagnostics/tests/Constructors.txt index edb06dda1a5..a21853a38cc 100644 --- a/compiler/testData/diagnostics/tests/Constructors.txt +++ b/compiler/testData/diagnostics/tests/Constructors.txt @@ -68,7 +68,6 @@ public final class WithC2 : WithC1 { public final class WithCPI { public constructor WithCPI(/*0*/ x: kotlin.Int) public final val a: kotlin.Int = 1 - public final val b: kotlin.Int = 1 public final val xy: kotlin.Int public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int diff --git a/compiler/testData/diagnostics/tests/Dollar.kt b/compiler/testData/diagnostics/tests/Dollar.kt index bfba6fb50b9..ca13dc9c9d9 100644 --- a/compiler/testData/diagnostics/tests/Dollar.kt +++ b/compiler/testData/diagnostics/tests/Dollar.kt @@ -5,10 +5,7 @@ open class `$$$$$`() { open class `$`() { } open class `$$`(`$$$$` : `$$$$$`?) : `$`() { - val `$$$` : `$$$$$`? - init { - $`$$$` = `$$$$` - } + val `$$$` : `$$$$$`? = `$$$$` open public fun `$$$$$$`() : `$$$$$`? { return `$$$` } diff --git a/compiler/testData/diagnostics/tests/Properties.kt b/compiler/testData/diagnostics/tests/Properties.kt index 0b4e366194d..c2c86e6d79b 100644 --- a/compiler/testData/diagnostics/tests/Properties.kt +++ b/compiler/testData/diagnostics/tests/Properties.kt @@ -14,16 +14,16 @@ var x : Int = 1 + x class Test() { var a : Int = 111 - var b : Int get() = $a; set(x) {a = x; $a = x} + var b : Int get() = $a; set(x) {a = x; $a = x} init { - $b = $a - $a = $b + $b = $a + $a = $b a = $b } fun f() { - $b = $a + $b = $a a = $b } public val i = 1 diff --git a/compiler/testData/diagnostics/tests/UnusedVariables.kt b/compiler/testData/diagnostics/tests/UnusedVariables.kt index afd4c811a62..d10f86b26c2 100644 --- a/compiler/testData/diagnostics/tests/UnusedVariables.kt +++ b/compiler/testData/diagnostics/tests/UnusedVariables.kt @@ -130,13 +130,4 @@ fun testObject() : Trait { return o } -fun testBackingFieldsNotMarked() { - val a = object { - val x : Int - init { - $x = 1 - } - } -} - fun doSmth(i : Int) {} diff --git a/compiler/testData/diagnostics/tests/UnusedVariables.txt b/compiler/testData/diagnostics/tests/UnusedVariables.txt index 08bc71d9dad..f590bef8854 100644 --- a/compiler/testData/diagnostics/tests/UnusedVariables.txt +++ b/compiler/testData/diagnostics/tests/UnusedVariables.txt @@ -2,7 +2,6 @@ package package unused_variables { public fun doSmth(/*0*/ i: kotlin.Int): kotlin.Unit - public fun testBackingFieldsNotMarked(): kotlin.Unit public fun testFunctionLiterals(): kotlin.Unit public fun testInnerFunctions(): kotlin.Unit public fun testObject(): unused_variables.Trait diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt deleted file mode 100644 index bf401362974..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt +++ /dev/null @@ -1,11 +0,0 @@ -class Flower() { - - var minusOne: Int = 1 - get() = field + 1 - set(n: Int) { field = n - 1 } - - var oldSyntax: Int = 1 - get() = $oldSyntax - 1 - set(arg) { $oldSyntax = arg + 1 } - -} diff --git a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt b/compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt deleted file mode 100644 index 86a6c64010d..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/CustomGetSet.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class Flower { - public constructor Flower() - public final var minusOne: kotlin.Int - public final var oldSyntax: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt deleted file mode 100644 index b1b1108d146..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt +++ /dev/null @@ -1,7 +0,0 @@ -class ReadForward() { - init { - val x = $a - } - - val a = 1 -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.txt b/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.txt deleted file mode 100644 index d86f439ab9e..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public final class ReadForward { - public constructor ReadForward() - public final val a: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt deleted file mode 100644 index 0b0cb93c010..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt +++ /dev/null @@ -1,4 +0,0 @@ -class ReadForward() { - val a = $b - val b = 1 -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.txt b/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.txt deleted file mode 100644 index 103af6ae510..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class ReadForward { - public constructor ReadForward() - public final val a: kotlin.Int = 1 - public final val b: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt deleted file mode 100644 index c70865f89ff..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt +++ /dev/null @@ -1,6 +0,0 @@ -class ReadByAnotherPropertyInitializer() { - val a = 1 - init { - val x = $a - } -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.txt b/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.txt deleted file mode 100644 index 432995f9e7e..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.txt +++ /dev/null @@ -1,9 +0,0 @@ -package - -public final class ReadByAnotherPropertyInitializer { - public constructor ReadByAnotherPropertyInitializer() - public final val a: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt deleted file mode 100644 index c270af2d072..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt +++ /dev/null @@ -1,4 +0,0 @@ -class ReadByAnotherPropertyInitializer() { - val a = 1 - val b = $a -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.txt b/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.txt deleted file mode 100644 index 3aaa57a24c1..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class ReadByAnotherPropertyInitializer { - public constructor ReadByAnotherPropertyInitializer() - public final val a: kotlin.Int = 1 - public final val b: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt deleted file mode 100644 index 6d1443d81fc..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt +++ /dev/null @@ -1,4 +0,0 @@ -class ReadByAnotherPropertyInitializer() { - val a = 1 - fun ff() = $a -} diff --git a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.txt b/compiler/testData/diagnostics/tests/backingField/ReadInFunction.txt deleted file mode 100644 index 372d22652e3..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/ReadInFunction.txt +++ /dev/null @@ -1,10 +0,0 @@ -package - -public final class ReadByAnotherPropertyInitializer { - public constructor ReadByAnotherPropertyInitializer() - public final val a: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun ff(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt deleted file mode 100644 index 1a8f409ea5d..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt +++ /dev/null @@ -1,172 +0,0 @@ -//KT-462 Consider allowing initializing properties via property names when it is safe -//KT-598 Allow to use backing fields after this expression - -package kt462 - -abstract class TestInitializationWithoutBackingField() { - val valWithBackingField : Int - init { - valWithBackingField = 2 - } - - val valWithoutBackingField : Int - get() = 42 - init { - valWithoutBackingField = 45 - } - - var finalDefaultVar : Int - init { - finalDefaultVar = 3 - } - - open var openVar : Int - init { - openVar = 4 - } - - var varWithCustomSetter : Int - set(v: Int) { - field = v - } - init { - varWithCustomSetter = 3 - } - - var varWithoutBackingField : Int - get() = 3 - set(v: Int) {} - init { - varWithoutBackingField = 4 - } - - abstract var abstractVar : Int - init { - abstractVar = 34 - } -} - -abstract class TestInitializationThroughBackingField() { - val valWithBackingField : Int - init { - $valWithBackingField = 2 - } - - val valWithoutBackingField : Int - get() = 42 - init { - $valWithoutBackingField = 45 - } - - var finalDefaultVar : Int - init { - $finalDefaultVar = 3 - } - - open var openVar : Int - init { - $openVar = 4 - } - - var varWithCustomSetter : Int - set(v: Int) { - field = v - } - init { - $varWithCustomSetter = 3 - } - - var varWithoutBackingField : Int - get() = 3 - set(v: Int) {} - init { - $varWithoutBackingField = 4 - } - - abstract var abstractVar : Int - init { - $abstractVar = 34 - } -} - -class TestBackingFieldsVisibility() { - var a : Int = 712 - init { - $a = 37 - this.$a = 357 - } - - fun foo() { - $a = 334 - this.$a = 347 - } - - fun foo(a: TestBackingFieldsVisibility) { - val b : Int = 3 - $b = 342 - a.$a = 3 - } - - val x = $topLevelVar - - inner class Inner() { - val z = this@TestBackingFieldsVisibility.$x - } - - abstract val w = 11 - get() = field //test there is no second error here -} - -val topLevelVar = 11 - -class T() { - val z : Int get() = 42 - - init { - this.$z = 34 - } - - fun foo() { - this.$z = 343 - } - - val a = object { - val x = $z - init { - $z = 23 - } - } - - var x: Int = 2 - get() { - val o = object { - init { - field = 34 - } - fun foo() { - field = 23 - } - } - return 1 - } - - var r: Int = $x - set(v: Int) { - if (true) { - field = 33 - } - else { - field = 35 - } - } - - fun bar() { - $x = 34 - val o = object { - val y = $x - init { - $x = 422 - } - } - } -} diff --git a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.txt b/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.txt deleted file mode 100644 index 0cb6a2e37fb..00000000000 --- a/compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.txt +++ /dev/null @@ -1,66 +0,0 @@ -package - -package kt462 { - public val topLevelVar: kotlin.Int = 11 - - public final class T { - public constructor T() - public final val a: kotlin.Any - public final var r: kotlin.Int - public final var x: kotlin.Int - public final val z: kotlin.Int - public final fun bar(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } - - public final class TestBackingFieldsVisibility { - public constructor TestBackingFieldsVisibility() - public final var a: kotlin.Int - public abstract val w: kotlin.Int = 11 - public final val x: kotlin.Int = 11 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public final fun foo(): kotlin.Unit - public final fun foo(/*0*/ a: kt462.TestBackingFieldsVisibility): kotlin.Unit - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - - public final inner class Inner { - public constructor Inner() - public final val z: kotlin.Int = 11 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } - } - - public abstract class TestInitializationThroughBackingField { - public constructor TestInitializationThroughBackingField() - public abstract var abstractVar: kotlin.Int - public final var finalDefaultVar: kotlin.Int - public open var openVar: kotlin.Int - public final val valWithBackingField: kotlin.Int - public final val valWithoutBackingField: kotlin.Int - public final var varWithCustomSetter: kotlin.Int - public final var varWithoutBackingField: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } - - public abstract class TestInitializationWithoutBackingField { - public constructor TestInitializationWithoutBackingField() - public abstract var abstractVar: kotlin.Int - public final var finalDefaultVar: kotlin.Int - public open var openVar: kotlin.Int - public final val valWithBackingField: kotlin.Int - public final val valWithoutBackingField: kotlin.Int - public final var varWithCustomSetter: kotlin.Int - public final var varWithoutBackingField: kotlin.Int - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String - } -} diff --git a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt index 8a236f5b7d0..43ee9fc7dcb 100644 --- a/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt +++ b/compiler/testData/diagnostics/tests/controlFlowAnalysis/UninitializedOrReassignedVariables.kt @@ -113,16 +113,16 @@ val z = 10 class AnonymousInitializers(var a: String, val b: String) { init { - $a = "30" + a = "30" a = "s" - $b = "3" + b = "3" b = "tt" //repeat for b } val i: Int init { - $i = 121 + i = 121 } init { @@ -134,7 +134,7 @@ class AnonymousInitializers(var a: String, val b: String) { get() = 20 init { - $i = 13 + i = 13 $j = 30 j = 34 } @@ -145,31 +145,31 @@ class AnonymousInitializers(var a: String, val b: String) { k = "a" } else { - $k = "b" + k = "b" } } val l: String init { if (1 < 3) { - $l = "a" + l = "a" } else { - $l = "b" + l = "b" } } val o: String init { if (1 < 3) { - $o = "a" + o = "a" } } var m: Int = 30 init { - $m = 400 + m = 400 } val n: Int @@ -177,7 +177,7 @@ class AnonymousInitializers(var a: String, val b: String) { init { while (n == 0) { } - $n = 10 + n = 10 while (n == 0) { } } @@ -198,7 +198,7 @@ class LocalValsVsProperties(val a: Int, w: Int) : Open(a, w) { val x : Int val y : Int init { - $x = 1 + x = 1 val b = x } val b = a @@ -214,7 +214,7 @@ class LocalValsVsProperties(val a: Int, w: Int) : Open(a, w) { var yy : Int init { w += 1 - $yy = w + yy = w } } @@ -223,8 +223,8 @@ class Outer() { var b : Int init { - $a = 1 - $b = 1 + a = 1 + b = 1 } inner class Inner() { @@ -242,7 +242,7 @@ class Outer() { class ForwardAccessToBackingField() { //kt-147 val a = $a // error - val b = $c // error + val b = c // error val c = 1 } @@ -251,7 +251,7 @@ class ClassObject() { val x : Int init { - $x = 1 + x = 1 } @@ -268,8 +268,8 @@ fun foo() { val y : Int val z : Int init { - $x = 1 - $z = 3 + x = 1 + z = 3 } fun foo() { y = 10 @@ -288,7 +288,7 @@ class TestObjectExpression() { if (true) x = 12 else - $x = 1 + x = 1 } fun inner1() { y = 101 @@ -308,7 +308,7 @@ object TestObjectDeclaration { val x : Int val y : Int init { - $x = 1 + x = 1 } fun foo() { diff --git a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt index 7c090d157fd..73d827481ad 100644 --- a/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt +++ b/compiler/testData/diagnostics/tests/incompleteCode/diagnosticWithSyntaxError/checkBackingFieldException.kt @@ -3,7 +3,7 @@ package h class Square() { var size : Double = set(value) { - $area = size * size + $area = size * size } var area : Double diff --git a/compiler/testData/diagnostics/tests/regressions/Jet17.kt b/compiler/testData/diagnostics/tests/regressions/Jet17.kt index 7b710eaca10..d9fb94fa6c1 100644 --- a/compiler/testData/diagnostics/tests/regressions/Jet17.kt +++ b/compiler/testData/diagnostics/tests/regressions/Jet17.kt @@ -2,5 +2,5 @@ class WithC() { val a = 1 - val b = $a // error here, but must not be + val b = a } diff --git a/compiler/testData/diagnostics/tests/regressions/kt575.kt b/compiler/testData/diagnostics/tests/regressions/kt575.kt index 67c36dd42cc..45c9def4f26 100644 --- a/compiler/testData/diagnostics/tests/regressions/kt575.kt +++ b/compiler/testData/diagnostics/tests/regressions/kt575.kt @@ -12,7 +12,7 @@ class Creature() { var bbb : Int init { - $bbb = 1 + bbb = 1 } } @@ -20,7 +20,7 @@ class Creature() { var ccc : Int init { - $ccc = 2 + ccc = 2 } } diff --git a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt deleted file mode 100644 index 3678c3f7272..00000000000 --- a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt +++ /dev/null @@ -1,8 +0,0 @@ -// http://youtrack.jetbrains.net/issue/KT-421 -// KT-421 Strange 'unresolved' bug with backing fields - -class A() { - val c = 1 - val a = b - val b = $c // '$c' is unresolved -} diff --git a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.txt b/compiler/testData/diagnostics/tests/scopes/kt421Scopes.txt deleted file mode 100644 index db39cb16cc1..00000000000 --- a/compiler/testData/diagnostics/tests/scopes/kt421Scopes.txt +++ /dev/null @@ -1,11 +0,0 @@ -package - -public final class A { - public constructor A() - public final val a: kotlin.Int = 1 - public final val b: kotlin.Int = 1 - public final val c: kotlin.Int = 1 - public open override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean - public open override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int - public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String -} diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt index a1c2907c90a..e8f59163d6f 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInClassStaticFields.kt @@ -18,7 +18,7 @@ class Test { var prop4 : Int = 13 fun incProp4() { - $prop4++ + prop4++ } public var prop5 : Int = 14 diff --git a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt index 862447b5961..266dc97147e 100644 --- a/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt +++ b/compiler/testData/loadJava/compiledKotlin/classObject/classObjectInTraitStaticFields.kt @@ -18,7 +18,7 @@ interface Test { var prop4 : Int = 13 fun incProp4() { - $prop4++ + prop4++ } public var prop5 : Int = 14 diff --git a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java index da2ad9fa1e8..61015c45b2e 100644 --- a/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java @@ -1362,12 +1362,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("compiler/testData/diagnostics/tests/backingField"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("CustomGetSet.kt") - public void testCustomGetSet() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetSet.kt"); - doTest(fileName); - } - @TestMetadata("CustomGetVal.kt") public void testCustomGetVal() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/CustomGetVal.kt"); @@ -1458,12 +1452,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } - @TestMetadata("kt462BackingFieldsResolve.kt") - public void testKt462BackingFieldsResolve() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt462BackingFieldsResolve.kt"); - doTest(fileName); - } - @TestMetadata("kt782packageLevel.kt") public void testKt782packageLevel() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/kt782packageLevel.kt"); @@ -1476,36 +1464,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } - @TestMetadata("ReadForwardInAnonymous.kt") - public void testReadForwardInAnonymous() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadForwardInAnonymous.kt"); - doTest(fileName); - } - - @TestMetadata("ReadForwardInPropertyInitializer.kt") - public void testReadForwardInPropertyInitializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadForwardInPropertyInitializer.kt"); - doTest(fileName); - } - - @TestMetadata("ReadInAnonymous.kt") - public void testReadInAnonymous() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInAnonymous.kt"); - doTest(fileName); - } - - @TestMetadata("ReadInAnotherPropertyIntializer.kt") - public void testReadInAnotherPropertyIntializer() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInAnotherPropertyIntializer.kt"); - doTest(fileName); - } - - @TestMetadata("ReadInFunction.kt") - public void testReadInFunction() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadInFunction.kt"); - doTest(fileName); - } - @TestMetadata("ReadNonexistentAbstractPropertyInAnonymous.kt") public void testReadNonexistentAbstractPropertyInAnonymous() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/backingField/ReadNonexistentAbstractPropertyInAnonymous.kt"); @@ -12852,12 +12810,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest { doTest(fileName); } - @TestMetadata("kt421Scopes.kt") - public void testKt421Scopes() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt421Scopes.kt"); - doTest(fileName); - } - @TestMetadata("kt587.kt") public void testKt587() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/kt587.kt"); diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java index dcecb8902a4..b599269f6fe 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -5650,24 +5650,12 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt535.kt") - public void testKt535() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt535.kt"); - doTest(fileName); - } - @TestMetadata("kt560.kt") public void testKt560() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt560.kt"); doTest(fileName); } - @TestMetadata("kt640.kt") - public void testKt640() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt640.kt"); - doTest(fileName); - } - @TestMetadata("kt694.kt") public void testKt694() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/objects/kt694.kt"); @@ -7768,12 +7756,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt511.kt") - public void testKt511() throws Exception { - String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/kt511.kt"); - doTest(fileName); - } - @TestMetadata("primitiveTypeInfo.kt") public void testPrimitiveTypeInfo() throws Exception { String fileName = JetTestUtils.navigationMetadata("compiler/testData/codegen/box/typeInfo/primitiveTypeInfo.kt"); diff --git a/eval4j/src/org/jetbrains/eval4j/values.kt b/eval4j/src/org/jetbrains/eval4j/values.kt index eb12f09fb3c..0d28cbd561b 100644 --- a/eval4j/src/org/jetbrains/eval4j/values.kt +++ b/eval4j/src/org/jetbrains/eval4j/values.kt @@ -85,7 +85,7 @@ public open class ObjectValue(value: Any?, asmType: Type): AbstractValue(v class NewObjectValue(asmType: Type): ObjectValue(null, asmType) { override var value: Any? = null get(): Any? { - return $value ?: throw IllegalStateException("Trying to access an unitialized object: $this") + return field ?: throw IllegalStateException("Trying to access an unitialized object: $this") } } diff --git a/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinHistoryHighlighter.kt b/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinHistoryHighlighter.kt index 98198e679ee..f6253685cc5 100644 --- a/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinHistoryHighlighter.kt +++ b/idea/idea-repl/src/org/jetbrains/kotlin/console/highlight/KotlinHistoryHighlighter.kt @@ -36,7 +36,7 @@ public class KotlinHistoryHighlighter(private val runner: KotlinConsoleRunner ) else runner.changeConsoleEditorIndicator(ReplIcons.EDITOR_INDICATOR) - $isReadLineMode = value + field = value } fun printNewCommandInHistory(trimmedCommandText: String) { diff --git a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt index f1e15d652c6..f8d34970f13 100644 --- a/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt +++ b/idea/src/org/jetbrains/kotlin/idea/inspections/KotlinCleanupInspection.kt @@ -90,7 +90,7 @@ public class KotlinCleanupInspection(): LocalInspectionTool(), CleanupLocalInspe ErrorsJvm.POSITIONED_VALUE_ARGUMENT_FOR_JAVA_ANNOTATION, Errors.DEPRECATED_SYMBOL_WITH_MESSAGE, Errors.NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION, - Errors.BACKING_FIELD_SYNTAX_DEPRECATED, + Errors.BACKING_FIELD_OLD_SYNTAX, Errors.OPERATOR_MODIFIER_REQUIRED, Errors.INFIX_MODIFIER_REQUIRED, Errors.CALLABLE_REFERENCE_TO_MEMBER_OR_EXTENSION_WITH_EMPTY_LHS, diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 7350fc35ac8..4be6ac73751 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -324,9 +324,9 @@ public class QuickFixRegistrar : QuickFixContributor { NON_CONST_VAL_USED_IN_CONSTANT_EXPRESSION.registerFactory(ConstFixFactory) - BACKING_FIELD_SYNTAX_DEPRECATED.registerFactory(MigrateBackingFieldSyntaxFix) - BACKING_FIELD_USAGE_DEPRECATED.registerFactory(MigrateBackingFieldUsageFix) - BACKING_FIELD_USAGE_DEPRECATED.registerFactory(IntroduceBackingPropertyFix) + BACKING_FIELD_OLD_SYNTAX.registerFactory(MigrateBackingFieldSyntaxFix) + BACKING_FIELD_USAGE_FORBIDDEN.registerFactory(MigrateBackingFieldUsageFix) + BACKING_FIELD_USAGE_FORBIDDEN.registerFactory(IntroduceBackingPropertyFix) OPERATOR_MODIFIER_REQUIRED.registerFactory(ModifierFixFactory(JetTokens.OPERATOR_KEYWORD)) INFIX_MODIFIER_REQUIRED.registerFactory(ModifierFixFactory(JetTokens.INFIX_KEYWORD)) diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt index cf350ec6e71..614f9e2075c 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeInfo.kt @@ -66,7 +66,7 @@ public open class JetChangeInfo( if (value != null && value !in newParameters) { newParameters.add(value) } - $receiverParameterInfo = value + field = value } private val newParameters = parameterInfos.toArrayList() @@ -155,7 +155,7 @@ public open class JetChangeInfo( public var primaryPropagationTargets: Collection = emptyList() set(value: Collection) { - $primaryPropagationTargets = value + field = value val result = LinkedHashSet() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt index e1b0a10ff48..8d1f6dd06a9 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureData.kt @@ -52,7 +52,7 @@ public class JetChangeSignatureData( override val receiver: JetParameterInfo? init { - $receiver = createReceiverInfoIfNeeded() + receiver = createReceiverInfoIfNeeded() val valueParameters = when { baseDeclaration is JetFunction -> baseDeclaration.getValueParameters() diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt index 032b9034536..c3690ef80e5 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetMutableMethodDescriptor.kt @@ -26,7 +26,7 @@ public class JetMutableMethodDescriptor(override val original: JetMethodDescript if (value != null && value !in parameters) { parameters.add(value) } - $receiver = value + field = value } public fun addParameter(parameter: JetParameterInfo) { diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt index c5060da8124..8d9facf05dd 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceParameter/KotlinInplaceParameterIntroducer.kt @@ -101,7 +101,7 @@ public class KotlinInplaceParameterIntroducer( var addedRange: TextRange? = null private set - var text: String + var text: String = "" private set val rangesToRemove: List get() = _rangesToRemove @@ -163,7 +163,7 @@ public class KotlinInplaceParameterIntroducer( } } - $text = builder.toString() + text = builder.toString() } } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt index 78140cce632..385f6d95ff1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/introduce/introduceProperty/KotlinInplacePropertyIntroducer.kt @@ -62,7 +62,7 @@ public class KotlinInplacePropertyIntroducer( set(value: ExtractionTarget) { if (value == currentTarget) return - $currentTarget = value + field = value runWriteActionAndRestartRefactoring { with (extractionResult.config) { extractionResult = copy(generatorOptions = generatorOptions.copy(target = currentTarget)).generateDeclaration(property) diff --git a/idea/testData/checker/AnonymousInitializers.kt b/idea/testData/checker/AnonymousInitializers.kt index 0e69a15ce42..0ab0483f4f2 100644 --- a/idea/testData/checker/AnonymousInitializers.kt +++ b/idea/testData/checker/AnonymousInitializers.kt @@ -13,7 +13,7 @@ interface NoC { class WithC() { val x : Int init { - $x = 1 + $x = 1 $y = 2 val b = x diff --git a/idea/testData/checker/Constructors.kt b/idea/testData/checker/Constructors.kt index 727c3a26b0e..204242dcba3 100644 --- a/idea/testData/checker/Constructors.kt +++ b/idea/testData/checker/Constructors.kt @@ -28,7 +28,7 @@ class WithCPI_Dup(x : Int) { class WithCPI(x : Int) { val a = 1 - val b : Int = $a + val b : Int = $a val xy : Int = x } diff --git a/idea/testData/checker/regression/Jet17.kt b/idea/testData/checker/regression/Jet17.kt index e6cf06c54dc..72d81949e12 100644 --- a/idea/testData/checker/regression/Jet17.kt +++ b/idea/testData/checker/regression/Jet17.kt @@ -2,5 +2,5 @@ class WithC() { val a = 1 - val b = $a // error here, but must not be + val b = $a // error here, but must not be } \ No newline at end of file diff --git a/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt b/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt index 13e700fa42c..3764c1b763e 100644 --- a/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt +++ b/idea/testData/debugger/tinyApp/src/stepping/stepInto/accessors.kt @@ -22,7 +22,7 @@ class A { return 1 } set(i: Int) { - $prop = i + field = i } } } diff --git a/idea/testData/highlighter/Variables.kt b/idea/testData/highlighter/Variables.kt index fde4f8b9dcf..9f857031533 100644 --- a/idea/testData/highlighter/Variables.kt +++ b/idea/testData/highlighter/Variables.kt @@ -7,7 +7,7 @@ val Int.y : Int = 1 get() { - return 5.sq + $y + x + return 5.sq + field + x } class Foo(val a : Int, b : String) { diff --git a/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt b/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt index d2e0917214a..2b9ca2dd3bf 100644 --- a/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt +++ b/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt @@ -1,9 +1,5 @@ class Foo { var x = "" - get() = $x + "!" - set(value) { $x = value + "!" } - - fun foo(): String { - return $x - } + get() = field + "!" + set(value) { field = value + "!" } } diff --git a/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt.after b/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt.after index 0c0039698e4..606adbb751c 100644 --- a/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt.after +++ b/idea/testData/intentions/introduceBackingProperty/backingFieldRef.kt.after @@ -3,8 +3,4 @@ class Foo { var x: String get() = _x + "!" set(value) { _x = value + "!" } - - fun foo(): String { - return _x - } } diff --git a/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt b/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt deleted file mode 100644 index 693211ee245..00000000000 --- a/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt +++ /dev/null @@ -1,9 +0,0 @@ -class A { - var a: Int - var b: Int - - init { - $a = 1 - b = 2 - } -} diff --git a/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt.after b/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt.after deleted file mode 100644 index 4d7d49cf269..00000000000 --- a/idea/testData/intentions/moveAssignmentToInitializer/backingField.kt.after +++ /dev/null @@ -1,8 +0,0 @@ -class A { - var a: Int = 1 - var b: Int - - init { - b = 2 - } -} diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt index ecbc9a486de..482300fc24b 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt +++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt @@ -1,5 +1,5 @@ // "Make 'i' not abstract" "true" class B { abstract val i: Int = 0 - get() = $i + get() = field } \ No newline at end of file diff --git a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after index 89c68aca986..c8df4e86d4a 100644 --- a/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after +++ b/idea/testData/quickfix/abstract/abstractPropertyWithGetter1.kt.after @@ -1,5 +1,5 @@ // "Make 'i' not abstract" "true" class B { val i: Int = 0 - get() = $i + get() = field } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameFieldIdentifier/after/test.kt b/idea/testData/refactoring/rename/renameFieldIdentifier/after/test.kt index b021cbbc0cb..50037226269 100644 --- a/idea/testData/refactoring/rename/renameFieldIdentifier/after/test.kt +++ b/idea/testData/refactoring/rename/renameFieldIdentifier/after/test.kt @@ -1,6 +1,6 @@ class Exp(p1: String) { val /*rename*/prop11: String = p1 get(): String { - return $prop11 + return field } } \ No newline at end of file diff --git a/idea/testData/refactoring/rename/renameFieldIdentifier/before/test.kt b/idea/testData/refactoring/rename/renameFieldIdentifier/before/test.kt index 0e23e7939ad..4c06483380a 100644 --- a/idea/testData/refactoring/rename/renameFieldIdentifier/before/test.kt +++ b/idea/testData/refactoring/rename/renameFieldIdentifier/before/test.kt @@ -1,6 +1,6 @@ class Exp(p1: String) { val /*rename*/prop1: String = p1 get(): String { - return $prop1 + return field } } \ No newline at end of file diff --git a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java index 08b20cc17fe..f88d1f724d5 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/intentions/IntentionTestGenerated.java @@ -5493,12 +5493,6 @@ public class IntentionTestGenerated extends AbstractIntentionTest { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("idea/testData/intentions/moveAssignmentToInitializer"), Pattern.compile("^([\\w\\-_]+)\\.kt$"), true); } - @TestMetadata("backingField.kt") - public void testBackingField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/backingField.kt"); - doTest(fileName); - } - @TestMetadata("comment.kt") public void testComment() throws Exception { String fileName = JetTestUtils.navigationMetadata("idea/testData/intentions/moveAssignmentToInitializer/comment.kt"); diff --git a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt index 8bf9d3c7818..e9f07618758 100644 --- a/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt +++ b/j2k/src/org/jetbrains/kotlin/j2k/ast/Element.kt @@ -72,10 +72,10 @@ abstract class Element { set(value) { // do not assign prototypes to singleton instances if (canBeSingleton) { - $prototypes = listOf() + field = listOf() return } - $prototypes = value + field = value } protected open val canBeSingleton: Boolean diff --git a/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt b/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt index a909d94a91a..1c11f0893af 100644 --- a/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt +++ b/jps-plugin/testData/incremental/lookupTracker/classifierMembers/foo.kt @@ -10,8 +10,8 @@ import bar.* get() = /*c:foo.A*/b var d: /*c:foo.A c:foo.A.Companion p:foo*/String = "ddd" - get() = /*c:foo.A*/$d - set(v) { /*c:foo.A*/$d = v } + get() = field + set(v) { field = v } fun foo() { /*c:foo.A*/a diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java index cae8c0853dd..9c09ec6ab77 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/DefaultArgumentsTest.java @@ -60,10 +60,6 @@ public class DefaultArgumentsTest extends SingleFileTranslationTest { checkFooBoxIsOk(); } - public void testOverrideValWithDefaultValue() throws Exception { - checkFooBoxIsOk(); - } - public void testVirtualCallWithDefArg() throws Exception { checkFooBoxIsOk(); } diff --git a/js/js.translator/testData/defaultArguments/cases/overrideValWithDefaultValue.kt b/js/js.translator/testData/defaultArguments/cases/overrideValWithDefaultValue.kt deleted file mode 100644 index f310471af71..00000000000 --- a/js/js.translator/testData/defaultArguments/cases/overrideValWithDefaultValue.kt +++ /dev/null @@ -1,15 +0,0 @@ -package foo - -open class A(open val bar: Int = 2) { - val barA = $bar -} - -class B(override val bar: Int = 3) : A() - - -fun box(): String { - val b = B() - if (b.bar != 3) return "b.bar != 3, it: " + b.bar - if (b.barA != 2) return "b.barA != 2, it: " + b.barA - return "OK" -} \ No newline at end of file diff --git a/js/js.translator/testData/examples/cases/initializerBlock.kt b/js/js.translator/testData/examples/cases/initializerBlock.kt index bb906e5c1ea..9b5131b0b2f 100644 --- a/js/js.translator/testData/examples/cases/initializerBlock.kt +++ b/js/js.translator/testData/examples/cases/initializerBlock.kt @@ -2,7 +2,7 @@ class C() { public var f: Int init { - $f = 610 + f = 610 } } diff --git a/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt b/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt index 8cc99b0469b..4eaea284798 100644 --- a/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt +++ b/js/js.translator/testData/expression/misc/cases/classWithoutPackage.kt @@ -1,6 +1,6 @@ class A(var a: Int) { init { - $a = 3 + 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 11b9b452c72..d033dba82af 100644 --- a/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt +++ b/js/js.translator/testData/expression/misc/cases/funInConstructorBlock.kt @@ -4,7 +4,7 @@ class A() { fun lold() = true val p: () -> Boolean init { - $p = { { lold() }() } + p = { { lold() }() } } } diff --git a/js/js.translator/testData/propertyAccess/cases/backendField.kt b/js/js.translator/testData/propertyAccess/cases/backendField.kt index 02140744966..8a7aaa98bd5 100644 --- a/js/js.translator/testData/propertyAccess/cases/backendField.kt +++ b/js/js.translator/testData/propertyAccess/cases/backendField.kt @@ -5,13 +5,13 @@ class A { get() = field + 1 fun getA(): Int { - return $a + return a } } fun box(): String { val a = A() if (a.a != 2) return "A().a != 2, it: ${a.a}" - if (a.getA() != 1) return "A().getA() != 1, it: ${a.getA()}" + if (a.getA() != 2) return "A().getA() != 2, it: ${a.getA()}" return "OK" } \ No newline at end of file diff --git a/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt b/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt index c1efc2b3f40..fc7aa760134 100644 --- a/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt +++ b/js/js.translator/testData/propertyAccess/cases/initValInConstructor.kt @@ -11,7 +11,7 @@ class A { var aaR = 0 init { a = 1 - $aa = 2 + aa = 2 aR = a aaR = aa @@ -29,7 +29,7 @@ class B { var aaR = 0 init { a = 3 - $aa = 4 + aa = 4 aR = a aaR = aa diff --git a/js/js.translator/testData/simple/cases/simpleInitializer.kt b/js/js.translator/testData/simple/cases/simpleInitializer.kt index 3b26837109c..6c0eeb8525a 100644 --- a/js/js.translator/testData/simple/cases/simpleInitializer.kt +++ b/js/js.translator/testData/simple/cases/simpleInitializer.kt @@ -3,7 +3,7 @@ package foo class Test() { var a: Int init { - $a = 3 + a = 3 } }