From 4428798c6145b2614f301b09f40e4131c6953915 Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Fri, 8 Sep 2017 13:01:52 +0300 Subject: [PATCH] Change diagnostic message and rename to NESTED_CLASS_DEPRECATED --- .../src/org/jetbrains/kotlin/diagnostics/Errors.java | 2 +- .../diagnostics/rendering/DefaultErrorMessages.java | 2 +- .../org/jetbrains/kotlin/resolve/ModifiersChecker.java | 2 +- .../tests/classObjects/InnerClassAccessThroughEnum.kt | 4 ++-- .../tests/enum/dontCreatePackageTypeForEnumEntry.kt | 2 +- .../diagnostics/tests/enum/inner/insideEnumEntry.kt | 2 +- .../tests/inner/innerClassInEnumEntryClass_lv11.kt | 8 ++++---- .../tests/inner/innerClassInEnumEntryClass_lv12.kt | 8 ++++---- .../diagnostics/tests/inner/nestedClassNotAllowed.kt | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index 21e166de58c..a91e1e92061 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -931,7 +931,7 @@ public interface Errors { DiagnosticFactory1 INACCESSIBLE_OUTER_CLASS_EXPRESSION = DiagnosticFactory1.create(ERROR); DiagnosticFactory1 NESTED_CLASS_NOT_ALLOWED = DiagnosticFactory1.create(ERROR, DECLARATION_NAME); - DiagnosticFactory1 NESTED_CLASS_NOT_ALLOWED_SINCE_1_3 = DiagnosticFactory1.create(WARNING, DECLARATION_NAME); + DiagnosticFactory1 NESTED_CLASS_DEPRECATED = DiagnosticFactory1.create(WARNING, DECLARATION_NAME); //Inline and inlinable parameters DiagnosticFactory2 NON_PUBLIC_CALL_FROM_PUBLIC_INLINE = DiagnosticFactory2.create(ERROR, CALL_ELEMENT); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java index 198a76fc6d4..d1d3f5c026a 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -424,7 +424,7 @@ public class DefaultErrorMessages { MAP.put(INACCESSIBLE_OUTER_CLASS_EXPRESSION, "Expression is inaccessible from a nested class ''{0}''", NAME); MAP.put(NESTED_CLASS_NOT_ALLOWED, "{0} is not allowed here", STRING); - MAP.put(NESTED_CLASS_NOT_ALLOWED_SINCE_1_3, "{0} will not be allowed here in Kotlin 1.3 and later, please migrate your code", STRING); + MAP.put(NESTED_CLASS_DEPRECATED, "{0} is deprecated here", STRING); MAP.put(HAS_NEXT_MISSING, "hasNext() cannot be called on iterator() of type ''{0}''", RENDER_TYPE); MAP.put(HAS_NEXT_FUNCTION_AMBIGUITY, "hasNext() is ambiguous for iterator() of type ''{0}''", RENDER_TYPE); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java index e1d3c85b596..419da13562f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.java @@ -209,7 +209,7 @@ public class ModifiersChecker { DiagnosticFactory1 diagnostic = languageVersionSettings.supportsFeature(LanguageFeature.NestedClassesInEnumEntryShouldBeInner) ? NESTED_CLASS_NOT_ALLOWED - : NESTED_CLASS_NOT_ALLOWED_SINCE_1_3; + : NESTED_CLASS_DEPRECATED; trace.report(diagnostic.on(ktClassOrObject, kind.withCapitalFirstLetter)); return; } diff --git a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt index 47cffaa0584..2186ffae287 100644 --- a/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt +++ b/compiler/testData/diagnostics/tests/classObjects/InnerClassAccessThroughEnum.kt @@ -3,13 +3,13 @@ package a enum class C { E1, E2, E3 { - object O_O + object O_O fun b() { O_O } - class G + class G }, E4 { diff --git a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt index c85104c5806..5d400cb6a73 100644 --- a/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt +++ b/compiler/testData/diagnostics/tests/enum/dontCreatePackageTypeForEnumEntry.kt @@ -1,7 +1,7 @@ enum class E { FIRST, SECOND { - class A + class A }; } diff --git a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt index 4e397f71047..259231b842a 100644 --- a/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt +++ b/compiler/testData/diagnostics/tests/enum/inner/insideEnumEntry.kt @@ -1,6 +1,6 @@ enum class E { ABC { - enum class F { + enum class F { DEF } } diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt index eec67b9562e..40018bda5af 100644 --- a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt +++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv11.kt @@ -4,13 +4,13 @@ enum class Enum { ENTRY_WITH_CLASS { inner class TestInner - class TestNested + class TestNested - interface TestInterface + interface TestInterface - object TestObject + object TestObject - enum class TestEnumClass { + enum class TestEnumClass { OTHER_ENTRY } diff --git a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.kt b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.kt index 8bf43ee756c..15202495a5a 100644 --- a/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.kt +++ b/compiler/testData/diagnostics/tests/inner/innerClassInEnumEntryClass_lv12.kt @@ -4,13 +4,13 @@ enum class Enum { ENTRY_WITH_CLASS { inner class TestInner - class TestNested + class TestNested - interface TestInterface + interface TestInterface - object TestObject + object TestObject - enum class TestEnumClass { + enum class TestEnumClass { OTHER_ENTRY } diff --git a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt index 02a84676a0b..3642f922a3a 100644 --- a/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt +++ b/compiler/testData/diagnostics/tests/inner/nestedClassNotAllowed.kt @@ -20,6 +20,6 @@ fun foo() { enum class E { E1 { // Not allowed in Java, but no reason to disallow in Kotlin - class D + class D } }