azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FIR checker: add diagnostics for backing fields

Browse Source
This commit is contained in:
Jinseong Jeon
2021-02-02 13:25:59 -08:00
committed by Mikhail Glukhikh
parent a88b82d8ff
commit bd37badf29
27 changed files with 89 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/Abstract.fir.kt
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ package MyPackage
abstract var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = 0; get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
abstract val e2: Int get() = a
abstract val e3: Int = 0; get() = a
compiler/testData/diagnostics/tests/AbstractInAbstractClass.fir.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ abstract class MyAbstractClass() {
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
val e: Int get() = a
val e1: Int = 0; get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
abstract val e2: Int <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
compiler/testData/diagnostics/tests/AbstractInClass.fir.kt
Vendored
+1 -1
View File
@@ -18,7 +18,7 @@ class MyClass() {
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> var c3: Int = 0; set(v: Int) { field = v }
val e: Int get() = a
val e1: Int = 0; get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e2: Int get() = a
<!ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS!>abstract<!> val e3: Int = 0; get() = a
compiler/testData/diagnostics/tests/AbstractInTrait.fir.kt
Vendored
+5 -5
View File
@@ -12,8 +12,8 @@ interface MyTrait {
abstract var b2: Int private set
abstract var b3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; private set
var c: Int set(v: Int) { field = v }
var c1: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; set(v: Int) { field = v }
<!BACKING_FIELD_IN_INTERFACE!>var c: Int<!> set(v: Int) { field = v }
<!BACKING_FIELD_IN_INTERFACE!>var c1: Int<!> = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; set(v: Int) { field = v }
abstract var c2: Int <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
@@ -32,8 +32,8 @@ interface MyTrait {
var i: Int abstract get abstract set
var i1: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; abstract get abstract set
var j: Int get() = i; abstract set
var j1: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; get() = i; abstract set
<!BACKING_FIELD_IN_INTERFACE!>var j: Int<!> get() = i; abstract set
<!BACKING_FIELD_IN_INTERFACE!>var j1: Int<!> = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; get() = i; abstract set
var k: Int abstract set
var k1: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; abstract set
@@ -41,5 +41,5 @@ interface MyTrait {
var l: Int abstract get abstract set
var l1: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>; abstract get abstract set
var n: Int abstract get abstract set(v: Int) {}
<!BACKING_FIELD_IN_INTERFACE!>var n: Int<!> abstract get abstract set(v: Int) {}
}
compiler/testData/diagnostics/tests/Constructors.fir.kt
Vendored
+1 -1
View File
@@ -29,7 +29,7 @@ class WithCPI(x : Int) {
class NoCPI {
val a = 1
var ab = 1
var ab = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>
get() = 1
set(v) {}
}
compiler/testData/diagnostics/tests/Properties.fir.kt
Vendored
+2 -2
View File
@@ -5,11 +5,11 @@ var x : Int = 1 + x
field = 1.toLong()
}
val xx : Int = 1 + x
val xx : Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1 + x<!>
get() : Int = 1
set(value : Long) {}
val p : Int = 1
val p : Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>1<!>
get() = 1
class Test() {
compiler/testData/diagnostics/tests/backingField/ExtensionProperty.fir.kt
Vendored
-17
View File
@@ -1,17 +0,0 @@
// See KT-9303: synthetic field variable does not exist for extension properties
val String.foo: Int
get() {
// No shadowing here
val field = 42
return field
}
val String.bar: Int = 13
// Error
get() = <!UNRESOLVED_REFERENCE!>field<!>
class My {
val String.x: Int = 7
// Error
get() = <!UNRESOLVED_REFERENCE!>field<!>
}
compiler/testData/diagnostics/tests/backingField/ExtensionProperty.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// See KT-9303: synthetic field variable does not exist for extension properties
val String.foo: Int
get() {
compiler/testData/diagnostics/tests/backingField/FieldInInterface.fir.kt
Vendored
-4
View File
@@ -1,4 +0,0 @@
interface My {
val x: Int = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>
get() = field
}
compiler/testData/diagnostics/tests/backingField/FieldInInterface.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
interface My {
<!BACKING_FIELD_IN_INTERFACE!>val x: Int<!> = <!PROPERTY_INITIALIZER_IN_INTERFACE!>0<!>
get() = field
compiler/testData/diagnostics/tests/enum/AbstractInEnum.fir.kt
Vendored
+1 -1
View File
@@ -20,7 +20,7 @@ enum class MyEnum() {
abstract var c3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_SETTER!>set(v: Int) { field = v }<!>
val e: Int get() = a
val e1: Int = 0; get() = a
val e1: Int = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>0<!>; get() = a
abstract val e2: Int <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
abstract val e3: Int = <!ABSTRACT_PROPERTY_WITH_INITIALIZER!>0<!>; <!ABSTRACT_PROPERTY_WITH_GETTER!>get() = a<!>
compiler/testData/diagnostics/tests/modifiers/const/types.fir.kt
Vendored
+1 -1
View File
@@ -13,5 +13,5 @@ const val intArrayConst: IntArray = intArrayOf()
const val unresolvedConst1 = <!UNRESOLVED_REFERENCE!>Unresolved<!>
const var unresolvedConst2 = <!UNRESOLVED_REFERENCE!>Unresolved<!>
const val unresolvedConst3 = <!UNRESOLVED_REFERENCE!>Unresolved<!>
const val unresolvedConst3 = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD, UNRESOLVED_REFERENCE!>Unresolved<!>
get() = 10
compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.fir.kt
Vendored
+5 -5
View File
@@ -2,11 +2,11 @@
package i
val <T> List<T>.length = <!UNRESOLVED_REFERENCE!>size<!>
val <T> List<T>.length = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD, UNRESOLVED_REFERENCE!>size<!>
val <T> List<T>.length1 : Int get() = size
val String.bd = <!NO_THIS!>this<!> + "!"
val String.bd = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!><!NO_THIS!>this<!> + "!"<!>
val String.bd1 : String get() = this + "!"
@@ -15,7 +15,7 @@ class A {
val ii : Int = 1
}
val A.foo = <!UNRESOLVED_REFERENCE!>ii<!>
val A.foo = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD, UNRESOLVED_REFERENCE!>ii<!>
val A.foo1 : Int get() = ii
@@ -24,8 +24,8 @@ class C {
inner class D {}
}
val C.foo : C.D = <!UNRESOLVED_REFERENCE!>D<!>()
val C.foo : C.D = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!><!UNRESOLVED_REFERENCE!>D<!>()<!>
val C.bar : C.D = C().D()
val C.bar : C.D = C().<!EXTENSION_PROPERTY_WITH_BACKING_FIELD!>D()<!>
val C.foo1 : C.D get() = D()
compiler/testData/diagnostics/tests/thisAndSuper/thisInPropertyInitializer.fir.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
interface Base {
fun foo()
}
val String.test: Base = object: Base {
val String.test: Base = <!EXTENSION_PROPERTY_WITH_BACKING_FIELD!>object: Base<!> {
override fun foo() {
<!UNRESOLVED_LABEL!>this@test<!>
}
compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.3.fir.kt
Vendored
+1 -1
View File
@@ -56,7 +56,7 @@ val topLevelAnonymousFunction = fun (x: Boolean) {
contract { returns() implies (x) }
}
var topLevelPropertyAccessors: Int? = 42
var topLevelPropertyAccessors: Int? = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>42<!>
get() {
contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
return 42
compiler/testData/diagnostics/testsWithStdLib/contracts/dsl/errors/contractCallSites.1.4.fir.kt
Vendored
+1 -1
View File
@@ -71,7 +71,7 @@ val topLevelAnonymousFunction = fun (x: Boolean) {
contract { returns() implies (x) }
}
var topLevelPropertyAccessors: Int? = 42
var topLevelPropertyAccessors: Int? = <!PROPERTY_INITIALIZER_NO_BACKING_FIELD!>42<!>
get() {
contract { returns() implies (<!UNRESOLVED_REFERENCE!>field<!> != null) }
return 42