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: PsiUtilCore.getVirtualFile used (IDEA-CR-20744)

Browse Source
This commit is contained in:
Tagir Valeev
2017-05-05 09:29:29 +07:00
parent d6aa388c7b
commit 84d65b01fc
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/IgnoreResultOfCallInspectionBase.java
+6 -6
View File
@@ -25,7 +25,6 @@ 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;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.util.ObjectUtils;
import com.siyeh.InspectionGadgetsBundle;
@@ -236,12 +235,13 @@ public class IgnoreResultOfCallInspectionBase extends BaseInspection {
if(annotation != null) {
// 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) {
VirtualFile annotationFile = PsiUtilCore.getVirtualFile(annotation);
VirtualFile currentFile = classOwner.getVirtualFile();
if(annotationFile != null && currentFile != null) {
ProjectFileIndex projectFileIndex = ProjectFileIndex.getInstance(element.getProject());
VirtualFile annotationClassRoot = projectFileIndex.getClassRootForFile(file.getVirtualFile());
VirtualFile currentClassRoot = projectFileIndex.getClassRootForFile(classOwner.getVirtualFile());
if(!Objects.equals(annotationClassRoot, currentClassRoot)) {
VirtualFile annotationClassRoot = projectFileIndex.getClassRootForFile(annotationFile);
VirtualFile currentClassRoot = projectFileIndex.getClassRootForFile(currentFile);
if (!Objects.equals(annotationClassRoot, currentClassRoot)) {
return null;
}
}