Fix exception when reporting WRONG_TYPE_PARAMETER_NULLABILITY_FOR_JAV…

…A_OVERRIDE ^KT-51979 Fixed
JetBrains · Apr 18, 2022 · 3ac8d95 · 3ac8d95
1 parent 2f4afe0
commit 3ac8d95
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 0 deletions.
diff --git a/...vel/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java b/...vel/api/fir/diagnostic/compiler/based/DiagnosisCompilerTestFE10TestdataTestGenerated.java
diff --git a/...s/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java b/...s/tests-gen/org/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsTestGenerated.java
diff --git a/...rg/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java b/...rg/jetbrains/kotlin/test/runners/FirOldFrontendDiagnosticsWithLightTreeTestGenerated.java
diff --git a/.../jetbrains/kotlin/resolve/jvm/checkers/JavaOverrideWithWrongNullabilityOverrideChecker.kt b/.../jetbrains/kotlin/resolve/jvm/checkers/JavaOverrideWithWrongNullabilityOverrideChecker.kt
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.resolve.jvm.checkers
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
 import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
+import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.load.java.descriptors.JavaMethodDescriptor
 import org.jetbrains.kotlin.psi.KtDeclaration
 import org.jetbrains.kotlin.resolve.OverridingUtil
@@ -27,6 +28,10 @@ object JavaOverrideWithWrongNullabilityOverrideChecker : DeclarationChecker {
         if (descriptor !is CallableMemberDescriptor) return
         if (descriptor.overriddenDescriptors.isEmpty()) return
 
+        val modifierList = declaration.modifierList
+        val hasOverrideNode = modifierList != null && modifierList.hasModifier(KtTokens.OVERRIDE_KEYWORD)
+        if (!hasOverrideNode) return
+
         val containingClass = descriptor.containingDeclaration as? ClassDescriptor ?: return
 
         for (overriddenDescriptor in descriptor.overriddenDescriptors) {

diff --git a/compiler/testData/diagnostics/tests/j+k/types/noOverrideKeyword.fir.kt b/compiler/testData/diagnostics/tests/j+k/types/noOverrideKeyword.fir.kt
@@ -0,0 +1,14 @@
+// !SKIP_JAVAC
+// SKIP_TXT
+// !LANGUAGE: -ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
+// FILE: JavaInterface.java
+import org.jetbrains.annotations.NotNull;
+
+public interface JavaInterface<V> {
+    void interfaceMethod(@NotNull V value);
+}
+
+// FILE: main.kt
+interface KotlinInterface<X> : JavaInterface<X> {
+    override <!SYNTAX!><<!><!SYNTAX!>T<!><!SYNTAX!>><!> fun interfaceMethod(x: X)
+}
diff --git a/compiler/testData/diagnostics/tests/j+k/types/noOverrideKeyword.kt b/compiler/testData/diagnostics/tests/j+k/types/noOverrideKeyword.kt
@@ -0,0 +1,14 @@
+// !SKIP_JAVAC
+// SKIP_TXT
+// !LANGUAGE: -ProhibitUsingNullableTypeParameterAgainstNotNullAnnotated
+// FILE: JavaInterface.java
+import org.jetbrains.annotations.NotNull;
+
+public interface JavaInterface<V> {
+    void interfaceMethod(@NotNull V value);
+}
+
+// FILE: main.kt
+interface KotlinInterface<X> : JavaInterface<X> {
+    override <!SYNTAX!><<!><!SYNTAX!>T<!><!SYNTAX!>><!> fun <!VIRTUAL_MEMBER_HIDDEN!>interfaceMethod<!>(x: X)
+}
diff --git a/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java b/...tests-common-new/tests-gen/org/jetbrains/kotlin/test/runners/DiagnosticTestGenerated.java