Skip to content

Commit 7b53d31

Browse files
committed
sure nullable files in indexing checks
1 parent ea91bfe commit 7b53d31

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/main/java/de/espend/idea/php/phpunit/utils/PhpUnitPluginUtil.java

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import com.intellij.openapi.vfs.VirtualFile;
1212
import com.intellij.psi.PsiDocumentManager;
1313
import com.intellij.psi.PsiElement;
14+
import com.intellij.psi.PsiFile;
1415
import com.intellij.psi.codeStyle.CodeStyleManager;
1516
import com.intellij.psi.util.PsiTreeUtil;
1617
import com.jetbrains.php.lang.documentation.phpdoc.lexer.PhpDocTokenTypes;
@@ -83,9 +84,18 @@ public static boolean isTestClassWithoutIndexAccess(@NotNull PhpClass phpClass)
8384
}
8485

8586
// find somehow inside a project test folder
86-
VirtualFile containingFile1 = phpClass.getContainingFile().getVirtualFile();
87+
PsiFile containingFile = phpClass.getContainingFile();
88+
if (containingFile == null) {
89+
return false;
90+
}
91+
92+
VirtualFile virtualFile = containingFile.getVirtualFile();
93+
if (virtualFile == null) {
94+
return false;
95+
}
96+
8797
for (VirtualFile contentRoot : ProjectRootManager.getInstance(phpClass.getProject()).getContentRoots()) {
88-
String relativePath = VfsUtil.getRelativePath(containingFile1, contentRoot, '/');
98+
String relativePath = VfsUtil.getRelativePath(virtualFile, contentRoot, '/');
8999

90100
if (relativePath == null) {
91101
continue;

0 commit comments

Comments
 (0)