From 7518119bff946759d50ea695c6b8f4fa2cf3a24c Mon Sep 17 00:00:00 2001 From: Dmitry Petrov Date: Wed, 24 May 2017 15:47:23 +0300 Subject: [PATCH] Fix diagnostic message for abstract member not implemented Diagnostic messages should describe a problem, and should not suggest taking actions. That's a prerogative of quick fixes in IDE. #KT-5066 Fixed --- .../kotlin/diagnostics/rendering/DefaultErrorMessages.java | 4 ++-- .../kotlin/idea/highlighter/IdeErrorMessages.java | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) 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 e5af81c0177..0c8757f0d18 100644 --- a/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java +++ b/compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java @@ -687,9 +687,9 @@ public class DefaultErrorMessages { MAP.put(VAR_OVERRIDDEN_BY_VAL, "Var-property {0} cannot be overridden by val-property {1}", FQ_NAMES_IN_TYPES, FQ_NAMES_IN_TYPES); MAP.put(CONFLICTING_INHERITED_MEMBERS, "{0} inherits conflicting members: {1}", NAME, commaSeparated(FQ_NAMES_IN_TYPES)); - MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member {1}", RENDER_CLASS_OR_OBJECT, + MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} is not abstract and does not implement abstract member {1}", RENDER_CLASS_OR_OBJECT, FQ_NAMES_IN_TYPES); - MAP.put(ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract base class member {1}", + MAP.put(ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED, "{0} is not abstract and does not implement abstract base class member {1}", RENDER_CLASS_OR_OBJECT, FQ_NAMES_IN_TYPES); MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1} because it inherits many implementations of it", diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java index c987d3114e6..e6c16d5108c 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/highlighter/IdeErrorMessages.java @@ -129,9 +129,10 @@ public class IdeErrorMessages { MAP.put(VAR_OVERRIDDEN_BY_VAL_BY_DELEGATION, "Val-property cannot override var-property
" + "{1}", HTML, HTML); - MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} must be declared abstract or implement abstract member
" + - "{1}", RENDER_CLASS_OR_OBJECT, - HTML); + MAP.put(ABSTRACT_MEMBER_NOT_IMPLEMENTED, "{0} is not abstract and does not implement abstract member
" + + "{1}", RENDER_CLASS_OR_OBJECT, HTML); + MAP.put(ABSTRACT_CLASS_MEMBER_NOT_IMPLEMENTED, "{0} is not abstract and does not implement abstract base class member
" + + "{1}", RENDER_CLASS_OR_OBJECT, HTML); MAP.put(MANY_IMPL_MEMBER_NOT_IMPLEMENTED, "{0} must override {1}
because it inherits many implementations of it", RENDER_CLASS_OR_OBJECT, HTML);