Skip to content

Commit 1452129

Browse files
committed
Fixed InvalidMirrorException in uast while getting annotation argument location
1 parent bad1524 commit 1452129

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@ import com.intellij.psi.PsiMethod
2222
import com.intellij.psi.PsiNameIdentifierOwner
2323
import org.jetbrains.kotlin.asJava.elements.*
2424
import org.jetbrains.kotlin.lexer.KtTokens
25-
import org.jetbrains.kotlin.psi.KtCallableDeclaration
26-
import org.jetbrains.kotlin.psi.KtFunction
27-
import org.jetbrains.kotlin.psi.KtParameter
28-
import org.jetbrains.kotlin.psi.KtProperty
25+
import org.jetbrains.kotlin.psi.*
2926
import org.jetbrains.uast.*
30-
import org.jetbrains.uast.java.JavaUAnnotation
31-
import org.jetbrains.uast.java.annotations
3227
import org.jetbrains.uast.java.internal.JavaUElementWithComments
33-
import org.jetbrains.uast.kotlin.KotlinUParameter
34-
import org.jetbrains.uast.kotlin.lz
35-
import org.jetbrains.uast.kotlin.unwrap
28+
import org.jetbrains.uast.kotlin.*
3629

3730
open class KotlinUMethod(
3831
psi: KtLightMethod,
@@ -42,7 +35,9 @@ open class KotlinUMethod(
4235

4336
private val kotlinOrigin = (psi.originalElement as KtLightElement<*, *>).kotlinOrigin
4437

45-
override val annotations by lz { psi.annotations.map { JavaUAnnotation(it, this) } }
38+
override val annotations by lz {
39+
(kotlinOrigin as? KtDeclaration)?.annotationEntries?.map { KotlinUAnnotation(it, this) } ?: emptyList()
40+
}
4641

4742
override val uastParameters by lz {
4843
psi.parameterList.parameters.map { KotlinUParameter(it, this) }

0 commit comments

Comments
 (0)