Merge branch 'kotlinpoet' of https://github.com/andrewparmet/protokt …

…into remove-renderers

# Conflicts:
#	protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/MessageAnnotator.kt
#	protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/annotators/PropertyAnnotator.kt
#	protokt-codegen/src/main/kotlin/com/toasttab/protokt/codegen/template/Renderers.kt
#	protokt-codegen/src/main/resources/renderers.stg

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

@@ -94,18 +94,18 @@ private constructor(
  |var unknownFields: UnknownFieldSet.Builder? = null
  |
  |while (true) {
- | when (deserializer.readTag()) {
- | 0 ->
- | return ${msg.name}(
- | ${constructorLines(properties)}
- | )
+ |  when (deserializer.readTag()) {
+ |  0 ->
+ |  return ${msg.name}(
+ |  ${constructorLines(properties)}
+ |  )
  |${assignmentLines(deserializerInfo)}
- | else ->
- | unknownFields =
- | (unknownFields ?: UnknownFieldSet.Builder()).also {
- | it.add(deserializer.readUnknown())
- | }
- | }
+ |  else ->
+ |  unknownFields =
+ |  (unknownFields ?: UnknownFieldSet.Builder()).also {
+ |  it.add(deserializer.readUnknown())
+ |  }
+ |  }
  |}
  """.trimMargin()
  )
@@ -131,19 +131,19 @@ private constructor(
 
  private fun constructorLines(properties: List<PropertyInfo>) =
  properties.joinToString("") {
- deserializeWrapper(it) + ",\n "
+ deserializeWrapper(it) + ",\n  "
  } + "UnknownFieldSet.from(unknownFields)"
 
  private fun assignmentLines(deserializerInfo: List<DeserializerInfo>) =
  deserializerInfo.joinToString("\n") {
  if (it.repeated) {
  """
- | ${it.tag} ->
- | ${it.assignment.fieldName} =
- | ${it.assignment.value}
+ |  ${it.tag} ->
+ |  ${it.assignment.fieldName} =
+ |  ${it.assignment.value}
  """.trimMargin()
  } else {
- " ${it.tag} -> ${it.assignment.fieldName} = ${it.assignment.value}"
+ "  ${it.tag} -> ${it.assignment.fieldName} = ${it.assignment.value}"
  }
  }
 

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

@@ -51,10 +51,10 @@ class DslAnnotator(
  dslLines() + "\n"
  } +
  """
- | unknownFields = this@${msg.name}.unknownFields
- | dsl()
- |}
- """.trimMargin()
+  |  unknownFields = this@${msg.name}.unknownFields
+  |  dsl()
+  |}
+  """.trimMargin()
  ).replace(" ", "·")
  )
  .build()
