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

FIR: fix MANY_COMPANION_OBJECTS positioning

Browse Source
This commit is contained in:
Mikhail Glukhikh
2021-03-01 12:15:17 +03:00
parent 724ca1d3ee
commit 6fee46316e
8 changed files with 33 additions and 11 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 <!REDECLARATION!>object<!> {
val x = 1
}
companion <!MANY_COMPANION_OBJECTS, REDECLARATION!>object<!> {
<!MANY_COMPANION_OBJECTS!>companion<!> <!REDECLARATION!>object<!> {
val x = 1
}
}
@@ -14,10 +14,10 @@ class AA {
companion object {
val x = 1
}
companion <!MANY_COMPANION_OBJECTS!>object A<!> {
<!MANY_COMPANION_OBJECTS!>companion<!> object A {
val x = 1
}
companion <!MANY_COMPANION_OBJECTS!>object AA<!> {
<!MANY_COMPANION_OBJECTS!>companion<!> 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 <!NESTED_CLASS_NOT_ALLOWED!>object A<!>
companion <!MANY_COMPANION_OBJECTS, NESTED_CLASS_NOT_ALLOWED!>object B<!>
<!MANY_COMPANION_OBJECTS!>companion<!> <!NESTED_CLASS_NOT_ALLOWED!>object B<!>
companion <!MANY_COMPANION_OBJECTS, NESTED_CLASS_NOT_ALLOWED!>object C<!>
<!MANY_COMPANION_OBJECTS!>companion<!> <!NESTED_CLASS_NOT_ALLOWED!>object C<!>
}
}
object O {
companion object A
companion <!MANY_COMPANION_OBJECTS!>object B<!>
<!MANY_COMPANION_OBJECTS!>companion<!> object B
companion <!MANY_COMPANION_OBJECTS!>object C<!>
<!MANY_COMPANION_OBJECTS!>companion<!> object C
}