Copy to interface just companion object public const properties

compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.java

@@ -8,6 +8,9 @@ public interface TraitClassObjectField {
         private final java.lang.String x = "";
         private final java.lang.String y = "";
 
+        /**
+         * @deprecated
+         */
         @org.jetbrains.annotations.Nullable
         public final java.lang.String getX() { /* compiled code */ }
 

compiler/testData/asJava/lightClasses/nullabilityAnnotations/TraitClassObjectField.kt

@@ -2,7 +2,7 @@
 
 interface TraitClassObjectField {
     companion object {
-        val x: String? = ""
+        const val x: String? = ""
         private val y: String? = ""
     }
 }

compiler/testData/codegen/boxWithJava/properties/classObjectProperties/classObjectProperties.kt

@@ -6,14 +6,14 @@ class Klass {
 
 interface Trait {
     companion object {
-        val NAME = "Trait"
+        const val NAME = "Trait"
     }
 }
 
 enum class Enoom {
     ;
     companion object {
-        val NAME = "Enoom"
+        const val NAME = "Enoom"
     }
 }
 

compiler/testData/codegen/boxWithStdlib/reflection/genericSignature/kt5112.kt

@@ -17,9 +17,6 @@ public class ErrorsJvmClass {
 }
 
 fun box(): String {
-    val genericTypeInTrait = javaClass<ErrorsJvmTrait>().getField("param").getGenericType()
-    if (genericTypeInTrait.toString() != "test.G<java.lang.String>") return "fail1: $genericTypeInTrait"
-
     val genericTypeInClassObject = ErrorsJvmTrait.javaClass.getDeclaredField("param").getGenericType()
     if (genericTypeInClassObject.toString() != "test.G<java.lang.String>") return "fail1: $genericTypeInClassObject"
 

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.kt

@@ -11,13 +11,13 @@ annotation class AFloat(val value: Float)
 interface Test {
 
     companion object {
-        val vstring: String = "Test"
-        val vchar: Char = 'c'
-        val vint: Int = 10
-        val vbyte: Byte = 11
-        val vlong: Long = 12
-        val vdouble: Double = 1.2
-        val vfloat: Float = 1.3.toFloat()
+        const val vstring: String = "Test"
+        const val vchar: Char = 'c'
+        const val vint: Int = 10
+        const val vbyte: Byte = 11
+        const val vlong: Long = 12
+        const val vdouble: Double = 1.2
+        const val vfloat: Float = 1.3.toFloat()
     }
 
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/AnnotationTrait.txt

@@ -43,12 +43,12 @@ public interface Test {
 
     public companion object Companion {
         private constructor Companion()
-        public final val vbyte: kotlin.Byte
-        public final val vchar: kotlin.Char
-        public final val vdouble: kotlin.Double
-        public final val vfloat: kotlin.Float
-        public final val vint: kotlin.Int
-        public final val vlong: kotlin.Long
-        public final val vstring: kotlin.String
+        public const final val vbyte: kotlin.Byte
+        public const final val vchar: kotlin.Char
+        public const final val vdouble: kotlin.Double
+        public const final val vfloat: kotlin.Float
+        public const final val vint: kotlin.Int
+        public const final val vlong: kotlin.Long
+        public const final val vstring: kotlin.String
     }
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.kt

@@ -3,7 +3,7 @@ package test
 interface Test {
 
   companion object {
-    public val valProp: Int = 10
+    public const val valProp: Int = 10
   }
 
 }

compiler/testData/compileJavaAgainstKotlin/staticFields/staticTraitProperty.txt

@@ -4,7 +4,7 @@ public interface Test {
 
     public companion object Companion {
         private constructor Companion()
-        public final val valProp: kotlin.Int
+        public const final val valProp: kotlin.Int
     }
 }
 

compiler/testData/writeFlags/property/classObject/trait/internalConstVal.kt

@@ -0,0 +1,13 @@
+interface Test {
+  companion object {
+    internal const val prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// ABSENT: TRUE
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test$Companion, prop
+// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC

compiler/testData/writeFlags/property/classObject/trait/internalVal.kt

@@ -1,13 +1,13 @@
 interface Test {
   companion object {
-    val prop: Int = 0;
+    internal val prop: Int = 0;
   }
 }
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test, prop
-// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
+// ABSENT: TRUE
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test$Companion, prop
-// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC
+// FLAGS: ACC_PRIVATE, ACC_FINAL, ACC_STATIC, ACC_SYNTHETIC

compiler/testData/writeFlags/property/classObject/trait/internalVar.kt

@@ -1,6 +1,6 @@
 interface Test {
   companion object {
-    var prop: Int = 0;
+    internal var prop: Int = 0;
   }
 }
 
@@ -10,4 +10,4 @@ interface Test {
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test$Companion, prop
-// FLAGS: ACC_PRIVATE, ACC_STATIC
+// FLAGS: ACC_PRIVATE, ACC_STATIC, ACC_SYNTHETIC

compiler/testData/writeFlags/property/classObject/trait/internalVarPrivateSet.kt

@@ -1,6 +1,6 @@
 interface Test {
   companion object {
-    var prop: Int = 0
+    internal var prop: Int = 0
       private set
   }
 }
@@ -11,4 +11,4 @@ interface Test {
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test$Companion, prop
-// FLAGS: ACC_PRIVATE, ACC_STATIC
+// FLAGS: ACC_PRIVATE, ACC_STATIC, ACC_SYNTHETIC

compiler/testData/writeFlags/property/classObject/trait/publicConstVal.kt

@@ -0,0 +1,13 @@
+interface Test {
+  companion object {
+    public const val prop: Int = 0;
+  }
+}
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test, prop
+// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
+
+// TESTED_OBJECT_KIND: property
+// TESTED_OBJECTS: Test$Companion, prop
+// FLAGS: ACC_PUBLIC, ACC_FINAL, ACC_STATIC

compiler/testData/writeFlags/property/classObject/trait/publicVal.kt

@@ -6,7 +6,7 @@ interface Test {
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test, prop
-// FLAGS: ACC_STATIC, ACC_PUBLIC, ACC_FINAL
+// ABSENT: TRUE
 
 // TESTED_OBJECT_KIND: property
 // TESTED_OBJECTS: Test$Companion, prop