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

FirJavaElementFinder: return packages with true isValid()

Browse Source 
#KT-65111 Fixed
This commit is contained in:
Mikhail Glukhikh
2024-01-19 11:42:54 +01:00
committed by Space Team
parent ae6aef3a63
commit a83d2b7a67
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/fir/java/src/org/jetbrains/kotlin/fir/java/FirJavaElementFinder.kt
+7 -1
View File
@@ -79,7 +79,13 @@ class FirJavaElementFinder(
override fun findPackage(qualifiedName: String): PsiPackage? { override fun findPackage(qualifiedName: String): PsiPackage? {
if (firProviders.none { it.symbolProvider.getPackage(FqName(qualifiedName)) != null }) return null if (firProviders.none { it.symbolProvider.getPackage(FqName(qualifiedName)) != null }) return null
return PsiPackageImpl(psiManager, qualifiedName) return FirPsiPackage(psiManager, qualifiedName)
}
private class FirPsiPackage(psiManager: PsiManager, qualifiedName: String) : PsiPackageImpl(psiManager, qualifiedName) {
// Note: for standard PsiPackageImpl, PsiPackageImplementationHelper.getInstance().packagePrefixExists returns false here
// See KT-65111
override fun isValid(): Boolean = true
} }
override fun getClasses(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiClass> { override fun getClasses(psiPackage: PsiPackage, scope: GlobalSearchScope): Array<PsiClass> {
compiler/testData/codegen/box/fir/kotlinJavaKotlin.kt
Vendored
-1
View File
@@ -1,5 +1,4 @@
// TARGET_BACKEND: JVM_IR // TARGET_BACKEND: JVM_IR
// IGNORE_BACKEND_K2: JVM_IR
// ISSUE: KT-65111 // ISSUE: KT-65111
// FILE: plugin/Plugin.java // FILE: plugin/Plugin.java