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

Revert "[FE 1.0] Resolve setters through the new type inference infra"

Browse Source 
This reverts commit 6e191147b9.
This commit is contained in:
Mikhail Glukhikh
2022-09-12 11:28:30 +02:00
committed by Space
parent 8be08d903b
commit a9b8f6715b
12 changed files with 58 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/deprecated/candidateBehindHiddenPropertyAccessors.kt
Vendored
+2 -2
View File
@@ -44,9 +44,9 @@ fun test(c: C) {
<!DEPRECATION_ERROR!>v3<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799
v3 = ""
v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEPRECATION_ERROR!>v4<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEPRECATION_ERROR!>v5<!> // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
<!DEPRECATION_ERROR!>v5<!> = "" // DEPRECATION_ERROR in FE 1.0, see KT-48799
v6
v6 = ""
}
compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance_after.kt
Vendored
+1 -1
View File
@@ -132,5 +132,5 @@ fun use(
ned.p = 1
diff.<!DEPRECATION!>p<!>
diff.<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1
diff.<!DEPRECATION, DEPRECATION_ERROR!>p<!> = 1
}
compiler/testData/diagnostics/tests/deprecated/deprecatedPropertyInheritance_before.kt
Vendored
+1 -1
View File
@@ -132,5 +132,5 @@ fun use(
ned.p = 1
diff.<!DEPRECATION!>p<!>
diff.<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, DEPRECATION, UNRESOLVED_REFERENCE!>p<!> = 1
diff.<!DEPRECATION, DEPRECATION_ERROR!>p<!> = 1
}
compiler/testData/diagnostics/tests/deprecated/hiddenPropertyAccessors.kt
Vendored
+2 -2
View File
@@ -32,9 +32,9 @@ fun test() {
<!DEPRECATION_ERROR!>v3<!>
v3 = ""
v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = ""
<!DEPRECATION_ERROR!>v4<!> = ""
<!DEPRECATION_ERROR!>v5<!>
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = ""
<!DEPRECATION_ERROR!>v5<!> = ""
<!UNRESOLVED_REFERENCE!>v6<!>
<!UNRESOLVED_REFERENCE!>v6<!> = ""
}
compiler/testData/diagnostics/tests/resolve/dslMarker/properties.kt
Vendored
+2 -2
View File
@@ -35,8 +35,8 @@ fun test() {
bar {
<!DSL_SCOPE_VIOLATION!>a<!> + 1
<!DSL_SCOPE_VIOLATION!>a<!> += <!DSL_SCOPE_VIOLATION!>a<!> + 1
<!DSL_SCOPE_VIOLATION!>a<!>++
<!DSL_SCOPE_VIOLATION, DSL_SCOPE_VIOLATION!>a<!> += <!DSL_SCOPE_VIOLATION!>a<!> + 1
<!DSL_SCOPE_VIOLATION, DSL_SCOPE_VIOLATION!>a<!>++
<!DSL_SCOPE_VIOLATION!>a1<!> + 1
<!DSL_SCOPE_VIOLATION!>a1<!> += <!DSL_SCOPE_VIOLATION!>a1<!> + 1
compiler/testData/diagnostics/tests/secondaryConstructors/nestedExtendsInner.kt
Vendored
+1 -1
View File
@@ -2,6 +2,6 @@ class A {
open inner class Inner
class Nested : Inner {
<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>constructor()<!>
<!INACCESSIBLE_OUTER_CLASS_EXPRESSION!>constructor()<!><!UNRESOLVED_REFERENCE!><!>
}
}
compiler/testData/diagnostics/tests/sourceCompatibility/apiVersion/propertyAccessors.kt
Vendored
+2 -2
View File
@@ -39,9 +39,9 @@ fun test() {
<!API_NOT_AVAILABLE!>v3<!>
v3 = ""
v4
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v4<!> = ""
<!API_NOT_AVAILABLE!>v4<!> = ""
<!API_NOT_AVAILABLE!>v5<!>
<!DEBUG_INFO_UNRESOLVED_WITH_TARGET, UNRESOLVED_REFERENCE!>v5<!> = ""
<!API_NOT_AVAILABLE!>v5<!> = ""
<!UNRESOLVED_REFERENCE!>v6<!>
<!UNRESOLVED_REFERENCE!>v6<!> = ""
<!API_NOT_AVAILABLE!>v7<!>