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

[FIR] Add diagnostics for object related problems

Browse Source
This commit is contained in:
Nick
2020-07-30 17:11:15 +03:00
committed by Mikhail Glukhikh
parent 694d3cad4e
commit 26e3a111d6
32 changed files with 419 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/ClassObjects.fir.kt
Vendored
+3 -3
View File
@@ -5,7 +5,7 @@ class A {
companion object {
val x = 1
}
companion object {
companion <!MANY_COMPANION_OBJECTS!>object<!> {
val x = 1
}
}
@@ -14,10 +14,10 @@ class AA {
companion object {
val x = 1
}
companion object A {
companion <!MANY_COMPANION_OBJECTS!>object A<!> {
val x = 1
}
companion object AA {
companion <!MANY_COMPANION_OBJECTS!>object AA<!> {
val x = 1
}
}
compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.fir.kt
Vendored
+4 -4
View File
@@ -2,16 +2,16 @@ class A {
inner class I {
companion object A
companion object B
companion <!MANY_COMPANION_OBJECTS!>object B<!>
companion object C
companion <!MANY_COMPANION_OBJECTS!>object C<!>
}
}
object O {
companion object A
companion object B
companion <!MANY_COMPANION_OBJECTS!>object B<!>
companion object C
companion <!MANY_COMPANION_OBJECTS!>object C<!>
}
compiler/testData/diagnostics/tests/classObjects/typeParametersInObject.fir.kt
Vendored
+8 -8
View File
@@ -1,21 +1,21 @@
object A<T>
object B<in T, out R>
object C<T : Comparable<T>>
<!TYPE_PARAMETERS_IN_OBJECT!>object A<!><T>
<!TYPE_PARAMETERS_IN_OBJECT!>object B<!><in T, out R>
<!TYPE_PARAMETERS_IN_OBJECT!>object C<!><T : Comparable<T>>
class D {
companion object<T>
companion <!TYPE_PARAMETERS_IN_OBJECT!>object<!><T>
}
class E {
companion object<in T, out R>
companion <!TYPE_PARAMETERS_IN_OBJECT!>object<!><in T, out R>
}
class F {
companion object C<T : Comparable<T>>
companion <!TYPE_PARAMETERS_IN_OBJECT!>object C<!><T : Comparable<T>>
}
class G {
companion object F<T>
companion <!TYPE_PARAMETERS_IN_OBJECT!>object F<!><T>
}
object H<T, R><!CONSTRUCTOR_IN_OBJECT!>()<!>
<!TYPE_PARAMETERS_IN_OBJECT!>object H<!><T, R><!CONSTRUCTOR_IN_OBJECT!>()<!>