Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enhance subclass fetching for ultra light classes #394

Merged
merged 3 commits into from
Oct 15, 2024
Merged

Enhance subclass fetching for ultra light classes #394

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6aa49d9
Enhance subclass fetching for ultra light classes
pderakhshanfar Oct 15, 2024
4628e74
Use a non-experimental API
pderakhshanfar Oct 15, 2024
7a06c31
Remove unused import
pderakhshanfar Oct 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion kotlin/src/main/kotlin/org/jetbrains/research/testspark/kotlin/KotlinPsiClassWrapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@ import com.intellij.psi.PsiFile
import com.intellij.psi.search.GlobalSearchScope
import com.intellij.psi.search.searches.ClassInheritorsSearch
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.asJava.classes.KtUltraLightClass
import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.idea.base.psi.kotlinFqName
import org.jetbrains.kotlin.idea.caches.resolve.analyze
import org.jetbrains.kotlin.idea.refactoring.isInterfaceClass
import org.jetbrains.kotlin.idea.testIntegration.framework.KotlinPsiBasedTestFramework.Companion.asKtClassOrObject
import org.jetbrains.kotlin.lexer.KtTokens
import org.jetbrains.kotlin.psi.KtClass
import org.jetbrains.kotlin.psi.KtClassOrObject
Expand Down Expand Up @@ -91,7 +93,14 @@ class KotlinPsiClassWrapper(private val psiClass: KtClassOrObject) : PsiClassWra
val lightClass = psiClass.toLightClass()
return if (lightClass != null) {
val query = ClassInheritorsSearch.search(lightClass, scope, false)
query.findAll().filter { it.kotlinFqName != null }.map { KotlinPsiClassWrapper(it as KtClass) }
query.findAll().filter { it.kotlinFqName != null }.map {
// If the sub-class is fetched as an ultra light class, get the KtClass
if (it is KtUltraLightClass) {
KotlinPsiClassWrapper(it.asKtClassOrObject() as KtClass)
} else {
KotlinPsiClassWrapper(it as KtClass)
}
}
} else {
emptyList()
}
Expand Down
Loading