Improve generated value impl

backend/codegen/src/main/kotlin/net/mamoe/mirai/console/codegen/ValueImplCodegen.kt

@@ -125,7 +125,7 @@ fun genAllValueImpl(): String = buildString {
                         
                         override val serializer: KSerializer<Mutable${collectionName}<${number}>> = object : KSerializer<Mutable${collectionName}<${number}>> {
                             private val delegate = ${collectionName}Serializer(${number}.serializer())
-                            override val descriptor: SerialDescriptor = delegate.descriptor
+                            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
                             override fun deserialize(decoder: Decoder): Mutable${collectionName}<${number}> {
                                 return delegate.deserialize(decoder).toMutable${collectionName}().observable { 
@@ -208,7 +208,7 @@ fun genPrimitiveValueImpl(
     """.trim()
     }
                     }
-                override val serializer = $serializer
+                override val serializer get() = $serializer
             }
         }
     """.trimIndent() + "\n"
@@ -244,7 +244,7 @@ fun genCollectionValueImpl(
     """.trim()
     }
                     }
-                override val serializer = $serializer
+                override val serializer get() = $serializer
             }
         }
     """.trimIndent() + "\n"

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/_ValueImpl.kt

@@ -31,7 +31,7 @@ internal fun Setting.valueImpl(default: Int): IntValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Int.serializer()
+        override val serializer get() = Int.serializer()
     }
 }
 
@@ -46,7 +46,7 @@ internal fun Setting.valueImpl(default: Short): ShortValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Short.serializer()
+        override val serializer get() = Short.serializer()
     }
 }
 
@@ -61,7 +61,7 @@ internal fun Setting.valueImpl(default: Byte): ByteValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Byte.serializer()
+        override val serializer get() = Byte.serializer()
     }
 }
 
@@ -76,7 +76,7 @@ internal fun Setting.valueImpl(default: Long): LongValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Long.serializer()
+        override val serializer get() = Long.serializer()
     }
 }
 
@@ -91,7 +91,7 @@ internal fun Setting.valueImpl(default: Float): FloatValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Float.serializer()
+        override val serializer get() = Float.serializer()
     }
 }
 
@@ -106,7 +106,7 @@ internal fun Setting.valueImpl(default: Double): DoubleValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Double.serializer()
+        override val serializer get() = Double.serializer()
     }
 }
 
@@ -121,7 +121,7 @@ internal fun Setting.valueImpl(default: Boolean): BooleanValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Boolean.serializer()
+        override val serializer get() = Boolean.serializer()
     }
 }
 
@@ -136,7 +136,7 @@ internal fun Setting.valueImpl(default: Char): CharValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = Char.serializer()
+        override val serializer get() = Char.serializer()
     }
 }
 
@@ -151,7 +151,7 @@ internal fun Setting.valueImpl(default: String): StringValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = String.serializer()
+        override val serializer get() = String.serializer()
     }
 }
 
@@ -166,7 +166,7 @@ internal fun Setting.valueImpl(default: IntArray): IntArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = IntArraySerializer()
+        override val serializer get() = IntArraySerializer()
     }
 }
 
@@ -181,7 +181,7 @@ internal fun Setting.valueImpl(default: ShortArray): ShortArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ShortArraySerializer()
+        override val serializer get() = ShortArraySerializer()
     }
 }
 
@@ -196,7 +196,7 @@ internal fun Setting.valueImpl(default: ByteArray): ByteArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ByteArraySerializer()
+        override val serializer get() = ByteArraySerializer()
     }
 }
 
@@ -211,7 +211,7 @@ internal fun Setting.valueImpl(default: LongArray): LongArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = LongArraySerializer()
+        override val serializer get() = LongArraySerializer()
     }
 }
 
@@ -226,7 +226,7 @@ internal fun Setting.valueImpl(default: FloatArray): FloatArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = FloatArraySerializer()
+        override val serializer get() = FloatArraySerializer()
     }
 }
 
@@ -241,7 +241,7 @@ internal fun Setting.valueImpl(default: DoubleArray): DoubleArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = DoubleArraySerializer()
+        override val serializer get() = DoubleArraySerializer()
     }
 }
 
@@ -256,7 +256,7 @@ internal fun Setting.valueImpl(default: BooleanArray): BooleanArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = BooleanArraySerializer()
+        override val serializer get() = BooleanArraySerializer()
     }
 }
 
@@ -271,7 +271,7 @@ internal fun Setting.valueImpl(default: CharArray): CharArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = CharArraySerializer()
+        override val serializer get() = CharArraySerializer()
     }
 }
 
