From a46458f77ebf715fbe0604d3a94d8b35fef18aa9 Mon Sep 17 00:00:00 2001
From: Bart van Helvert <bart.vanhelvert@jetbrains.com>
Date: Fri, 10 Jun 2022 13:05:14 +0200
Subject: [PATCH] [jvm] IJ-CR-24591 Add Scala support to JvmApiUsageInspection

GitOrigin-RevId: 0706804427431c2392dd8036d6518f44fc6a089a
---
 .../com/intellij/codeInspection/JavaApiUsageInspection.kt    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/JavaApiUsageInspection.kt b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/JavaApiUsageInspection.kt
index 0cb48e53b771..893059ea523d 100644
--- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/JavaApiUsageInspection.kt
+++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/JavaApiUsageInspection.kt
@@ -156,7 +156,8 @@ class JavaApiUsageInspection : AbstractBaseUastLocalInspectionTool() {
 
     private fun processMethodOverriding(method: UMethod, overriddenMethods: Array<PsiMethod>) {
       val overrideAnnotation = method.findAnnotation(CommonClassNames.JAVA_LANG_OVERRIDE)
-      if (overrideAnnotation == null && method.sourcePsi?.language != Language.findLanguageByID("kotlin")) return
+      val hasOverrideModifier = overrideModifierLanguages.any { method.sourcePsi?.language != Language.findLanguageByID(it) }
+      if (overrideAnnotation == null && !hasOverrideModifier) return
       val sourcePsi = method.sourcePsi ?: return
       val module = ModuleUtilCore.findModuleForPsiElement(sourcePsi) ?: return
       val languageLevel = getEffectiveLanguageLevel(module)
@@ -248,6 +249,8 @@ class JavaApiUsageInspection : AbstractBaseUastLocalInspectionTool() {
   }
 
   companion object {
+    private val overrideModifierLanguages = listOf("kotlin", "scala")
+
     private val logger = logger<JavaApiUsageInspection>()
 
     private var effectiveLanguageLevel: LanguageLevel? = null