diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.kt index e5cdcc75457..3894b1275bf 100644 --- a/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.kt +++ b/compiler/fir/analysis-tests/testData/resolve/diagnostics/inapplicableLateinitModifier.kt @@ -3,36 +3,36 @@ object Delegate { operator fun setValue(instance: Any?, property: Any, value: String) {} } -lateinit var test: Int -lateinit var kest by Delegate +lateinit var test: Int +lateinit var kest by Delegate lateinit var good: String class A { - lateinit val fest = "10" + lateinit val fest = "10" lateinit var mest: String - lateinit var xest: String? - lateinit var nest: Int - lateinit var west: Char - lateinit var qest: Boolean - lateinit var aest: Short - lateinit var hest: Byte - lateinit var jest: Long - lateinit val dest: String - get() = "KEKER" + lateinit var xest: String? + lateinit var nest: Int + lateinit var west: Char + lateinit var qest: Boolean + lateinit var aest: Short + lateinit var hest: Byte + lateinit var jest: Long + lateinit val dest: String + get() = "KEKER" } class B { - lateinit var best: T + lateinit var best: T } class C { lateinit var pest: K - lateinit var vest: K? + lateinit var vest: K? } fun rest() { - lateinit var i: Int + lateinit var i: Int lateinit var a: A - lateinit var b: B = B() + lateinit var b: B = B() } diff --git a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.kt b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.kt index d6e91bf884b..bdadf0db4d7 100644 --- a/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.kt +++ b/compiler/fir/analysis-tests/testData/resolve/fromBuilder/simpleClass.kt @@ -15,7 +15,7 @@ class SomeClass : SomeInterface { get() = true set(value) {} - lateinit var fau: Double + lateinit var fau: Double } inline class InlineClass diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt index 0da46b5fa6e..5539b97ee64 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_3.fir.kt @@ -9,7 +9,7 @@ fun test() { val a1 = "" val a2 = 0 const val a3 = 0 - lateinit val a4 = 0 + lateinit val a4 = 0 val a5 by Delegate() val a6 by Delegate<T>() } diff --git a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt index 7e71a1f6c70..e86865131dd 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/localVariablesWithTypeParameters_1_4.fir.kt @@ -9,7 +9,7 @@ fun test() { val a1 = "" val a2 = 0 const val a3 = 0 - lateinit val a4 = 0 + lateinit val a4 = 0 val a5 by Delegate() val a6 by Delegate<T>() } diff --git a/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.fir.kt b/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.fir.kt deleted file mode 100644 index 3a70287a722..00000000000 --- a/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.fir.kt +++ /dev/null @@ -1,18 +0,0 @@ -// !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE -// !LANGUAGE: +LateinitLocalVariables - -import kotlin.reflect.KProperty - -object Delegate { - operator fun getValue(instance: Any?, property: KProperty<*>) : String = "" - operator fun setValue(instance: Any?, property: KProperty<*>, value: String) {} -} - - -fun test() { - lateinit val test0: Any - lateinit var test1: Int - lateinit var test2: Any? - lateinit var test3: String = "" - lateinit var test4 by Delegate -} diff --git a/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt b/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt index 6aa250c0593..2acd899919b 100644 --- a/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt +++ b/compiler/testData/diagnostics/tests/lateinit/local/inapplicableLateinitModifier.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !DIAGNOSTICS: -UNUSED_VALUE -UNUSED_VARIABLE -ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE // !LANGUAGE: +LateinitLocalVariables diff --git a/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.fir.kt b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.fir.kt index 7342803baed..976959c2304 100644 --- a/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.fir.kt +++ b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability.fir.kt @@ -8,12 +8,12 @@ class CustomDelegate { public abstract class A(lateinit var p2: String) { - public lateinit val a: String - lateinit val b: T + public lateinit val a: String + lateinit val b: T private lateinit var c: CharSequence - lateinit val d: String - get + lateinit val d: String + get public lateinit var e: String get @@ -23,22 +23,22 @@ public abstract class A(lateinit var p2: String) { lateinit var a: String } - lateinit var e1: V - lateinit var e2: String? - lateinit var e3: Int - lateinit var e4: Int? - lateinit var e5 = "A" + lateinit var e1: V + lateinit var e2: String? + lateinit var e3: Int + lateinit var e4: Int? + lateinit var e5 = "A" // With initializer, primitive - lateinit var e6 = 3 + lateinit var e6 = 3 - lateinit var e7 by CustomDelegate() + lateinit var e7 by CustomDelegate() - lateinit var e8: String - get() = "A" + lateinit var e8: String + get() = "A" - lateinit var e9: String - set(v) { field = v } + lateinit var e9: String + set(v) { field = v } abstract lateinit var e10: String @@ -47,7 +47,7 @@ public abstract class A(lateinit var p2: String) { lateinit var String.e12: String } -lateinit val topLevel: String +lateinit val topLevel: String lateinit var topLevelMutable: String public interface Intf { diff --git a/compiler/testData/diagnostics/tests/lateinit/modifierApplicability_lv12.fir.kt b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability_lv12.fir.kt index aadbc805a75..eeb08876d7f 100644 --- a/compiler/testData/diagnostics/tests/lateinit/modifierApplicability_lv12.fir.kt +++ b/compiler/testData/diagnostics/tests/lateinit/modifierApplicability_lv12.fir.kt @@ -8,12 +8,12 @@ class CustomDelegate { public abstract class A(lateinit var p2: String) { - public lateinit val a: String - lateinit val b: T + public lateinit val a: String + lateinit val b: T private lateinit var c: CharSequence - lateinit val d: String - get + lateinit val d: String + get public lateinit var e: String get @@ -23,22 +23,22 @@ public abstract class A(lateinit var p2: String) { lateinit var a: String } - lateinit var e1: V - lateinit var e2: String? - lateinit var e3: Int - lateinit var e4: Int? - lateinit var e5 = "A" + lateinit var e1: V + lateinit var e2: String? + lateinit var e3: Int + lateinit var e4: Int? + lateinit var e5 = "A" // With initializer, primitive - lateinit var e6 = 3 + lateinit var e6 = 3 - lateinit var e7 by CustomDelegate() + lateinit var e7 by CustomDelegate() - lateinit var e8: String - get() = "A" + lateinit var e8: String + get() = "A" - lateinit var e9: String - set(v) { field = v } + lateinit var e9: String + set(v) { field = v } abstract lateinit var e10: String @@ -47,7 +47,7 @@ public abstract class A(lateinit var p2: String) { lateinit var String.e12: String } -lateinit val topLevel: String +lateinit val topLevel: String lateinit var topLevelMutable: String public interface Intf { diff --git a/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.fir.kt b/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.fir.kt deleted file mode 100644 index 1abc684500f..00000000000 --- a/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.fir.kt +++ /dev/null @@ -1,14 +0,0 @@ -// !LANGUAGE: +LateinitTopLevelProperties - -object Delegate { - operator fun getValue(instance: Any?, property: Any) : String = "" - operator fun setValue(instance: Any?, property: Any, value: String) {} -} - -lateinit var testOk: String - -lateinit val testErr0: Any -lateinit var testErr1: Int -lateinit var testErr2: Any? -lateinit var testErr3: String = "" -lateinit var testErr4 by Delegate diff --git a/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.kt b/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.kt index 3b3153be226..71ca1171cab 100644 --- a/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.kt +++ b/compiler/testData/diagnostics/tests/properties/lateinitOnTopLevel.kt @@ -1,3 +1,4 @@ +// FIR_IDENTICAL // !LANGUAGE: +LateinitTopLevelProperties object Delegate {