diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java index 93a79b93e4d..25aa8b9adf2 100644 --- a/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java +++ b/idea/src/org/jetbrains/jet/plugin/highlighter/IdeErrorMessages.java @@ -16,13 +16,14 @@ package org.jetbrains.jet.plugin.highlighter; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.jet.lang.descriptors.CallableMemberDescriptor; import org.jetbrains.jet.lang.diagnostics.Diagnostic; -import org.jetbrains.jet.lang.diagnostics.rendering.DefaultErrorMessages; -import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticFactoryToRendererMap; -import org.jetbrains.jet.lang.diagnostics.rendering.DiagnosticRenderer; -import org.jetbrains.jet.lang.diagnostics.rendering.DispatchingDiagnosticRenderer; +import org.jetbrains.jet.lang.diagnostics.rendering.*; +import org.jetbrains.jet.resolve.DescriptorRenderer; import static org.jetbrains.jet.lang.diagnostics.Errors.*; +import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.NAME; import static org.jetbrains.jet.lang.diagnostics.rendering.Renderers.RENDER_TYPE; /** @@ -51,6 +52,16 @@ public class IdeErrorMessages { "" + "
Iterated values:{0}
Parameter:{1}
", RENDER_TYPE, RENDER_TYPE); + MAP.put(RETURN_TYPE_MISMATCH_ON_OVERRIDE, "Return type is ''{0}'', which is not a subtype of overridden
" + + "{1}", + new Renderer() { + @NotNull + @Override + public String render(@NotNull CallableMemberDescriptor object) { + return DescriptorRenderer.TEXT.renderType(object.getReturnType()); + } + }, DescriptorRenderer.HTML); + MAP.setImmutable(); }