diff --git a/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt
new file mode 100644
index 00000000000..6077f6890f6
--- /dev/null
+++ b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt
@@ -0,0 +1,17 @@
+// !DIAGNOSTICS_NUMBER: 2
+// !DIAGNOSTICS: RETURN_TYPE_MISMATCH_ON_OVERRIDE
+// !MESSAGE_TYPE: HTML
+
+package myPackage.a.b
+
+open class A {
+ open fun f(): kotlin.String = "asd"
+ open fun g(): kotlin.String = "Asd"
+}
+
+class B : A() {
+ override fun f(): String = String()
+ override fun g(): kotlin.Int = 3
+}
+
+class String
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride1.html b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride1.html
new file mode 100644
index 00000000000..4835fc6351f
--- /dev/null
+++ b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride1.html
@@ -0,0 +1,4 @@
+
+
+Return type is 'myPackage.a.b.String', which is not a subtype of overridden
+public open fun f(): kotlin.String defined in myPackage.a.b.A
\ No newline at end of file
diff --git a/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride2.html b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride2.html
new file mode 100644
index 00000000000..60406a307e0
--- /dev/null
+++ b/idea/testData/diagnosticMessage/returnTypeMismatchOnOverride2.html
@@ -0,0 +1,4 @@
+
+
+Return type is 'Int', which is not a subtype of overridden
+public open fun g(): String defined in myPackage.a.b.A
\ No newline at end of file
diff --git a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java
index 0e470918100..0df76c59e6e 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/highlighter/DiagnosticMessageTestGenerated.java
@@ -185,6 +185,12 @@ public class DiagnosticMessageTestGenerated extends AbstractDiagnosticMessageTes
doTest(fileName);
}
+ @TestMetadata("returnTypeMismatchOnOverride.kt")
+ public void testReturnTypeMismatchOnOverride() throws Exception {
+ String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/returnTypeMismatchOnOverride.kt");
+ doTest(fileName);
+ }
+
@TestMetadata("typeInferenceCannotCaptureTypes.kt")
public void testTypeInferenceCannotCaptureTypes() throws Exception {
String fileName = KotlinTestUtils.navigationMetadata("idea/testData/diagnosticMessage/typeInferenceCannotCaptureTypes.kt");