From c3ae66bc9c1dc295f13b7d155b92c2079c72fc1d Mon Sep 17 00:00:00 2001 From: Yan Zhulanow Date: Thu, 1 Sep 2016 17:58:27 +0300 Subject: [PATCH] Minor: fix compilation exception (due to exception in kotlinc) (cherry picked from commit 5f2d3c4) --- .../kotlin/annotation/processing/RoundAnnotations.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/RoundAnnotations.kt b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/RoundAnnotations.kt index 7aa973e6c7b..8bb4e2a8ee5 100644 --- a/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/RoundAnnotations.kt +++ b/plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/RoundAnnotations.kt @@ -17,12 +17,12 @@ package org.jetbrains.kotlin.annotation.processing import com.intellij.psi.* +import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.asJava.findFacadeClass import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.java.model.internal.getAnnotationsWithInherited import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtFile -import org.jetbrains.kotlin.psi.psiUtil.getParentOfType internal class RoundAnnotations(val supportedAnnotationFqNames: Set) { private val mutableAnnotationsMap = mutableMapOf>() @@ -61,7 +61,7 @@ internal class RoundAnnotations(val supportedAnnotationFqNames: Set) { fun PsiElement.getTopLevelClassParent(): PsiClass? = when (this) { is PsiClass -> containingClass?.let { it.getTopLevelClassParent() } ?: this - else -> getParentOfType(true)?.getTopLevelClassParent() + else -> PsiTreeUtil.getParentOfType(this, PsiClass::class.java, true)?.getTopLevelClassParent() } fun analyzeDeclaration(declaration: PsiElement): Boolean {