fankes/moshi
2
0
Fork 0
mirror of https://github.com/fankes/moshi.git synced 2025-10-20 00:19:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #733 from daugeldauge/fix-variance-issues

Browse Source 
Fix variance issues in kotlin-codegen
This commit is contained in:
Jesse Wilson
2018-11-05 07:22:40 +11:00
committed by GitHub
parent 8a22f6b133 e0be5f5a54
commit a8102bccd2
3 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/TypeRenderer.kt
View File

@@ -88,7 +88,7 @@ abstract class TypeRenderer {
else -> throw IllegalArgumentException( else -> throw IllegalArgumentException(
"Unrepresentable wildcard type. Cannot have more than one bound: $typeName") "Unrepresentable wildcard type. Cannot have more than one bound: $typeName")
} }
CodeBlock.of("%T.%L(%T::class.java)", Types::class, method, target) CodeBlock.of("%T.%L(%T::class.java)", Types::class, method, target.asNonNull())
} }
is TypeVariableName -> renderTypeVariable(typeName) is TypeVariableName -> renderTypeVariable(typeName)

10
kotlin/codegen/src/main/java/com/squareup/moshi/kotlin/codegen/metadata.kt
View File

@@ -108,15 +108,7 @@ internal fun Type.asTypeName(
nullableProjection?.let { projection -> nullableProjection?.let { projection ->
when (projection) { when (projection) {
Type.Argument.Projection.IN -> WildcardTypeName.supertypeOf(argumentTypeName) Type.Argument.Projection.IN -> WildcardTypeName.supertypeOf(argumentTypeName)
Type.Argument.Projection.OUT -> { Type.Argument.Projection.OUT -> WildcardTypeName.subtypeOf(argumentTypeName)
if (argumentTypeName == ANY) {
// This becomes a *, which we actually don't want here.
// List<Any> works with List<*>, but List<*> doesn't work with List<Any>
argumentTypeName
} else {
WildcardTypeName.subtypeOf(argumentTypeName)
}
}
Type.Argument.Projection.STAR -> WildcardTypeName.STAR Type.Argument.Projection.STAR -> WildcardTypeName.STAR
Type.Argument.Projection.INV -> TODO("INV projection is unsupported") Type.Argument.Projection.INV -> TODO("INV projection is unsupported")
} }

6
kotlin/tests/src/test/kotlin/com/squareup/moshi/kotlin/codgen/GeneratedAdaptersTest.kt
View File

@@ -1157,11 +1157,13 @@ data class SmokeTestType(
val hasChildren: Boolean = false, val hasChildren: Boolean = false,
val favoriteFood: String? = null, val favoriteFood: String? = null,
val favoriteDrink: String? = "Water", val favoriteDrink: String? = "Water",
val wildcardOut: List<out String> = emptyList(), val wildcardOut: MutableList<out String> = mutableListOf(),
val nullableWildcardOut: MutableList<out String?> = mutableListOf(),
val wildcardIn: Array<in String>, val wildcardIn: Array<in String>,
val any: List<*>, val any: List<*>,
val anyTwo: List<Any>, val anyTwo: List<Any>,
val anyOut: List<out Any>, // val anyOut: MutableList<out Any>, waiting for fix in kotlinpoet https://github.com/square/kotlinpoet/issues/520
val nullableAnyOut: MutableList<out Any?>,
val favoriteThreeNumbers: IntArray, val favoriteThreeNumbers: IntArray,
val favoriteArrayValues: Array<String>, val favoriteArrayValues: Array<String>,
val favoriteNullableArrayValues: Array<String?>, val favoriteNullableArrayValues: Array<String?>,