Refactoring: code duplication removed from accessor generators

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVal.kt

@@ -0,0 +1,13 @@
+package test
+
+class ClassVal() {
+    val property1 = 1
+
+    internal val property2 = 1
+
+    private val property3 = Object()
+
+    protected val property4: String = ""
+
+    public val property5: Int = 1
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVal.txt

@@ -0,0 +1,15 @@
+package test
+
+internal final class ClassVal {
+    /*primary*/ public constructor ClassVal()
+    internal final val property1 : jet.Int
+        internal final fun <get-property1>() : jet.Int
+    internal final val property2 : jet.Int
+        internal final fun <get-property2>() : jet.Int
+    private final val property3 : java.lang.Object
+        private final fun <get-property3>() : java.lang.Object
+    protected final val property4 : jet.String
+        protected final fun <get-property4>() : jet.String
+    public final val property5 : jet.Int
+        public final fun <get-property5>() : jet.Int
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassValParams.kt

@@ -0,0 +1,11 @@
+package test
+
+class ClassValParams(
+  val pr1: String,
+  internal val pr2 : Int,
+  private val pr3: Long,
+  protected val pr4: java.util.Date,
+  public val pr5 : Any,
+  pr6: Object) {
+}
+

compiler/testData/loadKotlin/prop/defaultAccessors/ClassValParams.txt

@@ -0,0 +1,15 @@
+package test
+
+internal final class ClassValParams {
+    /*primary*/ public constructor ClassValParams(/*0*/ pr1 : jet.String, /*1*/ pr2 : jet.Int, /*2*/ pr3 : jet.Long, /*3*/ pr4 : java.util.Date, /*4*/ pr5 : jet.Any, /*5*/ pr6 : java.lang.Object)
+    internal final val pr1 : jet.String
+        internal final fun <get-pr1>() : jet.String
+    internal final val pr2 : jet.Int
+        internal final fun <get-pr2>() : jet.Int
+    private final val pr3 : jet.Long
+        private final fun <get-pr3>() : jet.Long
+    protected final val pr4 : java.util.Date
+        protected final fun <get-pr4>() : java.util.Date
+    public final val pr5 : jet.Any
+        public final fun <get-pr5>() : jet.Any
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassValWithGet.kt

@@ -0,0 +1,20 @@
+package test
+
+class ClassVal() {
+    val property1 = 1
+      get
+
+    internal val property2 = 1
+      get
+
+    private val property3 = Object()
+      get
+
+    protected val property4: String = ""
+      get
+
+    public val property5: Int = 1
+      get
+}
+
+

compiler/testData/loadKotlin/prop/defaultAccessors/ClassValWithGet.txt

@@ -0,0 +1,15 @@
+package test
+
+internal final class ClassVal {
+    /*primary*/ public constructor ClassVal()
+    internal final val property1 : jet.Int
+        internal final fun <get-property1>() : jet.Int
+    internal final val property2 : jet.Int
+        internal final fun <get-property2>() : jet.Int
+    private final val property3 : java.lang.Object
+        private final fun <get-property3>() : java.lang.Object
+    protected final val property4 : jet.String
+        protected final fun <get-property4>() : jet.String
+    public final val property5 : jet.Int
+        public final fun <get-property5>() : jet.Int
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.kt

@@ -0,0 +1,15 @@
+package test
+
+class ClassVar() {
+    var property1 = 1
+
+    internal var property2 = 1
+
+    private var property3 = Object()
+
+    protected var property4: String = ""
+
+    public var property5: Int = 1
+}
+
+

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVar.txt

@@ -0,0 +1,20 @@
+package test
+
+internal final class ClassVar {
+    /*primary*/ public constructor ClassVar()
+    internal final var property1 : jet.Int
+        internal final fun <get-property1>() : jet.Int
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+    internal final var property2 : jet.Int
+        internal final fun <get-property2>() : jet.Int
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+    private final var property3 : java.lang.Object
+        private final fun <get-property3>() : java.lang.Object
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+    protected final var property4 : jet.String
+        protected final fun <get-property4>() : jet.String
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+    public final var property5 : jet.Int
+        public final fun <get-property5>() : jet.Int
+        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : Unit
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.kt

@@ -0,0 +1,18 @@
+package test
+
+open class ClassVarModality() {
+    open var property1 = 1
+
+    final internal var property2 = 1
+
+    open var property3 = 1
+      private set
+
+    final internal var property4 = 1
+      private  set
+}
+
+abstract class ClassVarModalityAbstract {
+    abstract var property1 : java.util.Date
+      public set
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarModality.txt

@@ -0,0 +1,24 @@
+package test
+
+internal open class ClassVarModality {
+    /*primary*/ public constructor ClassVarModality()
+    internal open var property1 : jet.Int
+        internal open fun <get-property1>() : jet.Int
+        internal open fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+    internal final var property2 : jet.Int
+        internal final fun <get-property2>() : jet.Int
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+    internal open var property3 : jet.Int
+        internal open fun <get-property3>() : jet.Int
+        private open fun <set-property3>(/*0*/ <set-?> : jet.Int) : Unit
+    internal final var property4 : jet.Int
+        internal final fun <get-property4>() : jet.Int
+        private final fun <set-property4>(/*0*/ <set-?> : jet.Int) : Unit
+}
+
+internal abstract class ClassVarModalityAbstract {
+    /*primary*/ public constructor ClassVarModalityAbstract()
+    internal abstract var property1 : java.util.Date
+        internal abstract fun <get-property1>() : java.util.Date
+        public abstract fun <set-property1>(/*0*/ <set-?> : java.util.Date) : Unit
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.kt

@@ -0,0 +1,10 @@
+package test
+
+class ClassVarParams(
+  var pr1: String,
+  internal var pr2 : Int,
+  private var pr3: Long,
+  protected var pr4: java.util.Date,
+  public var pr5 : Any,
+  pr6: Object) {
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarParams.txt

@@ -0,0 +1,20 @@
+package test
+
+internal final class ClassVarParams {
+    /*primary*/ public constructor ClassVarParams(/*0*/ pr1 : jet.String, /*1*/ pr2 : jet.Int, /*2*/ pr3 : jet.Long, /*3*/ pr4 : java.util.Date, /*4*/ pr5 : jet.Any, /*5*/ pr6 : java.lang.Object)
+    internal final var pr1 : jet.String
+        internal final fun <get-pr1>() : jet.String
+        internal final fun <set-pr1>(/*0*/ <set-?> : jet.String) : Unit
+    internal final var pr2 : jet.Int
+        internal final fun <get-pr2>() : jet.Int
+        internal final fun <set-pr2>(/*0*/ <set-?> : jet.Int) : Unit
+    private final var pr3 : jet.Long
+        private final fun <get-pr3>() : jet.Long
+        private final fun <set-pr3>(/*0*/ <set-?> : jet.Long) : Unit
+    protected final var pr4 : java.util.Date
+        protected final fun <get-pr4>() : java.util.Date
+        protected final fun <set-pr4>(/*0*/ <set-?> : java.util.Date) : Unit
+    public final var pr5 : jet.Any
+        public final fun <get-pr5>() : jet.Any
+        public final fun <set-pr5>(/*0*/ <set-?> : jet.Any) : Unit
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.kt

@@ -0,0 +1,18 @@
+package test
+
+class ClassVal() {
+    var property1 = 1
+      get
+
+    internal var property2 = 1
+      get
+
+    private var property3 = Object()
+      get
+
+    protected var property4: String = ""
+      get
+
+    public var property5: Int = 1
+      get
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithGet.txt

@@ -0,0 +1,20 @@
+package test
+
+internal final class ClassVal {
+    /*primary*/ public constructor ClassVal()
+    internal final var property1 : jet.Int
+        internal final fun <get-property1>() : jet.Int
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+    internal final var property2 : jet.Int
+        internal final fun <get-property2>() : jet.Int
+        internal final fun <set-property2>(/*0*/ <set-?> : jet.Int) : Unit
+    private final var property3 : java.lang.Object
+        private final fun <get-property3>() : java.lang.Object
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+    protected final var property4 : jet.String
+        protected final fun <get-property4>() : jet.String
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+    public final var property5 : jet.Int
+        public final fun <get-property5>() : jet.Int
+        public final fun <set-property5>(/*0*/ <set-?> : jet.Int) : Unit
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.kt

@@ -0,0 +1,36 @@
+package test
+
+class ClassVal() {
+    var property1 = 1
+      set
+
+    var property2 = Object()
+      protected set
+
+    var property3 = Object()
+      private set
+
+    protected var property4: String = ""
+      set
+
+    protected var property5: String = ""
+      private set
+
+    protected var property6: String = ""
+      internal set
+
+    protected var property7: java.util.Date = java.util.Date()
+      public set
+
+    public var property8: Int = 1
+      set
+
+    public var property9: Int = 1
+      private set
+
+    public var property10: Int = 1
+      protected set
+
+    public var property11: Int = 1
+      internal set
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ClassVarWithSet.txt

@@ -0,0 +1,38 @@
+package test
+
+internal final class ClassVal {
+    /*primary*/ public constructor ClassVal()
+    internal final var property1 : jet.Int
+        internal final fun <get-property1>() : jet.Int
+        internal final fun <set-property1>(/*0*/ <set-?> : jet.Int) : Unit
+    public final var property10 : jet.Int
+        public final fun <get-property10>() : jet.Int
+        protected final fun <set-property10>(/*0*/ <set-?> : jet.Int) : Unit
+    public final var property11 : jet.Int
+        public final fun <get-property11>() : jet.Int
+        internal final fun <set-property11>(/*0*/ <set-?> : jet.Int) : Unit
+    internal final var property2 : java.lang.Object
+        internal final fun <get-property2>() : java.lang.Object
+        protected final fun <set-property2>(/*0*/ <set-?> : java.lang.Object) : Unit
+    internal final var property3 : java.lang.Object
+        internal final fun <get-property3>() : java.lang.Object
+        private final fun <set-property3>(/*0*/ <set-?> : java.lang.Object) : Unit
+    protected final var property4 : jet.String
+        protected final fun <get-property4>() : jet.String
+        protected final fun <set-property4>(/*0*/ <set-?> : jet.String) : Unit
+    protected final var property5 : jet.String
+        protected final fun <get-property5>() : jet.String
+        private final fun <set-property5>(/*0*/ <set-?> : jet.String) : Unit
+    protected final var property6 : jet.String
+        protected final fun <get-property6>() : jet.String
+        internal final fun <set-property6>(/*0*/ <set-?> : jet.String) : Unit
+    protected final var property7 : java.util.Date
+        protected final fun <get-property7>() : java.util.Date
+        public final fun <set-property7>(/*0*/ <set-?> : java.util.Date) : Unit
+    public final var property8 : jet.Int
+        public final fun <get-property8>() : jet.Int
+        public final fun <set-property8>(/*0*/ <set-?> : jet.Int) : Unit
+    public final var property9 : jet.Int
+        public final fun <get-property9>() : jet.Int
+        private final fun <set-property9>(/*0*/ <set-?> : jet.Int) : Unit
+}

compiler/testData/loadKotlin/prop/defaultAccessors/ExtValLong.kt

@@ -0,0 +1,9 @@
+package test
+
+val Long.date1: Object = java.util.Date()
+
+internal val Long.date12: Object = java.util.Date()
+
+private val Long.date3: java.util.Date = java.util.Date()
+
+public val Long.date4: java.util.Date = java.util.Date()

compiler/testData/loadKotlin/prop/defaultAccessors/ExtValLong.txt

@@ -0,0 +1,10 @@
+package test
+
+internal val jet.Long.date1 : java.lang.Object
+    internal fun jet.Long.<get-date1>() : java.lang.Object
+internal val jet.Long.date12 : java.lang.Object
+    internal fun jet.Long.<get-date12>() : java.lang.Object
+private val jet.Long.date3 : java.util.Date
+    private fun jet.Long.<get-date3>() : java.util.Date
+public val jet.Long.date4 : java.util.Date
+    public fun jet.Long.<get-date4>() : java.util.Date

compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.kt

@@ -0,0 +1,9 @@
+package test
+
+var Long.date1: Object = java.util.Date()
+
+internal var Long.date12: Object = java.util.Date()
+
+private var Long.date3: java.util.Date = java.util.Date()
+
+public var Long.date5: java.util.Date = java.util.Date()

compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLong.txt

@@ -0,0 +1,14 @@
+package test
+
+internal var jet.Long.date1 : java.lang.Object
+    internal fun jet.Long.<get-date1>() : java.lang.Object
+    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : Unit
+internal var jet.Long.date12 : java.lang.Object
+    internal fun jet.Long.<get-date12>() : java.lang.Object
+    internal fun jet.Long.<set-date12>(/*0*/ <set-?> : java.lang.Object) : Unit
+private var jet.Long.date3 : java.util.Date
+    private fun jet.Long.<get-date3>() : java.util.Date
+    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.util.Date) : Unit
+public var jet.Long.date5 : java.util.Date
+    public fun jet.Long.<get-date5>() : java.util.Date
+    public fun jet.Long.<set-date5>(/*0*/ <set-?> : java.util.Date) : Unit

compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.kt

@@ -0,0 +1,28 @@
+package test
+
+var Long.date1: Object = java.util.Date()
+  set
+
+var Long.date2: Object = java.util.Date()
+  protected set
+
+var Long.date3: Object = java.util.Date()
+  private set
+
+private var Long.date4: java.util.Date = java.util.Date()
+  set
+
+public var Long.date7: java.util.Date = java.util.Date()
+  set
+
+public var Long.date8: java.util.Date = java.util.Date()
+  internal set
+
+public var Long.date9: java.util.Date = java.util.Date()
+  private set
+
+public var Long.date10: java.util.Date = java.util.Date()
+  protected set
+
+public var Long.date11: java.util.Date = java.util.Date()
+  public set

compiler/testData/loadKotlin/prop/defaultAccessors/ExtVarLongWithSet.txt

@@ -0,0 +1,29 @@
+package test
+
+internal var jet.Long.date1 : java.lang.Object
+    internal fun jet.Long.<get-date1>() : java.lang.Object
+    internal fun jet.Long.<set-date1>(/*0*/ <set-?> : java.lang.Object) : Unit
+public var jet.Long.date10 : java.util.Date
+    public fun jet.Long.<get-date10>() : java.util.Date
+    protected fun jet.Long.<set-date10>(/*0*/ <set-?> : java.util.Date) : Unit
+public var jet.Long.date11 : java.util.Date
+    public fun jet.Long.<get-date11>() : java.util.Date
+    public fun jet.Long.<set-date11>(/*0*/ <set-?> : java.util.Date) : Unit
+internal var jet.Long.date2 : java.lang.Object
+    internal fun jet.Long.<get-date2>() : java.lang.Object
+    protected fun jet.Long.<set-date2>(/*0*/ <set-?> : java.lang.Object) : Unit
+internal var jet.Long.date3 : java.lang.Object
+    internal fun jet.Long.<get-date3>() : java.lang.Object
+    private fun jet.Long.<set-date3>(/*0*/ <set-?> : java.lang.Object) : Unit
+private var jet.Long.date4 : java.util.Date
+    private fun jet.Long.<get-date4>() : java.util.Date
+    private fun jet.Long.<set-date4>(/*0*/ <set-?> : java.util.Date) : Unit
+public var jet.Long.date7 : java.util.Date
+    public fun jet.Long.<get-date7>() : java.util.Date
+    public fun jet.Long.<set-date7>(/*0*/ <set-?> : java.util.Date) : Unit
+public var jet.Long.date8 : java.util.Date
+    public fun jet.Long.<get-date8>() : java.util.Date
+    internal fun jet.Long.<set-date8>(/*0*/ <set-?> : java.util.Date) : Unit
+public var jet.Long.date9 : java.util.Date
+    public fun jet.Long.<get-date9>() : java.util.Date
+    private fun jet.Long.<set-date9>(/*0*/ <set-?> : java.util.Date) : Unit

compiler/testData/writeSignature/declarationSiteVariance/PropertySetterIn.kt

@@ -6,4 +6,4 @@ var p: M<X> = throw Exception()
 // method: _DefaultPackage::setP
 // jvm signature:     (LM;)V
 // generic signature: (LM<-LX;>;)V
-// kotlin signature:  null
+// kotlin signature:  (LM<LX;>;)null

compiler/testData/writeSignature/declarationSiteVariance/PropertySetterOut.kt

@@ -6,4 +6,4 @@ var p: M<X> = throw Exception()
 // method: _DefaultPackage::setP
 // jvm signature:     (LM;)V
 // generic signature: (LM<+LX;>;)V
-// kotlin signature:  null
+// kotlin signature:  (LM<LX;>;)null