Skip to content

Commit 7e9bb97

Browse files
committed
chore: kotlin objects are classes too
1 parent c4d7d3c commit 7e9bb97

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

marker/jvm-marker/src/main/kotlin/spp/jetbrains/marker/jvm/service/JVMArtifactScopeService.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class JVMArtifactScopeService : IArtifactScopeService {
6868
override fun getFunctions(element: PsiElement, includeInnerClasses: Boolean): List<PsiNamedElement> {
6969
return when {
7070
ArtifactTypeService.isKotlin(element) -> element.descendantsOfType<KtNamedFunction>().filter {
71-
if (element is KtClass && !includeInnerClasses) {
71+
if (element is KtClassOrObject && !includeInnerClasses) {
7272
element == it.containingClass()
7373
} else true
7474
}.toList()
@@ -89,7 +89,7 @@ class JVMArtifactScopeService : IArtifactScopeService {
8989

9090
override fun getClasses(element: PsiElement): List<PsiNamedElement> {
9191
return when {
92-
ArtifactTypeService.isKotlin(element) -> element.descendantsOfType<KtClass>().toList()
92+
ArtifactTypeService.isKotlin(element) -> element.descendantsOfType<KtClassOrObject>().toList()
9393
else -> element.descendantsOfType<PsiClass>().toList()
9494
}
9595
}
@@ -117,7 +117,7 @@ class JVMArtifactScopeService : IArtifactScopeService {
117117

118118
override fun getParentClass(element: PsiElement): PsiNamedElement? {
119119
return when {
120-
ArtifactTypeService.isKotlin(element) -> element.findParentOfType<KtClass>()
120+
ArtifactTypeService.isKotlin(element) -> element.findParentOfType<KtClassOrObject>()
121121
else -> element.findParentOfType<PsiClass>()
122122
}
123123
}

0 commit comments

Comments
 (0)