@@ -22,17 +22,10 @@ import com.intellij.psi.PsiMethod
22
22
import com.intellij.psi.PsiNameIdentifierOwner
23
23
import org.jetbrains.kotlin.asJava.elements.*
24
24
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.*
29
26
import org.jetbrains.uast.*
30
- import org.jetbrains.uast.java.JavaUAnnotation
31
- import org.jetbrains.uast.java.annotations
32
27
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.*
36
29
37
30
open class KotlinUMethod (
38
31
psi : KtLightMethod ,
@@ -42,7 +35,9 @@ open class KotlinUMethod(
42
35
43
36
private val kotlinOrigin = (psi.originalElement as KtLightElement <* , * >).kotlinOrigin
44
37
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
+ }
46
41
47
42
override val uastParameters by lz {
48
43
psi.parameterList.parameters.map { KotlinUParameter (it, this ) }
0 commit comments