From 1ab51a08aae827b179dc7d2089f0905acf3d1fcd Mon Sep 17 00:00:00 2001
From: Natalia Ukhorskaya <natalia.ukhorskaya@jetbrains.com>
Date: Thu, 5 Feb 2015 14:44:11 +0300
Subject: [PATCH] Optimize search of package part files for JetPositionManager

---
 .../PositionManagerLibraryClassFileSearcher.kt       | 11 +++++++----
 .../jetbrains/kotlin/idea/util/DebuggerUtils.java    | 12 +++++++++++-
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt
index cdecca37088..b3a55233c90 100644
--- a/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/debugger/PositionManagerLibraryClassFileSearcher.kt
@@ -38,6 +38,7 @@ import org.jetbrains.kotlin.psi.JetPsiUtil
 import org.jetbrains.kotlin.resolve.jvm.JvmClassName
 import org.jetbrains.kotlin.resolve.descriptorUtil.module
 import org.jetbrains.kotlin.idea.caches.resolve.resolveToDescriptor
+import com.intellij.util.indexing.FileBasedIndex
 
 private val LOG = Logger.getInstance("org.jetbrains.kotlin.idea.debugger")
 
@@ -115,9 +116,11 @@ private fun findPackagePartFileNamesForElement(elementAt: JetElement): List<Stri
                     JdkScope(project, libraryEntry as JdkOrderEntry)
                 }
 
-    val packagePartFiles = FilenameIndex.getAllFilesByExt(project, "class", scope)
-            .filter { it.getName().startsWith(packagePartNameWoHash) }
-            .map {
+    val packagePartFiles = FilenameIndex.getAllFilenames(project).stream().filter {
+                it.startsWith(packagePartNameWoHash) && it.endsWith(".class")
+            }.flatMap {
+                FilenameIndex.getVirtualFilesByName(project, it, scope).stream()
+            }.map {
                 val packageFqName = file.getPackageFqName()
                 if (packageFqName.isRoot()) {
                     it.getNameWithoutExtension()
@@ -125,7 +128,7 @@ private fun findPackagePartFileNamesForElement(elementAt: JetElement): List<Stri
                     "${packageFqName.asString()}.${it.getNameWithoutExtension()}"
                 }
             }
-    return packagePartFiles
+    return packagePartFiles.toList()
 }
 
 private fun render(desc: DeclarationDescriptor) = DescriptorRenderer.FQ_NAMES_IN_TYPES.render(desc)
diff --git a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java
index 748ed8b245c..07ad78368be 100644
--- a/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java
+++ b/idea/src/org/jetbrains/kotlin/idea/util/DebuggerUtils.java
@@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.kotlin.idea.codeInsight.CodeInsightUtils;
 import org.jetbrains.kotlin.idea.debugger.DebuggerPackage;
+import org.jetbrains.kotlin.load.kotlin.PackageClassUtils;
 import org.jetbrains.kotlin.load.kotlin.PackagePartClassUtils;
 import org.jetbrains.kotlin.psi.JetElement;
 import org.jetbrains.kotlin.psi.JetFile;
@@ -63,12 +64,16 @@ public class DebuggerUtils {
             return filesWithExactName.iterator().next();
         }
 
+        if (!isPackagePartClassName(className)) {
+            return filesWithExactName.iterator().next();
+        }
+
         JetFile file = getFileForPackagePartPrefixedName(filesWithExactName, className.getInternalName());
         if (file != null) {
             return file;
         }
 
-        boolean isInLibrary = KotlinPackage.any(filesWithExactName, new Function1<JetFile, Boolean>() {
+        boolean isInLibrary = KotlinPackage.all(filesWithExactName, new Function1<JetFile, Boolean>() {
             @Override
             public Boolean invoke(JetFile file) {
                 return LibraryUtil.findLibraryEntry(file.getVirtualFile(), file.getProject()) != null;
@@ -91,6 +96,11 @@ public class DebuggerUtils {
         return null;
     }
 
+    private static boolean isPackagePartClassName(JvmClassName className) {
+        String packageName = className.getPackageFqName().asString().replaceAll("\\.", "/");
+        return className.getInternalName().startsWith(packageName + "/" + PackageClassUtils.getPackageClassName(className.getPackageFqName()));
+    }
+
     @Nullable
     private static JetFile getFileForPackagePartPrefixedName(
             @NotNull Collection<JetFile> allPackageFiles,