#KT-13750 fix (#951)

j2k/src/org/jetbrains/kotlin/j2k/Converter.kt

@@ -19,6 +19,7 @@ package org.jetbrains.kotlin.j2k
 import com.intellij.openapi.project.Project
 import com.intellij.psi.*
 import com.intellij.psi.CommonClassNames.*
+import com.intellij.psi.search.GlobalSearchScope
 import com.intellij.psi.util.InheritanceUtil
 import com.intellij.psi.util.PsiMethodUtil
 import com.intellij.psi.util.PsiTreeUtil
@@ -141,7 +142,7 @@ class Converter private constructor(
         commonState.postUnfoldActions.forEach { it() }
     }
 
-    fun<TResult : Element> deferredElement(generator: (CodeConverter) -> TResult): DeferredElement<TResult> {
+    fun <TResult : Element> deferredElement(generator: (CodeConverter) -> TResult): DeferredElement<TResult> {
         val element = DeferredElement(generator, personalState)
         commonState.deferredElements.add(element)
         return element
@@ -309,7 +310,7 @@ class Converter private constructor(
         val setMethod = propertyInfo.setMethod
 
         //TODO: annotations from getter/setter?
-        val annotations = field?.let { convertAnnotations(it) } ?: Annotations.Empty
+        val annotations = field?.let { convertAnnotations(it) + specialAnnotationPropertyCases(it) } ?: Annotations.Empty
 
         val modifiers = propertyInfo.modifiers
 
@@ -424,6 +425,24 @@ class Converter private constructor(
         }
     }
 
+
+    private fun specialAnnotationPropertyCases(field: PsiField): Annotations {
+        val javaSerializableInterface = JavaPsiFacade.getInstance(project).findClass(CommonClassNames.JAVA_IO_SERIALIZABLE, field.resolveScope)
+        val output = mutableListOf<Annotation>()
+        if (javaSerializableInterface != null &&
+            field.name == "serialVersionUID" &&
+            field.hasModifierProperty(PsiModifier.FINAL) &&
+            field.hasModifierProperty(PsiModifier.STATIC) &&
+            field.containingClass?.isInheritor(javaSerializableInterface, false) ?: false
+        ) {
+            output.add(Annotation(Identifier.withNoPrototype("JvmStatic"),
+                                  listOf(),
+                                  newLineAfter = false).assignNoPrototype())
+        }
+
+        return Annotations(output)
+    }
+
     private fun combinedNullability(vararg psiElements: PsiElement?): Nullability {
         val values = psiElements.filterNotNull().map {
             when (it) {

j2k/testData/fileOrElement/annotations/serialVersionUID.java

@@ -0,0 +1,12 @@
+
+import java.io.Serializable;
+
+public class Bar implements Serializable {
+    private static final long serialVersionUID = 0;
+    int foobar = 0;
+}
+
+public class Foo {
+    private static final long serialVersionUID = 0;
+    int foobar = 0;
+}

j2k/testData/fileOrElement/annotations/serialVersionUID.kt

@@ -0,0 +1,17 @@
+import java.io.Serializable
+
+class Bar : Serializable {
+    internal var foobar = 0
+
+    companion object {
+        @JvmStatic private val serialVersionUID: Long = 0
+    }
+}
+
+class Foo {
+    internal var foobar = 0
+
+    companion object {
+        private val serialVersionUID: Long = 0
+    }
+}

j2k/testData/fileOrElement/issues/kt-837.kt

@@ -11,6 +11,6 @@ class Language(protected var code: String) : Serializable {
     companion object {
         var ENGLISH = Language("en")
         var SWEDISH = Language("sv")
-        private val serialVersionUID = -2442762969929206780L
+        @JvmStatic private val serialVersionUID = -2442762969929206780L
     }
 }

j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java

@@ -120,6 +120,12 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo
             String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java");
             doTest(fileName);
         }
+
+        @TestMetadata("serialVersionUID.java")
+        public void testSerialVersionUID() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/serialVersionUID.java");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("j2k/testData/fileOrElement/anonymousBlock")

j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java

@@ -120,6 +120,12 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo
             String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/primaryConstructorAnnotation.java");
             doTest(fileName);
         }
+
+        @TestMetadata("serialVersionUID.java")
+        public void testSerialVersionUID() throws Exception {
+            String fileName = KotlinTestUtils.navigationMetadata("j2k/testData/fileOrElement/annotations/serialVersionUID.java");
+            doTest(fileName);
+        }
     }
 
     @TestMetadata("j2k/testData/fileOrElement/anonymousBlock")