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

Minor: fix compilation exception (due to exception in kotlinc)

Browse Source 
(cherry picked from commit 5f2d3c4)
This commit is contained in:
Yan Zhulanow
2016-09-01 17:58:27 +03:00
committed by Yan Zhulanow
parent 471ddc5a93
commit c3ae66bc9c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/annotation-processing/src/org/jetbrains/kotlin/annotation/processing/RoundAnnotations.kt
+2 -2
View File
@@ -17,12 +17,12 @@
package org.jetbrains.kotlin.annotation.processing package org.jetbrains.kotlin.annotation.processing
import com.intellij.psi.* import com.intellij.psi.*
import com.intellij.psi.util.PsiTreeUtil
import org.jetbrains.kotlin.asJava.findFacadeClass import org.jetbrains.kotlin.asJava.findFacadeClass
import org.jetbrains.kotlin.asJava.toLightClass import org.jetbrains.kotlin.asJava.toLightClass
import org.jetbrains.kotlin.java.model.internal.getAnnotationsWithInherited import org.jetbrains.kotlin.java.model.internal.getAnnotationsWithInherited
import org.jetbrains.kotlin.psi.KtClassOrObject import org.jetbrains.kotlin.psi.KtClassOrObject
import org.jetbrains.kotlin.psi.KtFile import org.jetbrains.kotlin.psi.KtFile
import org.jetbrains.kotlin.psi.psiUtil.getParentOfType
internal class RoundAnnotations(val supportedAnnotationFqNames: Set<String>) { internal class RoundAnnotations(val supportedAnnotationFqNames: Set<String>) {
private val mutableAnnotationsMap = mutableMapOf<String, MutableList<PsiModifierListOwner>>() private val mutableAnnotationsMap = mutableMapOf<String, MutableList<PsiModifierListOwner>>()
@@ -61,7 +61,7 @@ internal class RoundAnnotations(val supportedAnnotationFqNames: Set<String>) {
fun PsiElement.getTopLevelClassParent(): PsiClass? = when (this) { fun PsiElement.getTopLevelClassParent(): PsiClass? = when (this) {
is PsiClass -> containingClass?.let { it.getTopLevelClassParent() } ?: this is PsiClass -> containingClass?.let { it.getTopLevelClassParent() } ?: this
else -> getParentOfType<PsiClass>(true)?.getTopLevelClassParent() else -> PsiTreeUtil.getParentOfType(this, PsiClass::class.java, true)?.getTopLevelClassParent()
} }
fun analyzeDeclaration(declaration: PsiElement): Boolean { fun analyzeDeclaration(declaration: PsiElement): Boolean {