From 3254641c5afc7c242aa28292982cd66656b274d2 Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 9 Dec 2015 18:14:12 +0300 Subject: [PATCH] Local sealed classes: warning --> error --- .../src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt | 7 ++----- compiler/testData/diagnostics/tests/sealed/LocalSealed.kt | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt index 134109650db..2b9f062145f 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/ModifiersChecker.kt @@ -61,7 +61,7 @@ public object ModifierCheckerCore { ABSTRACT_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, INTERFACE, MEMBER_PROPERTY, MEMBER_FUNCTION), OPEN_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, INTERFACE, MEMBER_PROPERTY, MEMBER_FUNCTION), FINAL_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS, ENUM_CLASS, OBJECT, MEMBER_PROPERTY, MEMBER_FUNCTION), - SEALED_KEYWORD to EnumSet.of(CLASS_ONLY, LOCAL_CLASS, INNER_CLASS), + SEALED_KEYWORD to EnumSet.of(CLASS_ONLY, INNER_CLASS), // We should have also CLASS_ONLY here because INNER_CLASS is not always perfectly identified INNER_KEYWORD to EnumSet.of(CLASS_ONLY, INNER_CLASS), OVERRIDE_KEYWORD to EnumSet.of(MEMBER_PROPERTY, MEMBER_FUNCTION), @@ -89,10 +89,7 @@ public object ModifierCheckerCore { ) // NOTE: deprecated targets must be possible! - private val deprecatedTargetMap = mapOf>( - // Deprecated in 1.0 beta 3 - SEALED_KEYWORD to EnumSet.of(LOCAL_CLASS) - ) + private val deprecatedTargetMap = mapOf>() // NOTE: redundant targets must be possible! private val redundantTargetMap = mapOf>( diff --git a/compiler/testData/diagnostics/tests/sealed/LocalSealed.kt b/compiler/testData/diagnostics/tests/sealed/LocalSealed.kt index dc22feb39f0..8326d6712d4 100644 --- a/compiler/testData/diagnostics/tests/sealed/LocalSealed.kt +++ b/compiler/testData/diagnostics/tests/sealed/LocalSealed.kt @@ -1,3 +1,3 @@ fun foo() { - sealed class My + sealed class My }