EA-218902: Check PsiElement for validity

2020-01-14 20:17:39 +09:00
parent 615d24bbd2
commit eb3685d6ac
1 changed files with 8 additions and 2 deletions
@@ -96,9 +96,15 @@ class JvmModuleAccessibilityChecker(project: Project) : CallChecker {
            }
        }

-        source.getPsi()?.containingFile?.virtualFile?.let { return it }
+        fun getContainingVirtualFile(source: SourceElement): VirtualFile? {
+            return source.getPsi()?.takeIf { it.isValid }?.containingFile
+                ?.virtualFile?.takeIf { it.isValid }
+        }

-        return originalDescriptor?.source?.getPsi()?.containingFile?.virtualFile
+        getContainingVirtualFile(source)?.let { return it }
+
+        val originalSource = originalDescriptor?.source ?: return null
+        return getContainingVirtualFile(originalSource)
    }

    inner class ClassifierUsage : ClassifierUsageChecker {