From 361448de8ba70a9204e2b89ae079e94e80b60abc Mon Sep 17 00:00:00 2001 From: Mikhail Glukhikh Date: Wed, 30 Sep 2015 19:26:38 +0300 Subject: [PATCH] Rename: private / final property in trait --> in interface --- .../frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java | 4 ++-- .../kotlin/diagnostics/rendering/DefaultErrorMessages.java | 4 ++-- .../src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java | 4 ++-- .../testData/diagnostics/tests/declarationChecks/kt2397.kt | 2 +- .../diagnostics/tests/modifiers/privateInInterface.kt | 4 ++-- compiler/testData/diagnostics/tests/variance/Visibility.kt | 4 ++-- .../org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java index 410c99efb1a..a36130d9e87 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java @@ -327,8 +327,8 @@ public interface Errors { DiagnosticFactory0 EXTENSION_PROPERTY_WITH_BACKING_FIELD = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 PROPERTY_INITIALIZER_NO_BACKING_FIELD = DiagnosticFactory0.create(ERROR); DiagnosticFactory0 PROPERTY_INITIALIZER_IN_TRAIT = DiagnosticFactory0.create(ERROR); - DiagnosticFactory0 FINAL_PROPERTY_IN_TRAIT = DiagnosticFactory0.create(ERROR, FINAL_MODIFIER); - DiagnosticFactory0 PRIVATE_PROPERTY_IN_TRAIT = DiagnosticFactory0.create(ERROR, PRIVATE_MODIFIER); + DiagnosticFactory0 FINAL_PROPERTY_IN_INTERFACE = DiagnosticFactory0.create(ERROR, FINAL_MODIFIER); + DiagnosticFactory0 PRIVATE_PROPERTY_IN_INTERFACE = DiagnosticFactory0.create(ERROR, PRIVATE_MODIFIER); DiagnosticFactory0 BACKING_FIELD_IN_TRAIT = DiagnosticFactory0.create(ERROR, DECLARATION_SIGNATURE); DiagnosticFactory0 BACKING_FIELD_SYNTAX_DEPRECATED = DiagnosticFactory0.create(WARNING); 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 4e40d43eeac..c2ea735c00c 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -216,8 +216,8 @@ public class DefaultErrorMessages { MAP.put(MUST_BE_INITIALIZED, "Property must be initialized"); MAP.put(MUST_BE_INITIALIZED_OR_BE_ABSTRACT, "Property must be initialized or be abstract"); MAP.put(PROPERTY_INITIALIZER_IN_TRAIT, "Property initializers are not allowed in interfaces"); - MAP.put(FINAL_PROPERTY_IN_TRAIT, "Abstract property in an interface cannot be final"); - MAP.put(PRIVATE_PROPERTY_IN_TRAIT, "Abstract property in an interface cannot be private"); + MAP.put(FINAL_PROPERTY_IN_INTERFACE, "Abstract property in an interface cannot be final"); + MAP.put(PRIVATE_PROPERTY_IN_INTERFACE, "Abstract property in an interface cannot be private"); MAP.put(EXTENSION_PROPERTY_WITH_BACKING_FIELD, "Extension property cannot be initialized because it has no backing field"); MAP.put(PROPERTY_INITIALIZER_NO_BACKING_FIELD, "Initializer is not allowed here because this property has no backing field"); MAP.put(ABSTRACT_PROPERTY_IN_NON_ABSTRACT_CLASS, "Abstract property ''{0}'' in non-abstract class ''{1}''", STRING, NAME); diff --git a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java index 30dde3715b3..6918b529a43 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/resolve/DeclarationsChecker.java @@ -435,7 +435,7 @@ public class DeclarationsChecker { trace.report(PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.on(property)); } if (inTrait && property.hasModifier(JetTokens.PRIVATE_KEYWORD) && !property.hasModifier(JetTokens.ABSTRACT_KEYWORD)) { - trace.report(PRIVATE_PROPERTY_IN_TRAIT.on(property)); + trace.report(PRIVATE_PROPERTY_IN_INTERFACE.on(property)); } return; } @@ -465,7 +465,7 @@ public class DeclarationsChecker { trace.report(PROPERTY_WITH_NO_TYPE_NO_INITIALIZER.on(property)); } if (inTrait && property.hasModifier(JetTokens.FINAL_KEYWORD) && backingFieldRequired) { - trace.report(FINAL_PROPERTY_IN_TRAIT.on(property)); + trace.report(FINAL_PROPERTY_IN_INTERFACE.on(property)); } return; } diff --git a/compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt b/compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt index 656caa94a56..f201c307352 100644 --- a/compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt +++ b/compiler/testData/diagnostics/tests/declarationChecks/kt2397.kt @@ -3,7 +3,7 @@ package a interface T { final fun foo() - final val b : Int + final val b : Int final fun bar() {} final val c : Int diff --git a/compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt b/compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt index 3eddb87b0a3..10b4627523e 100644 --- a/compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt +++ b/compiler/testData/diagnostics/tests/modifiers/privateInInterface.kt @@ -1,9 +1,9 @@ interface My { - private val x: Int + private val x: Int private abstract val xx: Int private val xxx: Int get() = 0 - final val y: Int + final val y: Int final val yy: Int get() = 1 private fun foo(): Int diff --git a/compiler/testData/diagnostics/tests/variance/Visibility.kt b/compiler/testData/diagnostics/tests/variance/Visibility.kt index da68aafd7b1..58798cb72f9 100644 --- a/compiler/testData/diagnostics/tests/variance/Visibility.kt +++ b/compiler/testData/diagnostics/tests/variance/Visibility.kt @@ -2,7 +2,7 @@ interface Test { val internal_val: I public val public_val: I protected val protected_val: I - private val private_val: I + private val private_val: I var interlan_private_set: O private set @@ -10,7 +10,7 @@ interface Test { private set protected var protected_private_set: O private set - private var private_private_set: O + private var private_private_set: O private set fun internal_fun(i: O) : I diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt index 34d638e0f99..4e30f0e8bc6 100644 --- a/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt +++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/QuickFixRegistrar.kt @@ -77,7 +77,7 @@ public class QuickFixRegistrar : QuickFixContributor { val removeFunctionBodyFactory = RemoveFunctionBodyFix.createFactory() ABSTRACT_FUNCTION_WITH_BODY.registerFactory(removeAbstractModifierFactory, removeFunctionBodyFactory) - FINAL_PROPERTY_IN_TRAIT.registerFactory(removeFinalModifierFactory) + FINAL_PROPERTY_IN_INTERFACE.registerFactory(removeFinalModifierFactory) FINAL_FUNCTION_WITH_NO_BODY.registerFactory(removeFinalModifierFactory) val addFunctionBodyFactory = AddFunctionBodyFix.createFactory()