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

FIR: introduce diagnostic NESTED_CLASS_NOT_ALLOWED

Browse Source
This commit is contained in:
Tianyu Geng
2021-02-19 15:52:43 -08:00
committed by Mikhail Glukhikh
parent c5cabce2d5
commit 724ca1d3ee
39 changed files with 125 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_after.fir.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ enum class C {
O_O
}
class G
<!NESTED_CLASS_NOT_ALLOWED!>class G<!>
},
E4 {
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum_before.fir.kt
Vendored
+1 -1
View File
@@ -11,7 +11,7 @@ enum class C {
O_O
}
class G
<!NESTED_CLASS_NOT_ALLOWED!>class G<!>
},
E4 {
compiler/testData/diagnostics/tests/classObjects/InnerClassClassObject.fir.kt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@
class A {
inner class B {
companion object { }
companion <!NESTED_CLASS_NOT_ALLOWED!>object<!> { }
}
}
compiler/testData/diagnostics/tests/classObjects/multipleDissallowedDefaultObjects.fir.kt
Vendored
+3 -3
View File
@@ -1,10 +1,10 @@
class A {
inner class I {
companion object A
companion <!NESTED_CLASS_NOT_ALLOWED!>object A<!>
companion <!MANY_COMPANION_OBJECTS!>object B<!>
companion <!MANY_COMPANION_OBJECTS, NESTED_CLASS_NOT_ALLOWED!>object B<!>
companion <!MANY_COMPANION_OBJECTS!>object C<!>
companion <!MANY_COMPANION_OBJECTS, NESTED_CLASS_NOT_ALLOWED!>object C<!>
}
}
compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.fir.kt
Vendored
-16
View File
@@ -1,16 +0,0 @@
// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
enum class E {
FIRST,
SECOND {
class A
};
}
val foo: Any.() -> Unit = {}
fun f1() = E.FIRST.foo()
fun f2() = E.FIRST.(foo)()
fun f3() = E.SECOND.foo()
fun f4() = E.SECOND.(foo)()
fun f5() = E.SECOND.<!UNRESOLVED_REFERENCE!>A<!>()
compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
enum class E {
compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry_before.fir.kt
Vendored
+1 -1
View File
@@ -3,7 +3,7 @@
enum class E {
FIRST,
SECOND {
class A
<!NESTED_CLASS_NOT_ALLOWED!>class A<!>
};
}
compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.fir.kt
Vendored
-7
View File
@@ -1,7 +0,0 @@
class A {
inner class B {
enum class E {
ENTRY
}
}
}
compiler/testData/diagnostics/tests/enum/inner/insideInnerClassNotAllowed.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class A {
inner class B {
<!NESTED_CLASS_NOT_ALLOWED!>enum class E<!> {
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
class A {
companion object {
enum class E { ENTRY } // OK
}
inner class B {
enum class E { ENTRY }
}
}
compiler/testData/diagnostics/tests/enum/inner/twoEnumsInClassObjectAndInnerClass.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
class A {
companion object {
enum class E { ENTRY } // OK
compiler/testData/diagnostics/tests/inline/unsupportedConstruction.fir.kt
Vendored
+1 -1
View File
@@ -30,4 +30,4 @@ class Derived: Base() {
inline final override fun foo(a: Int) {
}
}
}
compiler/testData/diagnostics/tests/inner/annotationInInnerClass.fir.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
class Outer {
inner class Inner {
annotation class TestNestedAnnotation
annotation <!NESTED_CLASS_NOT_ALLOWED!>class TestNestedAnnotation<!>
}
}
}
compiler/testData/diagnostics/tests/inner/enumInInnerClass.fir.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
class Outer {
inner class Inner {
enum class TestNestedEnum
<!NESTED_CLASS_NOT_ALLOWED!>enum class TestNestedEnum<!>
}
}
}
compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.fir.kt
Vendored
+2 -2
View File
@@ -4,9 +4,9 @@ enum class Enum {
ENTRY_WITH_CLASS {
inner class TestInner
class TestNested
<!NESTED_CLASS_NOT_ALLOWED!>class TestNested<!>
interface TestInterface
<!NESTED_CLASS_NOT_ALLOWED!>interface TestInterface<!>
object TestObject
compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.fir.kt
Vendored
+2 -2
View File
@@ -4,9 +4,9 @@ enum class Enum {
ENTRY_WITH_CLASS {
inner class TestInner
class TestNested
<!NESTED_CLASS_NOT_ALLOWED!>class TestNested<!>
interface TestInterface
<!NESTED_CLASS_NOT_ALLOWED!>interface TestInterface<!>
object TestObject
compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv13.fir.kt
Vendored
+2 -2
View File
@@ -4,9 +4,9 @@ enum class Enum {
ENTRY_WITH_CLASS {
inner class TestInner
class TestNested
<!NESTED_CLASS_NOT_ALLOWED!>class TestNested<!>
interface TestInterface
<!NESTED_CLASS_NOT_ALLOWED!>interface TestInterface<!>
object TestObject
compiler/testData/diagnostics/tests/inner/interfaceInInnerClass.fir.kt
Vendored
+2 -2
View File
@@ -1,5 +1,5 @@
class Outer {
inner class Inner {
interface TestNestedInterface
<!NESTED_CLASS_NOT_ALLOWED!>interface TestNestedInterface<!>
}
}
}
compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.fir.kt
Vendored
-26
View File
@@ -1,26 +0,0 @@
// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
class A {
inner class B {
class C
}
fun foo() {
class B {
class C
}
}
}
fun foo() {
class B {
class C
}
}
enum class E {
E1 {
class D
}
}
compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_after.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +NestedClassesInEnumEntryShouldBeInner
class A {
compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed_before.fir.kt
Vendored
+4 -4
View File
@@ -2,25 +2,25 @@
class A {
inner class B {
class C
<!NESTED_CLASS_NOT_ALLOWED!>class C<!>
}
fun foo() {
class B {
class C
<!NESTED_CLASS_NOT_ALLOWED!>class C<!>
}
}
}
fun foo() {
class B {
class C
<!NESTED_CLASS_NOT_ALLOWED!>class C<!>
}
}
enum class E {
E1 {
class D
<!NESTED_CLASS_NOT_ALLOWED!>class D<!>
}
}
compiler/testData/diagnostics/tests/inner/nestedObject.fir.kt
Vendored
+3 -3
View File
@@ -1,12 +1,12 @@
// SKIP_TXT
class Outer {
inner class Inner1 {
object Obj1
<!NESTED_CLASS_NOT_ALLOWED!>object Obj1<!>
companion object Obj2
companion <!NESTED_CLASS_NOT_ALLOWED!>object Obj2<!>
inner class Inner2 {
object Obj3
<!NESTED_CLASS_NOT_ALLOWED!>object Obj3<!>
}
}
}
compiler/testData/diagnostics/tests/localClasses/localAnnotationClass.fir.kt
Vendored
+1 -1
View File
@@ -4,6 +4,6 @@ fun f() {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Anno<!>
@Anno class Local {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Nested<!>
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation <!NESTED_CLASS_NOT_ALLOWED!>class Nested<!><!>
}
}
compiler/testData/diagnostics/tests/localClasses/localAnnotationClassError.fir.kt
Vendored
-9
View File
@@ -1,9 +0,0 @@
// !LANGUAGE: +ProhibitLocalAnnotations
fun f() {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Anno<!>
@Anno class Local {
<!LOCAL_ANNOTATION_CLASS_ERROR!>annotation class Nested<!>
}
}
compiler/testData/diagnostics/tests/localClasses/localAnnotationClassError.kt
Vendored
+1
View File
@@ -1,3 +1,4 @@
// FIR_IDENTICAL
// !LANGUAGE: +ProhibitLocalAnnotations
fun f() {
compiler/testData/diagnostics/tests/localInterfaces.fir.kt
Vendored
+2 -2
View File
@@ -6,9 +6,9 @@ fun foo() {
<!LOCAL_INTERFACE_NOT_ALLOWED!>interface c<!> {}
}
class A {
<!LOCAL_INTERFACE_NOT_ALLOWED!>interface d<!> {}
<!LOCAL_INTERFACE_NOT_ALLOWED, NESTED_CLASS_NOT_ALLOWED!>interface d<!> {}
}
val f = {
<!LOCAL_INTERFACE_NOT_ALLOWED!>interface e<!> {}
}
}
}
compiler/testData/diagnostics/tests/modifiers/const/applicability.fir.kt
Vendored
+1 -1
View File
@@ -61,7 +61,7 @@ enum class MyEnum {
class Outer {
inner class Inner {
object C {
<!NESTED_CLASS_NOT_ALLOWED!>object C<!> {
const val a = 18
}
}