From 7671de1b20d6cb9493288b3b41393f6bbcb2f543 Mon Sep 17 00:00:00 2001 From: Konstantin Tskhovrebov Date: Mon, 6 Apr 2020 18:45:49 +0300 Subject: [PATCH] Disable test run line marker for object classes. --- .../highlighter/KotlinTestRunLineMarkerContributor.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt index 93bcf088d50..9ec22ed0011 100644 --- a/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt +++ b/idea/src/org/jetbrains/kotlin/idea/highlighter/KotlinTestRunLineMarkerContributor.kt @@ -31,10 +31,10 @@ import org.jetbrains.kotlin.idea.platform.tooling import org.jetbrains.kotlin.idea.project.platform import org.jetbrains.kotlin.idea.util.projectStructure.module import org.jetbrains.kotlin.platform.idePlatformKind -import org.jetbrains.kotlin.psi.KtClassOrObject +import org.jetbrains.kotlin.psi.KtClass import org.jetbrains.kotlin.psi.KtNamedDeclaration import org.jetbrains.kotlin.psi.KtNamedFunction -import org.jetbrains.kotlin.psi.psiUtil.containingClassOrObject +import org.jetbrains.kotlin.psi.psiUtil.containingClass import org.jetbrains.kotlin.psi.psiUtil.getStrictParentOfType import javax.swing.Icon @@ -59,9 +59,9 @@ class KotlinTestRunLineMarkerContributor : RunLineMarkerContributor() { val declaration = element.getStrictParentOfType() ?: return null if (declaration.nameIdentifier != element) return null - if (declaration !is KtClassOrObject && declaration !is KtNamedFunction) return null + if (declaration !is KtClass && declaration !is KtNamedFunction) return null - if (declaration is KtNamedFunction && declaration.containingClassOrObject == null) return null + if (declaration is KtNamedFunction && declaration.containingClass() == null) return null // To prevent IDEA failing on red code val descriptor = declaration.resolveToDescriptorIfAny() ?: return null