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

New J2K: Fix adding JvmOverloads annotation in DefaultArgumentsConversion

Browse Source
This commit is contained in:
Ilya Kirillov
2019-01-18 13:58:35 +03:00
committed by Ilya Kirillov
parent 962b971f07
commit e4c15c3fb9
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
j2k/newSrc/org/jetbrains/kotlin/j2k/conversions/DefaultArgumentsConversion.kt
+9 -5
View File
@@ -82,18 +82,22 @@ class DefaultArgumentsConversion(private val context: ConversionContext) : Recur
parameter.initializer = remapParameterSymbol(defaultValue) as JKExpression
}
if (calledMethod.visibility == Visibility.PUBLIC &&
!calledMethod.annotationList.annotations.any { it.classSymbol.fqName == "kotlin.annotation.AnnotationTarget.JvmOverloads" }
) {
calledMethod.annotationList.annotations += jvmAnnotation("JvmOverloads", context.symbolProvider)
}
element.classBody.declarations -= method
}
for (method in element.declarationList) {
if (method !is JKMethod) continue
if (method.hasParametersWithDefaultValues() && (method.visibility == Visibility.PUBLIC || method.visibility == Visibility.INTERNAL)) {
method.annotationList.annotations += jvmAnnotation("JvmOverloads", context.symbolProvider)
}
}
return recurse(element)
}
private fun JKMethod.hasParametersWithDefaultValues() =
parameters.any { it.initializer !is JKStubExpression }
private fun lookupCall(statement: JKStatement): JKMethodCallExpression? {
val expression = when (statement) {