@@ -63,7 +63,7 @@ class DslAnnotator(
  TypeSpec.classBuilder(msg.name + "Dsl")
  .addProperties(
  properties.map {
- PropertySpec.builder(it.name.removePrefix("`").removeSuffix("`"), TypeVariableName(it.dslPropertyType).copy(nullable = it.nullable && !it.dslPropertyType.endsWith("?")))
+ PropertySpec.builder(it.name.removePrefix("`").removeSuffix("`"), it.dslPropertyType)
  .mutable(true)
  .apply {
  if (it.deprecation != null) {
@@ -124,7 +124,7 @@ class DslAnnotator(
  """
  |return ${msg.name}(
  |${buildLines()}
- | unknownFields
+ |  unknownFields
  |)
  """.trimMargin()
  }
@@ -137,12 +137,12 @@ class DslAnnotator(
 
  private fun dslLines() =
  properties.joinToString("\n") {
- " ${it.name} = this@${msg.name}.${it.name}"
+ "  ${it.name} = this@${msg.name}.${it.name}"
  }
 
  private fun buildLines() =
  properties.joinToString("\n") {
- " ${deserializeWrapper(it)},"
+ "  ${deserializeWrapper(it)},"
  }
 }
 

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

@@ -35,14 +35,14 @@ import com.toasttab.protokt.codegen.annotators.OneofAnnotator.Companion.annotate
 import com.toasttab.protokt.codegen.annotators.PropertyAnnotator.Companion.annotateProperties
 import com.toasttab.protokt.codegen.annotators.SerializerAnnotator.Companion.annotateSerializerNew
 import com.toasttab.protokt.codegen.impl.Deprecation.enclosingDeprecation
+import com.toasttab.protokt.codegen.impl.Deprecation.handleDeprecation
 import com.toasttab.protokt.codegen.impl.Deprecation.hasDeprecation
 import com.toasttab.protokt.codegen.impl.Deprecation.renderOptions
 import com.toasttab.protokt.codegen.impl.Implements.doesImplement
 import com.toasttab.protokt.codegen.impl.Implements.implements
 import com.toasttab.protokt.codegen.model.PPackage
 import com.toasttab.protokt.codegen.protoc.Message
 import com.toasttab.protokt.codegen.template.Message.Message.MessageInfo
-import com.toasttab.protokt.codegen.template.Message.Message.Options
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo
 import com.toasttab.protokt.rt.KtGeneratedMessage
 import com.toasttab.protokt.rt.KtMessage
@@ -98,19 +98,7 @@ private constructor(
  .addMember("\"" + msg.fullProtobufTypeName + "\"")
  .build()
  )
- if (messageInfo.deprecation != null) {
- addAnnotation(
- AnnotationSpec.builder(Deprecated::class)
- .apply {
- if (messageInfo.deprecation.message != null) {
- addMember("\"" + messageInfo.deprecation.message + "\"")
- } else {
- addMember("\"deprecated in proto\"")
- }
- }
- .build()
- )
- }
+ handleDeprecation(messageInfo.deprecation)
  }
 
  private fun TypeSpec.Builder.handleConstructor(
@@ -119,7 +107,7 @@ private constructor(
  addSuperinterface(KtMessage::class)
  addProperties(
  properties.map {
- PropertySpec.builder(it.name.removePrefix("`").removeSuffix("`"), TypeVariableName(it.propertyType))
+ PropertySpec.builder(it.name.removePrefix("`").removeSuffix("`"), it.propertyType)
  .initializer(it.name)
  .apply {
  if (it.overrides) {
@@ -131,21 +119,7 @@ private constructor(
  addKdoc(formatDoc(it.documentation))
  }
  }
- .apply {
- if (it.deprecation != null) {
- addAnnotation(
- AnnotationSpec.builder(Deprecated::class)
- .apply {
- if (it.deprecation.message != null) {
- addMember("\"" + it.deprecation.message + "\"")
- } else {
- addMember("\"deprecated in proto\"")
- }
- }
- .build()
- )
- }
- }
+ .handleDeprecation(it.deprecation)
  .build()
  }
  )
@@ -159,7 +133,7 @@ private constructor(
  .addModifiers(KModifier.PRIVATE)
  .addParameters(
  properties.map {
- ParameterSpec(it.name.removePrefix("`").removeSuffix("`"), TypeVariableName(it.propertyType))
+ ParameterSpec(it.name.removePrefix("`").removeSuffix("`"), it.propertyType)
  }
  )
  .addParameter(
@@ -204,15 +178,15 @@ private constructor(
  """
  |return other is ${msg.name} &&·
  |${equalsLines(properties)}
- | other.unknownFields == unknownFields
+ |  other.unknownFields == unknownFields
  """.trimMargin()
  }
  )
  .build()
  )
 
  private fun equalsLines(properties: List<PropertyInfo>) =
- properties.joinToString("\n") { " other.${it.name} == ${it.name} &&" }
+ properties.joinToString("\n") { "  other.${it.name} == ${it.name} &&" }
 
  private fun TypeSpec.Builder.handleHashCode(
  properties: List<PropertyInfo>
@@ -254,7 +228,7 @@ private constructor(
  """
  |return "${msg.name}(" +
  |${toStringLines(properties)}
- | "unknownFields=${"$"}unknownFields)"
+ |  "unknownFields=${"$"}unknownFields)"
  """.trimMargin()
  }
  )
@@ -263,7 +237,7 @@ private constructor(
 
  private fun toStringLines(properties: List<PropertyInfo>) =
  properties.joinToString("\n") {
- " \"${it.name}=\$${it.name}\" +"
+ "  \"${it.name}=\$${it.name}\" +"
  }
 
  private fun messageInfo() =
@@ -292,20 +266,6 @@ private constructor(
  private fun messageIsTopLevel() =
  ctx.enclosing.firstOrNone().fold({ false }, { it == msg })
 
- private fun options(): Options {
- val lengthAsOneLine =
- ctx.enclosing.size * 4 +
- 4 + // companion indentation
- 63 + // `override fun deserialize(deserializer: KtMessageDeserializer): `
- msg.name.length +
- 2 // ` {`
-
- return Options(
- wellKnownType = ctx.pkg == PPackage.PROTOKT,
- longDeserializer = lengthAsOneLine > IDEAL_MAX_WIDTH
- )
- }
-
  companion object {
  const val IDEAL_MAX_WIDTH = 100
 

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

@@ -52,7 +52,7 @@ private constructor(
  if (!it.hasNonNullOption) {
  """
  |if ${it.nonDefault(ctx)} {
- | $resultVarName += ${sizeOfString(it)}
+ |  $resultVarName += ${sizeOfString(it)}
  |}
  """.trimMargin()
  } else {
@@ -95,8 +95,8 @@ private constructor(
  f.fields
  .sortedBy { it.number }.joinToString("\n") {
  """
- | is ${condition(f, it, msg.name)} ->
- | ${oneofSizeOfString(f, it)}
+ |  is ${condition(f, it, msg.name)} ->
+ |  ${oneofSizeOfString(f, it)}
  """.trimMargin()
  }
 

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

@@ -15,6 +15,10 @@
 
 package com.toasttab.protokt.codegen.annotators
 
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.TypeName
+import com.squareup.kotlinpoet.TypeVariableName
+import com.squareup.kotlinpoet.asTypeName
 import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.annotators.PropertyDocumentationAnnotator.Companion.annotatePropertyDocumentation
 import com.toasttab.protokt.codegen.impl.Deprecation.renderOptions
@@ -94,12 +98,35 @@ private constructor(
  null
  }
 
- private fun annotateStandard(f: StandardField) = when {
- f.map -> "Map<${resolveMapEntryTypes(f, ctx).kType}, ${resolveMapEntryTypes(f, ctx).vType}>"
- f.repeated -> "List<${interceptTypeName(f, f.typePClass.renderName(ctx.pkg), ctx)}>"
- interceptTypeName(f, f.typePClass.renderName(ctx.pkg), ctx) == "Any" -> f.typePClass.qualifiedName
- else -> interceptTypeName(f, f.typePClass.renderName(ctx.pkg), ctx)
- }
+ private fun annotateStandard(f: StandardField): TypeName =
+ if (f.map) {
+ val mapTypes = resolveMapEntryTypes(f, ctx)
+ Map::class
+ .asTypeName()
+ .parameterizedBy(
+ TypeVariableName(mapTypes.kType),
+ TypeVariableName(mapTypes.vType)
+ )
+ } else {
+ val parameter =
+ TypeVariableName(
+ interceptTypeName(
+ f,
+ f.typePClass.renderName(ctx.pkg),
+ ctx
+ )
+ )
+
+ if (f.repeated) {
+ List::class.asTypeName().parameterizedBy(parameter)
+ } else {
+ if (parameter.name == "Any") {
+ TypeVariableName(f.typePClass.qualifiedName)
+ } else {
+ parameter
+ }
+ }
+ }
 
  private fun Field.defaultValue(ctx: Context) =
  when (this) {

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

@@ -1,13 +1,19 @@
 package com.toasttab.protokt.codegen.annotators
 
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.ParameterizedTypeName
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.toasttab.protokt.codegen.template.Message.Message.PropertyInfo
 
 fun deserializeType(p: PropertyInfo) =
  if (p.repeated || p.map) {
- "Mutable"
+ p.deserializeType as ParameterizedTypeName
+ ClassName(p.deserializeType.rawType.packageName, "Mutable" + p.deserializeType.rawType.simpleName)
+ .parameterizedBy(p.deserializeType.typeArguments)
+ .copy(nullable = true)
  } else {
- ""
- } + p.deserializeType
+ p.deserializeType
+ }
 
 fun deserializeValue(p: PropertyInfo) =
  if (p.repeated || p.wrapped || p.nullable || p.fieldType == "MESSAGE") {

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

@@ -1,4 +1,4 @@
-/*
+ /*
  * Copyright (c) 2019 Toast Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,7 +43,7 @@ private constructor(
  if (!it.hasNonNullOption) {
  """
  |if ${it.nonDefault(ctx)} {
- | ${serializeString(it)}
+ |  ${serializeString(it)}
  |}
  """.trimMargin()
  } else {
@@ -78,8 +78,8 @@ private constructor(
  f.fields
  .sortedBy { it.number }.joinToString("\n") {
  """
- | is ${oneOfSer(f, it, msg.name).condition} ->
- | ${serializeString(it, Some(f.fieldName))}
+ |  is ${oneOfSer(f, it, msg.name).condition} ->
+ |  ${serializeString(it, Some(f.fieldName))}
  """.trimMargin()
  }
 

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

@@ -16,6 +16,7 @@
 package com.toasttab.protokt.codegen.impl
 
 import com.squareup.kotlinpoet.AnnotationSpec
+import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
 import com.toasttab.protokt.codegen.annotators.Annotator.Context
 import com.toasttab.protokt.codegen.annotators.deprecated
@@ -64,6 +65,28 @@ object Deprecation {
  val message: String?
  )
 
+ fun PropertySpec.Builder.handleDeprecation(renderOptions: RenderOptions?) =
+ apply {
+ if (renderOptions != null) {
+ addAnnotation(
+ AnnotationSpec.builder(Deprecated::class)
+ .handleDeprecationMessage(renderOptions.message.orEmpty())
+ .build()
+ )
+ }
+ }
+
+ fun TypeSpec.Builder.handleDeprecation(renderOptions: RenderOptions?) =
+ apply {
+ if (renderOptions != null) {
+ addAnnotation(
+ AnnotationSpec.builder(Deprecated::class)
+ .handleDeprecationMessage(renderOptions.message.orEmpty())
+ .build()
+ )
+ }
+ }
+
  fun TypeSpec.Builder.handleDeprecation(deprecated: Boolean, message: String) {
  if (deprecated) {
  addAnnotation(