@@ -286,7 +286,7 @@ internal fun Setting.valueImpl(default: Array<Int>): TypedIntArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Int.serializer())
+        override val serializer get() = ArraySerializer(Int.serializer())
     }
 }
 
@@ -301,7 +301,7 @@ internal fun Setting.valueImpl(default: Array<Short>): TypedShortArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Short.serializer())
+        override val serializer get() = ArraySerializer(Short.serializer())
     }
 }
 
@@ -316,7 +316,7 @@ internal fun Setting.valueImpl(default: Array<Byte>): TypedByteArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Byte.serializer())
+        override val serializer get() = ArraySerializer(Byte.serializer())
     }
 }
 
@@ -331,7 +331,7 @@ internal fun Setting.valueImpl(default: Array<Long>): TypedLongArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Long.serializer())
+        override val serializer get() = ArraySerializer(Long.serializer())
     }
 }
 
@@ -346,7 +346,7 @@ internal fun Setting.valueImpl(default: Array<Float>): TypedFloatArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Float.serializer())
+        override val serializer get() = ArraySerializer(Float.serializer())
     }
 }
 
@@ -361,7 +361,7 @@ internal fun Setting.valueImpl(default: Array<Double>): TypedDoubleArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Double.serializer())
+        override val serializer get() = ArraySerializer(Double.serializer())
     }
 }
 
@@ -376,7 +376,7 @@ internal fun Setting.valueImpl(default: Array<Boolean>): TypedBooleanArrayValue
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Boolean.serializer())
+        override val serializer get() = ArraySerializer(Boolean.serializer())
     }
 }
 
@@ -391,7 +391,7 @@ internal fun Setting.valueImpl(default: Array<Char>): TypedCharArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(Char.serializer())
+        override val serializer get() = ArraySerializer(Char.serializer())
     }
 }
 
@@ -406,7 +406,7 @@ internal fun Setting.valueImpl(default: Array<String>): TypedStringArrayValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ArraySerializer(String.serializer())
+        override val serializer get() = ArraySerializer(String.serializer())
     }
 }
 
@@ -422,7 +422,7 @@ internal fun Setting.valueImpl(default: List<Int>): IntListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Int.serializer())
+        override val serializer get() = ListSerializer(Int.serializer())
     }
 }
 
@@ -438,7 +438,7 @@ internal fun Setting.valueImpl(default: List<Short>): ShortListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Short.serializer())
+        override val serializer get() = ListSerializer(Short.serializer())
     }
 }
 
@@ -454,7 +454,7 @@ internal fun Setting.valueImpl(default: List<Byte>): ByteListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Byte.serializer())
+        override val serializer get() = ListSerializer(Byte.serializer())
     }
 }
 
@@ -470,7 +470,7 @@ internal fun Setting.valueImpl(default: List<Long>): LongListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Long.serializer())
+        override val serializer get() = ListSerializer(Long.serializer())
     }
 }
 
@@ -486,7 +486,7 @@ internal fun Setting.valueImpl(default: List<Float>): FloatListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Float.serializer())
+        override val serializer get() = ListSerializer(Float.serializer())
     }
 }
 
@@ -502,7 +502,7 @@ internal fun Setting.valueImpl(default: List<Double>): DoubleListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Double.serializer())
+        override val serializer get() = ListSerializer(Double.serializer())
     }
 }
 
@@ -518,7 +518,7 @@ internal fun Setting.valueImpl(default: List<Boolean>): BooleanListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Boolean.serializer())
+        override val serializer get() = ListSerializer(Boolean.serializer())
     }
 }
 
@@ -534,7 +534,7 @@ internal fun Setting.valueImpl(default: List<Char>): CharListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(Char.serializer())
+        override val serializer get() = ListSerializer(Char.serializer())
     }
 }
 
@@ -550,7 +550,7 @@ internal fun Setting.valueImpl(default: List<String>): StringListValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = ListSerializer(String.serializer())
+        override val serializer get() = ListSerializer(String.serializer())
     }
 }
 
@@ -566,7 +566,7 @@ internal fun Setting.valueImpl(default: Set<Int>): IntSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Int.serializer())
+        override val serializer get() = SetSerializer(Int.serializer())
     }
 }
 
@@ -582,7 +582,7 @@ internal fun Setting.valueImpl(default: Set<Short>): ShortSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Short.serializer())
+        override val serializer get() = SetSerializer(Short.serializer())
     }
 }
 
@@ -598,7 +598,7 @@ internal fun Setting.valueImpl(default: Set<Byte>): ByteSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Byte.serializer())
+        override val serializer get() = SetSerializer(Byte.serializer())
     }
 }
 
@@ -614,7 +614,7 @@ internal fun Setting.valueImpl(default: Set<Long>): LongSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Long.serializer())
+        override val serializer get() = SetSerializer(Long.serializer())
     }
 }
 
