diff --git a/idea/testData/checker/Abstract.jet b/idea/testData/checker/Abstract.jet index 5b8e02c093d..22c81201d83 100644 --- a/idea/testData/checker/Abstract.jet +++ b/idea/testData/checker/Abstract.jet @@ -157,10 +157,9 @@ abstract class B1( class B2() : B1(1, "r") {} abstract class B3(i: Int) { - this(): this(1) } fun foo(a: B3) { - val a = B3() + val a = B3(1) val b = B1(2, "s") } \ No newline at end of file diff --git a/idea/testData/checker/AnonymousInitializers.jet b/idea/testData/checker/AnonymousInitializers.jet index 921bf4cfb82..336ac97ce74 100644 --- a/idea/testData/checker/AnonymousInitializers.jet +++ b/idea/testData/checker/AnonymousInitializers.jet @@ -27,8 +27,4 @@ class WithC() { val zzz = $a } - this(a : Int) : this() { - val b = x - } - } \ No newline at end of file diff --git a/idea/testData/checker/Constructors.jet b/idea/testData/checker/Constructors.jet index 6ee22576d6c..016a4c74ffe 100644 --- a/idea/testData/checker/Constructors.jet +++ b/idea/testData/checker/Constructors.jet @@ -8,24 +8,13 @@ class NoC2 : WithC1 class NoC3 : WithC1() class WithC2() : WithC1 -class NoPC { - this() {} +class NoPC { } class WithPC0() { - this(a : Int) : this() {} } class WithPC1(a : Int) { - this() {} - - this(b : Long) : this("") {} - - this(s : String) : this(1) {} - - this(b : Char) : this("", 2) {} - - this(b : Byte) : this(""), this(1) {} } diff --git a/idea/testData/checker/FunctionReturnTypes.jet b/idea/testData/checker/FunctionReturnTypes.jet index 16b238478e5..ef3ca6807b1 100644 --- a/idea/testData/checker/FunctionReturnTypes.jet +++ b/idea/testData/checker/FunctionReturnTypes.jet @@ -134,12 +134,6 @@ fun nonBlockNoReturnIfUnitInOneBranch(): Int = if (1 < 2) {} else val a = return 1 class A() { - this(a : Int) : this() { - if (a == 1) - return - return 1 - } - } fun illegalConstantBody(): Int = "s" fun illegalConstantBlock(): String { diff --git a/idea/testData/checker/Properties.jet b/idea/testData/checker/Properties.jet index b116ee187d4..6455f1aaac6 100644 --- a/idea/testData/checker/Properties.jet +++ b/idea/testData/checker/Properties.jet @@ -16,11 +16,11 @@ class Test() { var a : Int = 111 var b : Int get() = $a; set(x) {a = x; $a = x} - this(i : Int) : this() { + { $b = $a $a = $b a = $b - } + } fun f() { $b = $a a = $b diff --git a/idea/testData/checker/SupertypeListChecks.jet b/idea/testData/checker/SupertypeListChecks.jet index cbe946c5eaa..18ab8f86a19 100644 --- a/idea/testData/checker/SupertypeListChecks.jet +++ b/idea/testData/checker/SupertypeListChecks.jet @@ -22,7 +22,6 @@ trait T1 {} trait T2 {} trait Test() { - this(x : Int) {} } trait Test1 : C2() {} diff --git a/idea/testData/checker/TraitSupertypeList.jet b/idea/testData/checker/TraitSupertypeList.jet index cf3b2d0e236..107fbe5d82d 100644 --- a/idea/testData/checker/TraitSupertypeList.jet +++ b/idea/testData/checker/TraitSupertypeList.jet @@ -1,7 +1,6 @@ open class bar() trait Foo() : bar(), bar, bar { - this(x : Int) {} } trait Foo2 : bar, Foo { diff --git a/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet b/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet index 2f5c5fb9554..34c41a81e96 100644 --- a/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet +++ b/idea/testData/checker/regression/ScopeForSecondaryConstructors.jet @@ -7,12 +7,12 @@ this : Foo } - this(var bar : Int) : this(1, 1, 1) { - bar = 1 + { + bar = 1 this.bar 1 : Int - val a : Int =1 + val a : Int =1 this : Foo - } + } } diff --git a/idea/testData/checker/regression/ThisConstructorInGenericClass.jet b/idea/testData/checker/regression/ThisConstructorInGenericClass.jet deleted file mode 100644 index 074bec82a22..00000000000 --- a/idea/testData/checker/regression/ThisConstructorInGenericClass.jet +++ /dev/null @@ -1,3 +0,0 @@ -class Z() { - this(x : Int) : this() {} -} \ No newline at end of file