azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

JavaElementFinder: avoid returning fake light class in findClass*

Browse Source 
findClass* are supposed to return a single visible class
    from given scope with given fqname
After sorting FakeFileForLightClass would sometimes be first in the list
    leading to exceptions like KT-24704

  #KT-24704 Fixed
This commit is contained in:
Pavel V. Talanov
2018-06-01 18:22:14 +02:00
parent 86e52f45b1
commit d18846201a
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/light-classes/src/org/jetbrains/kotlin/asJava/finder/JavaElementFinder.kt
+7 -4
View File
@@ -25,6 +25,7 @@ import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.util.PsiUtilCore import com.intellij.psi.util.PsiUtilCore
import com.intellij.util.SmartList import com.intellij.util.SmartList
import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport import org.jetbrains.kotlin.asJava.KotlinAsJavaSupport
import org.jetbrains.kotlin.asJava.classes.FakeLightClassForFileOfPackage
import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.java.JvmAbi
import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.name.FqName
@@ -56,7 +57,7 @@ class JavaElementFinder(
answer.addAll(kotlinAsJavaSupport.getFacadeClasses(qualifiedName, scope)) answer.addAll(kotlinAsJavaSupport.getFacadeClasses(qualifiedName, scope))
answer.addAll(kotlinAsJavaSupport.getKotlinInternalClasses(qualifiedName, scope)) answer.addAll(kotlinAsJavaSupport.getKotlinInternalClasses(qualifiedName, scope))
return answer.sortByClasspath(scope).toTypedArray() return answer.sortByClasspathPreferringNonFakeFiles(scope).toTypedArray()
} }
// Finds explicitly declared classes and objects, not package classes // Finds explicitly declared classes and objects, not package classes
@@ -139,7 +140,7 @@ class JavaElementFinder(
answer.add(aClass) answer.add(aClass)
} }
return answer.sortByClasspath(scope).toTypedArray() return answer.sortByClasspathPreferringNonFakeFiles(scope).toTypedArray()
} }
override fun getPackageFiles(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiFile> { override fun getPackageFiles(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiFile> {
@@ -183,8 +184,10 @@ class JavaElementFinder(
} }
} }
private fun List<PsiClass>.sortByClasspath(searchScope: GlobalSearchScope): Collection<PsiClass> { private fun List<PsiClass>.sortByClasspathPreferringNonFakeFiles(searchScope: GlobalSearchScope): List<PsiClass> {
return this.sortedWith(byClasspathComparator(searchScope)) return this.sortedWith(byClasspathComparator(searchScope)).sortedBy {
this is FakeLightClassForFileOfPackage
}
} }
} }
} }