@@ -630,7 +630,7 @@ internal fun Setting.valueImpl(default: Set<Float>): FloatSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Float.serializer())
+        override val serializer get() = SetSerializer(Float.serializer())
     }
 }
 
@@ -646,7 +646,7 @@ internal fun Setting.valueImpl(default: Set<Double>): DoubleSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Double.serializer())
+        override val serializer get() = SetSerializer(Double.serializer())
     }
 }
 
@@ -662,7 +662,7 @@ internal fun Setting.valueImpl(default: Set<Boolean>): BooleanSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Boolean.serializer())
+        override val serializer get() = SetSerializer(Boolean.serializer())
     }
 }
 
@@ -678,7 +678,7 @@ internal fun Setting.valueImpl(default: Set<Char>): CharSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(Char.serializer())
+        override val serializer get() = SetSerializer(Char.serializer())
     }
 }
 
@@ -694,7 +694,7 @@ internal fun Setting.valueImpl(default: Set<String>): StringSetValue {
                     onElementChanged(this)
                 }
             }
-        override val serializer = SetSerializer(String.serializer())
+        override val serializer get() = SetSerializer(String.serializer())
     }
 }
 
@@ -720,7 +720,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Int>> = object : KSerializer<MutableList<Int>> {
             private val delegate = ListSerializer(Int.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Int> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -756,7 +756,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Short>> = object : KSerializer<MutableList<Short>> {
             private val delegate = ListSerializer(Short.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Short> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -792,7 +792,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Byte>> = object : KSerializer<MutableList<Byte>> {
             private val delegate = ListSerializer(Byte.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Byte> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -828,7 +828,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Long>> = object : KSerializer<MutableList<Long>> {
             private val delegate = ListSerializer(Long.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Long> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -864,7 +864,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Float>> = object : KSerializer<MutableList<Float>> {
             private val delegate = ListSerializer(Float.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Float> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -900,7 +900,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Double>> = object : KSerializer<MutableList<Double>> {
             private val delegate = ListSerializer(Double.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Double> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -936,7 +936,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Boolean>> = object : KSerializer<MutableList<Boolean>> {
             private val delegate = ListSerializer(Boolean.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Boolean> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -972,7 +972,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<Char>> = object : KSerializer<MutableList<Char>> {
             private val delegate = ListSerializer(Char.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<Char> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -1008,7 +1008,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableList<String>> = object : KSerializer<MutableList<String>> {
             private val delegate = ListSerializer(String.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableList<String> {
                 return delegate.deserialize(decoder).toMutableList().observable { 
@@ -1044,7 +1044,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Int>> = object : KSerializer<MutableSet<Int>> {
             private val delegate = SetSerializer(Int.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Int> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1080,7 +1080,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Short>> = object : KSerializer<MutableSet<Short>> {
             private val delegate = SetSerializer(Short.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Short> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1116,7 +1116,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Byte>> = object : KSerializer<MutableSet<Byte>> {
             private val delegate = SetSerializer(Byte.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Byte> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1152,7 +1152,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Long>> = object : KSerializer<MutableSet<Long>> {
             private val delegate = SetSerializer(Long.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Long> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1188,7 +1188,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Float>> = object : KSerializer<MutableSet<Float>> {
             private val delegate = SetSerializer(Float.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Float> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1224,7 +1224,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Double>> = object : KSerializer<MutableSet<Double>> {
             private val delegate = SetSerializer(Double.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Double> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1260,7 +1260,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Boolean>> = object : KSerializer<MutableSet<Boolean>> {
             private val delegate = SetSerializer(Boolean.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Boolean> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1296,7 +1296,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<Char>> = object : KSerializer<MutableSet<Char>> {
             private val delegate = SetSerializer(Char.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<Char> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 
@@ -1332,7 +1332,7 @@ internal fun Setting.valueImpl(
         
         override val serializer: KSerializer<MutableSet<String>> = object : KSerializer<MutableSet<String>> {
             private val delegate = SetSerializer(String.serializer())
-            override val descriptor: SerialDescriptor = delegate.descriptor
+            override val descriptor: SerialDescriptor get() = delegate.descriptor
 
             override fun deserialize(decoder: Decoder): MutableSet<String> {
                 return delegate.deserialize(decoder).toMutableSet().observable { 

backend/mirai-console/src/main/kotlin/net/mamoe/mirai/console/setting/internal/internal.kt

@@ -53,7 +53,7 @@ internal abstract class SettingImpl {
         }
     }
 
-    protected abstract fun onElementChanged(value: Value<*>)
+    abstract fun onElementChanged(value: Value<*>)
 
     companion object {
         @JvmStatic