Fix problem with optics and <*> generics

arrow-kt · Jul 13, 2023 · d36cf26 · d36cf26
1 parent dd6a062
commit d36cf26
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/...optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/processor.kt b/...optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/processor.kt
@@ -10,6 +10,7 @@ import com.google.devtools.ksp.symbol.KSType
 import com.google.devtools.ksp.symbol.KSTypeArgument
 import com.google.devtools.ksp.symbol.KSTypeParameter
 import com.google.devtools.ksp.symbol.Variance.INVARIANT
+import com.google.devtools.ksp.symbol.Variance.STAR
 import java.util.Locale
 
 internal fun adt(c: KSClassDeclaration, logger: KSPLogger): ADT =
@@ -180,7 +181,11 @@ internal fun KSType.qualifiedString(prefix: String = ""): String = when (declara
 
 internal fun KSTypeArgument.qualifiedString(): String = when (val ty = type?.resolve()) {
   null -> toString()
-  else -> ty.qualifiedString(prefix = "${variance.label} ".takeIf { variance != INVARIANT }.orEmpty())
+  else -> when (variance) {
+    STAR -> "*"
+    INVARIANT -> ty.qualifiedString()
+    else -> ty.qualifiedString(prefix = "${variance.label} ")
+  }
 }
 
 internal fun KSClassDeclaration.getConstructorParamNames(): List<String> =

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/LensTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/LensTests.kt
@@ -113,4 +113,21 @@ class LensTests {
       |val r = i != null && j != null
       """.evals("r" to true)
   }
+
+  @Test
+  fun `Lenses for STAR arguments`() {
+    """
+      |$`package`
+      |$imports
+      |@optics
+      |data class GenericType<A>(
+      |  val field1: A
+      |) { companion object }
+      |
+      |@optics
+      |data class IsoData(val genericType: GenericType<*>) {
+      |  companion object
+      |}
+      """.compilationSucceeds()
+  }
 }