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

New J2K: remove SuppressWarnings annotation

Browse Source
This commit is contained in:
Ilya Kirillov
2019-04-08 18:59:54 +03:00
parent ecf1ab7f04
commit 4c58016fa4
1 changed files with 25 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
+25 -12
View File
@@ -6,6 +6,7 @@
package org.jetbrains.kotlin.nj2k.conversions package org.jetbrains.kotlin.nj2k.conversions
import org.jetbrains.kotlin.nj2k.ConversionContext import org.jetbrains.kotlin.nj2k.ConversionContext
import org.jetbrains.kotlin.nj2k.copyTreeAndDetach
import org.jetbrains.kotlin.nj2k.tree.* import org.jetbrains.kotlin.nj2k.tree.*
import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationParameterImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationParameterImpl
import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldAccessExpressionImpl import org.jetbrains.kotlin.nj2k.tree.impl.JKFieldAccessExpressionImpl
@@ -14,15 +15,30 @@ import org.jetbrains.kotlin.utils.addToStdlib.safeAs
class JavaAnnotationsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() { class JavaAnnotationsConversion(private val context: ConversionContext) : RecursiveApplicableConversionBase() {
override fun applyToElement(element: JKTreeElement): JKTreeElement { override fun applyToElement(element: JKTreeElement): JKTreeElement {
if (element !is JKAnnotation) return recurse(element) if (element is JKAnnotationList) {
if (element.classSymbol.name == "Deprecated" && element.arguments.isEmpty()) { for (annotation in element.annotations) {
element.arguments += if (annotation.classSymbol.fqName == "java.lang.SuppressWarnings") {
JKAnnotationParameterImpl(JKKtLiteralExpressionImpl("\"\"", JKLiteralExpression.LiteralType.STRING)) element.annotations -= annotation
} else {
processAnnotation(annotation)
}
}
} }
if (element.classSymbol.fqName == "java.lang.annotation.Target") { return recurse(element)
element.classSymbol = context.symbolProvider.provideByFqName("kotlin.annotation.Target") }
val arguments = element.arguments.singleOrNull()?.let { parameter -> private fun processAnnotation(annotation: JKAnnotation) {
if (annotation.classSymbol.fqName == "java.lang.Deprecated") {
annotation.classSymbol = context.symbolProvider.provideByFqName("kotlin.Deprecated")
if (annotation.arguments.isEmpty()) {
annotation.arguments +=
JKAnnotationParameterImpl(JKKtLiteralExpressionImpl("\"\"", JKLiteralExpression.LiteralType.STRING))
}
}
if (annotation.classSymbol.fqName == "java.lang.annotation.Target") {
annotation.classSymbol = context.symbolProvider.provideByFqName("kotlin.annotation.Target")
val arguments = annotation.arguments.singleOrNull()?.let { parameter ->
val value = parameter.value val value = parameter.value
when (value) { when (value) {
is JKKtAnnotationArrayInitializerExpression -> value.initializers is JKKtAnnotationArrayInitializerExpression -> value.initializers
@@ -36,14 +52,11 @@ class JavaAnnotationsConversion(private val context: ConversionContext) : Recurs
?.let { targetMappings[it] } ?.let { targetMappings[it] }
?.map { fqName -> ?.map { fqName ->
JKFieldAccessExpressionImpl(context.symbolProvider.provideByFqName(fqName)) JKFieldAccessExpressionImpl(context.symbolProvider.provideByFqName(fqName))
} ?: listOf(value) } ?: listOf(value.copyTreeAndDetach())
} }
annotation.arguments = newArguments.map { JKAnnotationParameterImpl(it) }
element.arguments = newArguments.map { JKAnnotationParameterImpl(it) }
} }
} }
return recurse(element)
} }
private fun JKAnnotationMemberValue.fieldAccessFqName(): String? = private fun JKAnnotationMemberValue.fieldAccessFqName(): String? =