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

Uast: handling annotations on the property receiver (KT-40539)

Browse Source
This commit is contained in:
Nicolay Mitropolsky
2020-07-27 21:46:38 +03:00
parent 325ad56dcd
commit c254651ed3
5 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/uast-kotlin/src/org/jetbrains/uast/kotlin/declarations/KotlinUMethod.kt
+7 -1
View File
@@ -60,7 +60,13 @@ open class KotlinUMethod(
.map { KotlinUAnnotation(it, this) }
}
private val receiver by lz { (sourcePsi as? KtCallableDeclaration)?.receiverTypeReference }
private val receiver by lz {
when (sourcePsi) {
is KtCallableDeclaration -> sourcePsi
is KtPropertyAccessor -> sourcePsi.property
else -> null
}?.receiverTypeReference
}
override val uastParameters by lz {
plugins/uast-kotlin/testData/ReceiverFun.log-ide.txt
Vendored
+3
View File
@@ -11,6 +11,9 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = length)
UMethod (name = getRx)
UParameter (name = $this$getRx)
UAnnotation (fqName = MyReceiverAnnotation)
UNamedExpression (name = name)
ULiteralExpression (value = "RegExp")
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
UReturnExpression
plugins/uast-kotlin/testData/ReceiverFun.log.txt
Vendored
+3
View File
@@ -11,6 +11,9 @@ UFile (package = )
USimpleNameReferenceExpression (identifier = length)
UMethod (name = getRx)
UParameter (name = $this$rx)
UAnnotation (fqName = MyReceiverAnnotation)
UNamedExpression (name = name)
ULiteralExpression (value = "RegExp")
UAnnotation (fqName = org.jetbrains.annotations.NotNull)
UBlockExpression
UReturnExpression
plugins/uast-kotlin/testData/ReceiverFun.render-ide.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ public final class ReceiverFunKt {
public static final fun foo(@MyReceiverAnnotation @org.jetbrains.annotations.NotNull $this$foo: java.lang.String) : int {
return this.length
}
public static final fun getRx(@org.jetbrains.annotations.NotNull $this$getRx: java.lang.String) : kotlin.text.Regex {
public static final fun getRx(@MyReceiverAnnotation(name = "RegExp") @org.jetbrains.annotations.NotNull $this$getRx: java.lang.String) : kotlin.text.Regex {
return toRegex()
}
}
plugins/uast-kotlin/testData/ReceiverFun.render.txt
Vendored
+1 -1
View File
@@ -2,7 +2,7 @@ public final class ReceiverFunKt {
public static final fun foo(@MyReceiverAnnotation @org.jetbrains.annotations.NotNull $this$foo: java.lang.String) : int {
return this.length
}
public static final fun getRx(@org.jetbrains.annotations.NotNull $this$rx: java.lang.String) : kotlin.text.Regex {
public static final fun getRx(@MyReceiverAnnotation(name = "RegExp") @org.jetbrains.annotations.NotNull $this$rx: java.lang.String) : kotlin.text.Regex {
return toRegex()
}
}