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

Change diagnostic message and rename to NESTED_CLASS_DEPRECATED

Browse Source
This commit is contained in:
Dmitry Petrov
2017-09-08 13:01:52 +03:00
parent 66ece54b25
commit 4428798c61
9 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt
Vendored
+2 -2
View File
@@ -3,13 +3,13 @@ package a
enum class C {
E1, E2, E3 {
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>object O_O<!>
<!NESTED_CLASS_DEPRECATED!>object O_O<!>
fun b() {
O_O
}
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>class G<!>
<!NESTED_CLASS_DEPRECATED!>class G<!>
},
E4 {
compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt
Vendored
+1 -1
View File
@@ -1,7 +1,7 @@
enum class E {
FIRST,
SECOND {
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>class A<!>
<!NESTED_CLASS_DEPRECATED!>class A<!>
};
}
compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt
Vendored
+1 -1
View File
@@ -1,6 +1,6 @@
enum class E {
ABC {
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>enum class F<!> {
<!NESTED_CLASS_DEPRECATED!>enum class F<!> {
DEF
}
}
compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt
Vendored
+4 -4
View File
@@ -4,13 +4,13 @@ enum class Enum {
ENTRY_WITH_CLASS {
<!WRONG_MODIFIER_CONTAINING_DECLARATION!>inner<!> class TestInner
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>class TestNested<!>
<!NESTED_CLASS_DEPRECATED!>class TestNested<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>interface TestInterface<!>
<!NESTED_CLASS_DEPRECATED!>interface TestInterface<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>object TestObject<!>
<!NESTED_CLASS_DEPRECATED!>object TestObject<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>enum class TestEnumClass<!> {
<!NESTED_CLASS_DEPRECATED!>enum class TestEnumClass<!> {
OTHER_ENTRY
}
compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.kt
Vendored
+4 -4
View File
@@ -4,13 +4,13 @@ enum class Enum {
ENTRY_WITH_CLASS {
inner class TestInner
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>class TestNested<!>
<!NESTED_CLASS_DEPRECATED!>class TestNested<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>interface TestInterface<!>
<!NESTED_CLASS_DEPRECATED!>interface TestInterface<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>object TestObject<!>
<!NESTED_CLASS_DEPRECATED!>object TestObject<!>
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>enum class TestEnumClass<!> {
<!NESTED_CLASS_DEPRECATED!>enum class TestEnumClass<!> {
OTHER_ENTRY
}
compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt
Vendored
+1 -1
View File
@@ -20,6 +20,6 @@ fun foo() {
enum class E {
E1 {
// Not allowed in Java, but no reason to disallow in Kotlin
<!NESTED_CLASS_NOT_ALLOWED_SINCE_1_3!>class D<!>
<!NESTED_CLASS_DEPRECATED!>class D<!>
}
}