From df2bd3aeb662666135f9e009c683f86ff1890d37 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 3 Jul 2017 16:43:48 +0200
Subject: [PATCH] Cleanup (minor optimization)

---
 .../intellij/psi/impl/JavaPlatformModuleSystem.kt    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt b/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
index 47aa1c5de6e9..db17a731ce6a 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPlatformModuleSystem.kt
@@ -37,10 +37,11 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
   override fun checkAccess(target: PsiClass, place: PsiElement) = checkAccess(target, place, false)
 
   private fun checkAccess(target: PsiClass, place: PsiElement, quick: Boolean): Pair<String, List<IntentionAction>>? {
-    if (PsiUtil.isLanguageLevel9OrHigher(place)) {
+    val useFile = place.containingFile
+    if (useFile != null && PsiUtil.isLanguageLevel9OrHigher(useFile)) {
       val targetFile = target.containingFile
       if (targetFile is PsiClassOwner) {
-        return checkAccess(targetFile, place, targetFile.packageName, quick)
+        return checkAccess(targetFile, useFile, targetFile.packageName, quick)
       }
     }
 
@@ -59,7 +60,7 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
             val test = index.isInTestSourceContent(useVFile)
             val dirs = target.getDirectories(module.getModuleWithDependenciesAndLibrariesScope(test))
             if (dirs.size == 1) {
-              return checkAccess(dirs[0], place, target.qualifiedName, quick)
+              return checkAccess(dirs[0], useFile, target.qualifiedName, quick)
             }
           }
         }
@@ -71,7 +72,10 @@ class JavaPlatformModuleSystem : JavaModuleSystemEx {
 
   private val ERR = Pair("-", emptyList<IntentionAction>())
 
-  private fun checkAccess(target: PsiFileSystemItem, place: PsiElement, packageName: String, quick: Boolean): Pair<String, List<IntentionAction>>? {
+  private fun checkAccess(target: PsiFileSystemItem,
+                          place: PsiFileSystemItem,
+                          packageName: String,
+                          quick: Boolean): Pair<String, List<IntentionAction>>? {
     val targetModule = JavaModuleGraphUtil.findDescriptorByElement(target)
     val useModule = JavaModuleGraphUtil.findDescriptorByElement(place)