From 1d9dadf557669bf4e6204e4ac94633d4af8cd99e Mon Sep 17 00:00:00 2001 From: Anna Kozlova Date: Wed, 16 Dec 2015 12:17:21 +0100 Subject: [PATCH] batch analysis: if source content intersects with library sources - let content to win and be analyzed (IDEA-149055) --- .../codeInsight/daemon/JavaProblemHighlightFilter.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/JavaProblemHighlightFilter.java b/java/java-impl/src/com/intellij/codeInsight/daemon/JavaProblemHighlightFilter.java index dd376bb5c962..922c8a4e0ca4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/JavaProblemHighlightFilter.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/JavaProblemHighlightFilter.java @@ -18,6 +18,7 @@ package com.intellij.codeInsight.daemon; import com.intellij.ide.highlighter.JavaFileType; import com.intellij.ide.scratch.ScratchFileType; import com.intellij.openapi.roots.JavaProjectRootsUtil; +import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiFile; @@ -36,8 +37,11 @@ public class JavaProblemHighlightFilter extends ProblemHighlightFilter { if (shouldHighlight) { if (psiFile.getFileType() == JavaFileType.INSTANCE) { final VirtualFile virtualFile = psiFile.getVirtualFile(); - if (virtualFile != null && ProjectRootManager.getInstance(psiFile.getProject()).getFileIndex().isInLibrarySource(virtualFile)) { - return false; + if (virtualFile != null) { + final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(psiFile.getProject()).getFileIndex(); + if (fileIndex.isInLibrarySource(virtualFile)) { + return fileIndex.isInSourceContent(virtualFile); + } } } }