diff --git a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/inspections/JavaOutsideModuleDetector.kt b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/inspections/JavaOutsideModuleDetector.kt index 664daed70ce9..8ab6059756ba 100644 --- a/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/inspections/JavaOutsideModuleDetector.kt +++ b/plugins/kotlin/jvm/src/org/jetbrains/kotlin/idea/inspections/JavaOutsideModuleDetector.kt @@ -6,13 +6,15 @@ import com.intellij.icons.AllIcons import com.intellij.ide.highlighter.JavaFileType import com.intellij.openapi.fileEditor.FileEditor import com.intellij.openapi.fileTypes.FileTypeRegistry +import com.intellij.openapi.module.ModuleUtilCore import com.intellij.openapi.project.Project import com.intellij.openapi.roots.ProjectRootManager import com.intellij.openapi.vfs.VirtualFile import com.intellij.ui.EditorNotificationPanel import com.intellij.ui.EditorNotificationProvider -import org.jetbrains.jps.model.java.JavaModuleSourceRootTypes import org.jetbrains.kotlin.idea.KotlinJvmBundle +import org.jetbrains.kotlin.idea.base.util.KOTLIN_SOURCE_ROOT_TYPES +import org.jetbrains.kotlin.idea.base.util.isGradleModule import java.util.function.Function import javax.swing.JComponent @@ -23,8 +25,10 @@ class JavaOutsideModuleDetector : EditorNotificationProvider { return null } + if (ModuleUtilCore.findModuleForFile(file, project)?.isGradleModule != true) return null + val fileIndex = ProjectRootManager.getInstance(project).getFileIndex() - if (!fileIndex.isInSourceContent(file) || fileIndex.isUnderSourceRootOfType(file, JavaModuleSourceRootTypes.SOURCES)) return null + if (!fileIndex.isUnderSourceRootOfType(file, KOTLIN_SOURCE_ROOT_TYPES)) return null return Function { EditorNotificationPanel(it, EditorNotificationPanel.Status.Warning).apply {