Use raw type for kclass references in dynamic invocation code gen (#911)

* Use raw type for kclass references in dynamic invocation code gen

Added a compile-only regression test
Resolves #905

* Make it actually generic

* Mostly fix generation

Will need to wait for inlined instantiation to merge

* Fix rebase issues and use newInstance

kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/api/AdapterGenerator.kt

@@ -24,6 +24,7 @@ import com.squareup.kotlinpoet.FunSpec
 import com.squareup.kotlinpoet.KModifier
 import com.squareup.kotlinpoet.NameAllocator
 import com.squareup.kotlinpoet.ParameterSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName
 import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
 import com.squareup.kotlinpoet.PropertySpec
 import com.squareup.kotlinpoet.TypeSpec
@@ -260,21 +261,39 @@ internal class AdapterGenerator(
     } else {
       CodeBlock.of("return·")
     }
-    val localConstructorName = nameAllocator.newName("localConstructor")
     if (useDefaultsConstructor) {
       classBuilder.addProperty(constructorProperty)
       // Dynamic default constructor call
-      result.addStatement(
+      val rawOriginalTypeName = originalTypeName.rawType()
-          "val %1L·= this.%2N ?: %3T.lookupDefaultsConstructor(%4T::class.java).also·{ this.%2N·= it }",
+      val nonNullConstructorType = constructorProperty.type.copy(nullable = false)
-          localConstructorName,
+      val coreLookupBlock = CodeBlock.of(
-          constructorProperty,
+          "%T.lookupDefaultsConstructor(%T::class.java)",
           MOSHI_UTIL,
-          originalTypeName
+          rawOriginalTypeName
       )
+      val lookupBlock = if (originalTypeName is ParameterizedTypeName) {
+        CodeBlock.of("(%L·as·%T)", coreLookupBlock, nonNullConstructorType)
+      } else {
+        coreLookupBlock
+      }
+      val initializerBlock = CodeBlock.of(
+          "this.%1N ?:·%2L.also·{ this.%1N·= it }",
+          constructorProperty,
+          lookupBlock
+      )
+      val localConstructorProperty = PropertySpec.builder(
+          nameAllocator.newName("localConstructor"),
+          nonNullConstructorType)
+          .addAnnotation(AnnotationSpec.builder(Suppress::class)
+              .addMember("%S", "UNCHECKED_CAST")
+              .build())
+          .initializer(initializerBlock)
+          .build()
+      result.addCode("%L", localConstructorProperty)
       result.addCode(
-          "«%L%L.newInstance(",
+          "«%L%N.newInstance(",
           returnOrResultAssignment,
-          localConstructorName
+          localConstructorProperty
       )
     } else {
       // Standard constructor call

kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/DefaultConstructorTest.kt

@@ -47,6 +47,14 @@ data class TestClass(
     val dynamicInlineOptional: Int = createInlineInt()
 )
 
+// Regression test for https://github.com/square/moshi/issues/905
+// Just needs to compile
+@JsonClass(generateAdapter = true)
+data class GenericTestClassWithDefaults<T>(
+    val input: String = "",
+    val genericInput: T
+)
+
 private fun createInt(): Int {
   return 3
 }