code review

compiler/frontend.java/src/org/jetbrains/kotlin/fileClasses/JvmFileClassUtil.kt

@@ -16,6 +16,8 @@
 
 package org.jetbrains.kotlin.fileClasses
 
+import com.intellij.psi.util.CachedValueProvider
+import com.intellij.psi.util.CachedValuesManager
 import org.jetbrains.kotlin.descriptors.PackageFragmentDescriptor
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils
@@ -103,3 +105,13 @@ public object JvmFileClassUtil {
 }
 
 public class ParsedJmvFileClassAnnotations(public val name: String, public val multipleFiles: Boolean)
+
+public val JetFile.javaFileFacadeFqName: FqName
+    get() {
+        return CachedValuesManager.getCachedValue(this) {
+            val facadeFqName =
+                    if (isCompiled) packageFqName.child(Name.identifier(virtualFile.nameWithoutExtension))
+                    else JvmFileClassUtil.getFileClassInfoNoResolve(this).facadeClassFqName
+            CachedValueProvider.Result(facadeFqName, this)
+        }
+    }

compiler/light-classes/src/org/jetbrains/kotlin/asJava/LightClassUtil.kt

@@ -31,7 +31,7 @@ import com.intellij.psi.util.PsiTreeUtil
 import com.intellij.util.PathUtil
 import com.intellij.util.SmartList
 import org.jetbrains.kotlin.builtins.KotlinBuiltIns
-import org.jetbrains.kotlin.fileClasses.JvmFileClassUtil
+import org.jetbrains.kotlin.fileClasses.javaFileFacadeFqName
 import org.jetbrains.kotlin.load.java.JvmAbi
 import org.jetbrains.kotlin.load.kotlin.PackageClassUtils
 import org.jetbrains.kotlin.name.FqName
@@ -268,7 +268,7 @@ public object LightClassUtil {
         if (parent is JetFile) {
             // top-level declaration
             val fqName = if (useNewPackageParts)
-                JvmFileClassUtil.getFileClassInfoNoResolve(parent).facadeClassFqName
+                parent.javaFileFacadeFqName
             else
                 PackageClassUtils.getPackageClassFqName(parent.packageFqName)