MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IgnoreResultOfCallInspectionBase: ProjectFileIndex.getClassRootForFile used (IDEA-CR-20744)

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-03 11:52:07 +07:00
parent fc9fa0c222
commit c37cc4ff52
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
+10 -2
View File
@@ -18,9 +18,11 @@ package com.siyeh.ig.bugs;
import com.intellij.codeInsight.AnnotationUtil;
import com.intellij.codeInspection.dataFlow.ControlFlowAnalyzer;
import com.intellij.codeInspection.dataFlow.MethodContract;
import com.intellij.openapi.roots.ProjectFileIndex;
import com.intellij.openapi.util.InvalidDataException;
import com.intellij.openapi.util.WriteExternalException;
import com.intellij.openapi.util.registry.Registry;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.util.PropertyUtil;
import com.intellij.psi.util.PsiTreeUtil;
@@ -37,6 +39,7 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.Objects;
import java.util.Set;
public class IgnoreResultOfCallInspectionBase extends BaseInspection {
@@ -234,8 +237,13 @@ public class IgnoreResultOfCallInspectionBase extends BaseInspection {
// Check that annotation actually belongs to the same library/source root
// which could be important in case of split-packages
PsiFile file = PsiTreeUtil.getParentOfType(annotation, PsiFile.class);
if(file != null && file.getParent() != classOwner.getParent()) {
return null;
if(file != null) {
ProjectFileIndex projectFileIndex = ProjectFileIndex.getInstance(element.getProject());
VirtualFile annotationClassRoot = projectFileIndex.getClassRootForFile(file.getVirtualFile());
VirtualFile currentClassRoot = projectFileIndex.getClassRootForFile(classOwner.getVirtualFile());
if(!Objects.equals(annotationClassRoot, currentClassRoot)) {
return null;
}
}
}
return annotation;