Don't validate modifiers when emitting (#458)

* don't validate modifiers when copying parameter values to the transient property instances

fixes #457

* try another approach to bypassing validation

* fix/simplify validation check

* rename property to make it more meaningful and update logic where it's used

* fix formatting

* make method internal

Author: evanchooly

src/main/java/com/squareup/kotlinpoet/PropertySpec.kt

@@ -17,6 +17,7 @@ package com.squareup.kotlinpoet
 
 import com.squareup.kotlinpoet.FunSpec.Companion.GETTER
 import com.squareup.kotlinpoet.FunSpec.Companion.SETTER
+import com.squareup.kotlinpoet.KModifier.Target.PROPERTY
 import java.lang.reflect.Type
 import kotlin.reflect.KClass
 
@@ -98,6 +99,15 @@ class PropertySpec private constructor(builder: Builder) {
     }
   }
 
+  internal fun fromPrimaryConstructorParameter(parameter: ParameterSpec): PropertySpec {
+    val builder = toBuilder()
+        .addAnnotations(parameter.annotations)
+    builder.isPrimaryConstructorParameter = true
+    builder.modifiers += parameter.modifiers
+
+    return builder.build()
+  }
+
   override fun equals(other: Any?): Boolean {
     if (this === other) return true
     if (other == null) return false
@@ -125,6 +135,7 @@ class PropertySpec private constructor(builder: Builder) {
   }
 
   class Builder internal constructor(internal val name: String, internal val type: TypeName) {
+    internal var isPrimaryConstructorParameter = false
     internal var mutable = false
     internal val kdoc = CodeBlock.builder()
     internal var initializer: CodeBlock? = null
@@ -218,7 +229,7 @@ class PropertySpec private constructor(builder: Builder) {
             "properties. You should mark either the getter, the setter, or both inline.")
       }
       for (it in modifiers) {
-        it.checkTarget(KModifier.Target.PROPERTY)
+          if (!isPrimaryConstructorParameter) it.checkTarget(PROPERTY)
       }
       return PropertySpec(this)
     }

src/main/java/com/squareup/kotlinpoet/TypeSpec.kt

@@ -285,10 +285,8 @@ class TypeSpec private constructor(builder: TypeSpec.Builder) {
       val parameter = primaryConstructor.parameter(property.name) ?: continue
       if (parameter.type != property.type) continue
       if (CodeBlock.of("%N", parameter) != property.initializer) continue
-      result[property.name] = property.toBuilder()
-          .addAnnotations(parameter.annotations)
-          .addModifiers(*parameter.modifiers.toTypedArray())
-          .build()
+
+      result[property.name] = property.fromPrimaryConstructorParameter(parameter)
     }
     return result
   }

src/test/java/com/squareup/kotlinpoet/TypeSpecTest.kt

@@ -528,6 +528,22 @@ class TypeSpecTest {
         |""".trimMargin())
   }
 
+  @Test fun classesMayHaveVarargConstructorProperties() {
+    val variable = TypeSpec.classBuilder("Variable")
+        .primaryConstructor(FunSpec.constructorBuilder()
+            .addParameter(ParameterSpec.builder("name", String::class, VARARG).build())
+            .build())
+        .addProperty(PropertySpec.builder("name", String::class).initializer("name").build())
+        .build()
+    assertThat(toString(variable)).isEqualTo("""
+        |package com.squareup.tacos
+        |
+        |import kotlin.String
+        |
+        |class Variable(vararg val name: String)
+        |""".trimMargin())
+  }
+
   @Test fun enumConstantsRequired() {
     assertThrows<IllegalArgumentException> {
       TypeSpec.enumBuilder("Roshambo")