diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighterFactory.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighterFactory.java index 6cdacde92bcd..f9c39359591c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighterFactory.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GrReferenceHighlighterFactory.java @@ -24,6 +24,10 @@ public class GrReferenceHighlighterFactory implements TextEditorHighlightingPass return groovyFile instanceof GroovyFileBase ? new GrReferenceHighlighter(editor.getDocument(), (GroovyFileBase)groovyFile) : null; } + static boolean shouldHighlight(@NotNull PsiFile file) { + return file instanceof GroovyFileBase && shouldHighlight((GroovyFileBase)file); + } + static boolean shouldHighlight(@NotNull GroovyFileBase file) { return isSpecificScriptFile(file) || GrFileIndexUtil.isGroovySourceFile(file); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/impl.kt b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/impl.kt index 2416042ab6e9..65b4c6751550 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/impl.kt +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/impl.kt @@ -9,6 +9,7 @@ import com.intellij.psi.PsiClass import com.intellij.psi.util.PsiUtil.isInnerClass import com.intellij.psi.util.parentOfType import org.jetbrains.plugins.groovy.GroovyBundle.message +import org.jetbrains.plugins.groovy.annotator.GrReferenceHighlighterFactory.shouldHighlight import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.generateAddImportActions import org.jetbrains.plugins.groovy.codeInspection.untypedUnresolvedAccess.generateCreateClassActions import org.jetbrains.plugins.groovy.lang.groovydoc.psi.api.GroovyDocPsiElement @@ -21,6 +22,8 @@ import org.jetbrains.plugins.groovy.lang.psi.util.GrStaticChecker.isInStaticCont import org.jetbrains.plugins.groovy.lang.psi.util.PsiUtil.hasEnclosingInstanceInScope fun checkUnresolvedCodeReference(ref: GrCodeReferenceElement, annotationHolder: AnnotationHolder) { + if (!shouldHighlight(annotationHolder.currentAnnotationSession.file)) return + if (ref.parentOfType() != null) return if (ref.parent is GrPackageDefinition) return