From 4c58016fa4c018af23e5d450ddca017f675137cc Mon Sep 17 00:00:00 2001
From: Ilya Kirillov <ilya.kirillov@jetbrains.com>
Date: Mon, 8 Apr 2019 18:59:54 +0300
Subject: [PATCH] New J2K: remove SuppressWarnings annotation

---
 .../conversions/JavaAnnotationsConversion.kt  | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
index 125b7e459d1..419ee3b3ce5 100644
--- a/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
+++ b/nj2k/src/org/jetbrains/kotlin/nj2k/conversions/JavaAnnotationsConversion.kt
@@ -6,6 +6,7 @@
 package org.jetbrains.kotlin.nj2k.conversions
 
 import org.jetbrains.kotlin.nj2k.ConversionContext
+import org.jetbrains.kotlin.nj2k.copyTreeAndDetach
 import org.jetbrains.kotlin.nj2k.tree.*
 import org.jetbrains.kotlin.nj2k.tree.impl.JKAnnotationParameterImpl
 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() {
     override fun applyToElement(element: JKTreeElement): JKTreeElement {
-        if (element !is JKAnnotation) return recurse(element)
-        if (element.classSymbol.name == "Deprecated" && element.arguments.isEmpty()) {
-            element.arguments +=
-                    JKAnnotationParameterImpl(JKKtLiteralExpressionImpl("\"\"", JKLiteralExpression.LiteralType.STRING))
+        if (element is JKAnnotationList) {
+            for (annotation in element.annotations) {
+                if (annotation.classSymbol.fqName == "java.lang.SuppressWarnings") {
+                    element.annotations -= annotation
+                } else {
+                    processAnnotation(annotation)
+                }
+            }
         }
-        if (element.classSymbol.fqName == "java.lang.annotation.Target") {
-            element.classSymbol = context.symbolProvider.provideByFqName("kotlin.annotation.Target")
+        return recurse(element)
+    }
 
-            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
                 when (value) {
                     is JKKtAnnotationArrayInitializerExpression -> value.initializers
@@ -36,14 +52,11 @@ class JavaAnnotationsConversion(private val context: ConversionContext) : Recurs
                             ?.let { targetMappings[it] }
                             ?.map { fqName ->
                                 JKFieldAccessExpressionImpl(context.symbolProvider.provideByFqName(fqName))
-                            } ?: listOf(value)
+                            } ?: listOf(value.copyTreeAndDetach())
                     }
-
-                element.arguments = newArguments.map { JKAnnotationParameterImpl(it) }
+                annotation.arguments = newArguments.map { JKAnnotationParameterImpl(it) }
             }
         }
-
-        return recurse(element)
     }
 
     private fun JKAnnotationMemberValue.fieldAccessFqName(): String? =