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

KT-44250 [Sealed interfaces]: completion fails for 'when' with sealed

Browse Source
This commit is contained in:
Andrei Klunnyi
2021-01-18 15:55:38 +01:00
committed by Space
parent 14108011ee
commit 77ffc318f2
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/compiler/IdeSealedClassInheritorsProvider.kt
+6 -1
View File
@@ -31,7 +31,7 @@ object IdeSealedClassInheritorsProvider : SealedClassInheritorsProvider() {
val module = sealedKtClass.module ?: return emptyList() val module = sealedKtClass.module ?: return emptyList()
val moduleSourceScope = GlobalSearchScope.moduleScope(module) val moduleSourceScope = GlobalSearchScope.moduleScope(module)
val containingPackage = sealedClass.containingPackage() ?: return emptyList() val containingPackage = sealedClass.containingPackage() ?: return emptyList()
val psiPackage = JavaDirectoryService.getInstance().getPackage(sealedKtClass.containingFile.containingDirectory) val psiPackage = getPackageViaDirectoryService(sealedKtClass)
?: JavaPsiFacade.getInstance(sealedKtClass.project).findPackage(containingPackage.asString()) ?: JavaPsiFacade.getInstance(sealedKtClass.project).findPackage(containingPackage.asString())
?: return emptyList() ?: return emptyList()
val packageScope = PackageScope(psiPackage, false, false) val packageScope = PackageScope(psiPackage, false, false)
@@ -50,4 +50,9 @@ object IdeSealedClassInheritorsProvider : SealedClassInheritorsProvider() {
}.filterNotNull() }.filterNotNull()
.sortedBy(ClassDescriptor::getName) // order needs to be stable (at least for tests) .sortedBy(ClassDescriptor::getName) // order needs to be stable (at least for tests)
} }
private fun getPackageViaDirectoryService(ktClass: KtClass): PsiPackage? {
val directory = ktClass.containingFile.containingDirectory ?: return null
return JavaDirectoryService.getInstance().getPackage(directory)
}
} }