Make fixes for PR comments

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/DeserializerAnnotator.kt

@@ -69,13 +69,11 @@ private constructor(
  val properties = annotateProperties(msg, ctx)
 
  return TypeSpec.companionObjectBuilder("Deserializer")
- // KtDeserializer<MessageType>
  .addSuperinterface(
  KtDeserializer::class
  .asTypeName()
  .parameterizedBy(msg.typeName)
  )
- // (MessageTypeDsl.() -> Unit) -> Message
  .addSuperinterface(
  LambdaTypeName.get(
  null,
@@ -216,7 +214,6 @@ fun deserializeString(f: StandardField, ctx: Context, packed: Boolean): String {
  val wrappedRead = options?.let { wrapField(it.wrapName, read, it.type, it.oneof) } ?: read.toString()
  return when {
  f.map -> deserializeMap(f, options, read)
- // · is a non-wrapping space
  f.repeated -> """
  |(${f.fieldName} ?: mutableListOf()).apply·{
  | deserializer.readRepeated($packed)·{

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/DslAnnotator.kt

@@ -94,7 +94,7 @@ class DslAnnotator(
  setter(
  FunSpec.setterBuilder()
  .addParameter("newValue", List::class)
- .addCode("field = %M(newValue)", runtimeFunction("finishList"))
+ .addCode("field = %M(newValue)", runtimeFunction("copyList"))
  .build()
  )
  }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/MessageSizeAnnotator.kt

@@ -164,10 +164,11 @@ private constructor(
  return when {
  f.map -> sizeOfMap(f, name)
  f.repeated && f.packed -> {
- val map = LinkedHashMap<String, Any>()
- map += "sizeof" to runtimeFunction("sizeof")
- map += "tag" to Tag::class
- map += "uInt32" to UInt32::class
+ val map = mutableMapOf<String, Any>(
+ "sizeof" to runtimeFunction("sizeof"),
+ "tag" to Tag::class,
+ "uInt32" to UInt32::class
+ )
  buildCodeBlock {
  addNamed(
  "%sizeof:M(%tag:T(${f.number})) + " +
@@ -177,10 +178,11 @@ private constructor(
  }
  }
  f.repeated -> {
- val map = LinkedHashMap<String, Any>()
- map += "sizeof" to runtimeFunction("sizeof")
- map += "tag" to Tag::class
- map += "boxedAccess" to f.box(interceptValueAccess(f, ctx, "it"))
+ val map = mutableMapOf(
+ "sizeof" to runtimeFunction("sizeof"),
+ "tag" to Tag::class,
+ "boxedAccess" to f.box(interceptValueAccess(f, ctx, "it"))
+ )
  buildCodeBlock {
  addNamed(
  "(%sizeof:M(%tag:T(${f.number})) * $name.size) + " +
@@ -190,10 +192,11 @@ private constructor(
  }
  }
  else -> {
- val map = LinkedHashMap<String, Any>()
- map += "sizeof" to runtimeFunction("sizeof")
- map += "tag" to Tag::class
- map += "access" to interceptFieldSizeof(f, name, ctx)
+ val map = mutableMapOf(
+ "sizeof" to runtimeFunction("sizeof"),
+ "tag" to Tag::class,
+ "access" to interceptFieldSizeof(f, name, ctx)
+ )
  buildCodeBlock {
  addNamed("%sizeof:M(%tag:T(${f.number})) + %access:L", map)
  }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/PropertyAnnotator.kt

@@ -31,6 +31,7 @@ import com.toasttab.protokt.codegen.impl.Nullability.propertyType
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptDefaultValue
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptTypeName
 import com.toasttab.protokt.codegen.impl.Wrapper.wrapped
+import com.toasttab.protokt.codegen.impl.defaultValue
 import com.toasttab.protokt.codegen.model.FieldType
 import com.toasttab.protokt.codegen.protoc.Field
 import com.toasttab.protokt.codegen.protoc.Message

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/SerializerAnnotator.kt

@@ -138,11 +138,12 @@ private constructor(
  }
  )
 
- val map = LinkedHashMap<String, Any>()
- map += "tag" to Tag::class
- map += "uInt32" to UInt32::class
- map += "name" to f.fieldName
- map += "sizeof" to runtimeFunction("sizeof")
+ val map = mutableMapOf(
+ "tag" to Tag::class,
+ "uInt32" to UInt32::class,
+ "name" to f.fieldName,
+ "sizeof" to runtimeFunction("sizeof")
+ )
  return when {
 
  f.repeated && f.packed -> buildCodeBlock {

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/StandardFieldExt.kt

@@ -20,6 +20,7 @@ import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.impl.Wrapper.interceptValueAccess
 import com.toasttab.protokt.codegen.impl.Wrapper.mapKeyConverter
 import com.toasttab.protokt.codegen.impl.Wrapper.mapValueConverter
+import com.toasttab.protokt.codegen.impl.defaultValue
 import com.toasttab.protokt.codegen.impl.stripRootMessageNamePrefix
 import com.toasttab.protokt.codegen.model.FieldType
 import com.toasttab.protokt.codegen.protoc.StandardField

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/impl/DefaultValues.kt

@@ -0,0 +1,20 @@
+package com.toasttab.protokt.codegen.impl
+
+import com.squareup.kotlinpoet.CodeBlock
+import com.toasttab.protokt.codegen.model.FieldType
+
+val FieldType.defaultValue: CodeBlock
+ get() = when (this) {
+ FieldType.MESSAGE -> CodeBlock.of("null")
+ FieldType.ENUM -> throw IllegalAccessException(
+ "|An Enum type doesn't have a standard default value. " +
+ "If you have `enum Foo`, you can use Foo.from(0)"
+ )
+ FieldType.BOOL -> CodeBlock.of("false")
+ FieldType.FIXED32, FieldType.INT32, FieldType.SFIXED32, FieldType.SINT32, FieldType.UINT32 -> CodeBlock.of("0")
+ FieldType.FIXED64, FieldType.INT64, FieldType.SFIXED64, FieldType.SINT64, FieldType.UINT64 -> CodeBlock.of("0L")
+ FieldType.FLOAT -> CodeBlock.of("0.0F")
+ FieldType.DOUBLE -> CodeBlock.of("0.0")
+ FieldType.BYTES -> CodeBlock.of("%T.empty()", com.toasttab.protokt.rt.Bytes::class)
+ FieldType.STRING -> CodeBlock.of("\"\"")
+ }

protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/model/FieldType.kt

@@ -15,7 +15,6 @@
 
 package com.toasttab.protokt.codegen.model
 
-import com.squareup.kotlinpoet.CodeBlock
 import com.toasttab.protokt.rt.Bytes
 import com.toasttab.protokt.rt.KtEnum
 import com.toasttab.protokt.rt.KtMessage
@@ -79,21 +78,12 @@ enum class FieldType(
 
  val inlineRepresentation
  get() = type.inlineRepresentation
-
- val isGeneratedType
- get() = type.isGeneratedType
-
- val defaultValue
- get() = type.defaultValue
 }
 
 private sealed class TypeImpl {
  open val kotlinRepresentation: KClass<*>? = null
  open val inlineRepresentation: KClass<*>? = null
  open val ktRepresentation: KClass<*>? = null
- open val isGeneratedType: Boolean = false
- open val defaultValue: CodeBlock
- get() = CodeBlock.of("null")
 
  abstract val scalar: Boolean
 
@@ -106,56 +96,45 @@ private sealed class TypeImpl {
 private sealed class Nonscalar(
  override val kotlinRepresentation: KClass<*>? = null,
  override val ktRepresentation: KClass<*>? = null,
- override val isGeneratedType: Boolean = false,
- override val defaultValue: CodeBlock = CodeBlock.of("null")
 ) : TypeImpl() {
  override val scalar = false
 
- object Enum : Nonscalar(ktRepresentation = KtEnum::class, isGeneratedType = true) {
- override val defaultValue: CodeBlock
- get() = throw IllegalAccessException(
- "|An Enum type doesn't have a standard default value. " +
- "If you have `enum Foo`, you can use Foo.from(0)"
- )
- }
- object Message : Nonscalar(ktRepresentation = KtMessage::class, isGeneratedType = true)
- object String : Nonscalar(kotlin.String::class, defaultValue = CodeBlock.of("\"\""))
+ object Enum : Nonscalar(ktRepresentation = KtEnum::class)
+ object Message : Nonscalar(ktRepresentation = KtMessage::class)
+ object String : Nonscalar(kotlin.String::class)
  object Bytes : Nonscalar(
  ByteArray::class,
- com.toasttab.protokt.rt.Bytes::class,
- defaultValue = CodeBlock.of("%T.empty()", com.toasttab.protokt.rt.Bytes::class)
+ com.toasttab.protokt.rt.Bytes::class
  )
 }
 
 private sealed class Scalar(
- override val kotlinRepresentation: KClass<*>? = null,
- override val defaultValue: CodeBlock = CodeBlock.of("null")
+ override val kotlinRepresentation: KClass<*>? = null
 ) : TypeImpl() {
  override val scalar = true
 
- object Bool : Scalar(Boolean::class, defaultValue = CodeBlock.of("false"))
- object Double : Scalar(kotlin.Double::class, defaultValue = CodeBlock.of("0.0"))
- object Float : Scalar(kotlin.Float::class, defaultValue = CodeBlock.of("0.0F"))
+ object Bool : Scalar(Boolean::class)
+ object Double : Scalar(kotlin.Double::class)
+ object Float : Scalar(kotlin.Float::class)
 }
 
 private sealed class Boxed(
- override val inlineRepresentation: KClass<*>,
- override val defaultValue: CodeBlock = CodeBlock.of("null")
+ override val inlineRepresentation: KClass<*>
 ) : Scalar() {
  override val kotlinRepresentation
  get() = inlineRepresentation.declaredMemberProperties
  .single { it.name == com.toasttab.protokt.rt.Fixed32::value.name }
  .returnType
  .classifier as KClass<*>
 
- object Fixed32 : Boxed(com.toasttab.protokt.rt.Fixed32::class, defaultValue = CodeBlock.of("0"))
- object Fixed64 : Boxed(com.toasttab.protokt.rt.Fixed64::class, defaultValue = CodeBlock.of("0L"))
- object Int32 : Boxed(com.toasttab.protokt.rt.Int32::class, defaultValue = CodeBlock.of("0"))
- object Int64 : Boxed(com.toasttab.protokt.rt.Int64::class, defaultValue = CodeBlock.of("0L"))
- object SFixed32 : Boxed(com.toasttab.protokt.rt.SFixed32::class, defaultValue = CodeBlock.of("0"))
- object SFixed64 : Boxed(com.toasttab.protokt.rt.SFixed64::class, defaultValue = CodeBlock.of("0L"))
- object SInt32 : Boxed(com.toasttab.protokt.rt.SInt32::class, defaultValue = CodeBlock.of("0"))
- object SInt64 : Boxed(com.toasttab.protokt.rt.SInt64::class, defaultValue = CodeBlock.of("0L"))
- object UInt32 : Boxed(com.toasttab.protokt.rt.UInt32::class, defaultValue = CodeBlock.of("0"))
- object UInt64 : Boxed(com.toasttab.protokt.rt.UInt64::class, defaultValue = CodeBlock.of("0L"))
+ object Fixed32 : Boxed(com.toasttab.protokt.rt.Fixed32::class)
+ object Fixed64 : Boxed(com.toasttab.protokt.rt.Fixed64::class)
+ object Int32 : Boxed(com.toasttab.protokt.rt.Int32::class)
+ object Int64 : Boxed(com.toasttab.protokt.rt.Int64::class)
+ object SFixed32 : Boxed(com.toasttab.protokt.rt.SFixed32::class)
+ object SFixed64 : Boxed(com.toasttab.protokt.rt.SFixed64::class)
+ object SInt32 : Boxed(com.toasttab.protokt.rt.SInt32::class)
+ object SInt64 : Boxed(com.toasttab.protokt.rt.SInt64::class)
+ object UInt32 : Boxed(com.toasttab.protokt.rt.UInt32::class)
+ object UInt64 : Boxed(com.toasttab.protokt.rt.UInt64::class)
 }