optics ksp plugin: fixed handling of variance (#3060)

arrow-kt · May 31, 2023 · 943262f · 943262f
1 parent 2c78468
commit 943262f
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
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
@@ -5,6 +5,7 @@ import arrow.optics.plugin.isSealed
 import arrow.optics.plugin.isValue
 import com.google.devtools.ksp.processing.KSPLogger
 import com.google.devtools.ksp.symbol.*
+import com.google.devtools.ksp.symbol.Variance.INVARIANT
 import java.util.Locale
 
 internal fun adt(c: KSClassDeclaration, logger: KSPLogger): ADT =
@@ -153,12 +154,12 @@ internal fun evalAnnotatedIsoElement(
 internal fun KSClassDeclaration.getConstructorTypesNames(): List<String> =
   primaryConstructor?.parameters?.map { it.type.resolve().qualifiedString() }.orEmpty()
 
-internal fun KSType.qualifiedString(): String = when (declaration) {
+internal fun KSType.qualifiedString(prefix: String = ""): String = when (declaration) {
   is KSTypeParameter -> {
-    val n = declaration.simpleName.asSanitizedString()
+    val n = declaration.simpleName.asSanitizedString(prefix = prefix)
     if (isMarkedNullable) "$n?" else n
   }
-  else -> when (val qname = declaration.qualifiedName?.asSanitizedString()) {
+  else -> when (val qname = declaration.qualifiedName?.asSanitizedString(prefix = prefix)) {
     null -> toString()
     else -> {
       val withArgs = when {
@@ -172,7 +173,7 @@ internal fun KSType.qualifiedString(): String = when (declaration) {
 
 internal fun KSTypeArgument.qualifiedString(): String = when (val ty = type?.resolve()) {
   null -> toString()
-  else -> ty.qualifiedString()
+  else -> ty.qualifiedString(prefix = "${variance.label} ".takeIf { variance != INVARIANT }.orEmpty())
 }
 
 internal fun KSClassDeclaration.getConstructorParamNames(): List<String> =

diff --git a/...ibs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/utils.kt b/...ibs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/internals/utils.kt
@@ -12,8 +12,8 @@ fun String.plusIfNotBlank(prefix: String = "", postfix: String = "") =
 /**
  * Sanitizes each delimited section if it matches with Kotlin reserved keywords.
  */
-fun KSName.asSanitizedString(delimiter: String = ".") =
-  asString().splitToSequence(delimiter).joinToString(delimiter) { if (it in kotlinKeywords) "`$it`" else it }
+fun KSName.asSanitizedString(delimiter: String = ".", prefix: String = "") =
+  asString().splitToSequence(delimiter).joinToString(delimiter, prefix) { if (it in kotlinKeywords) "`$it`" else it }
 
 
 private val kotlinKeywords = setOf(

diff --git a/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/DSLTests.kt b/arrow-libs/optics/arrow-optics-ksp-plugin/src/test/kotlin/arrow/optics/plugin/DSLTests.kt
@@ -76,5 +76,23 @@ class DSLTests {
       """.compilationSucceeds()
   }
 
+  @Test
+  fun `DSL works with variance, issue #3057`() {
+    """
+      |$`package`
+      |$imports
+      |
+      |sealed interface ITest {
+      |  data class Test1(val test: String) : ITest
+      |}
+      |
+      |interface Extendable<T>
+      |@optics
+      |data class TestClass(val details: Extendable<out ITest>) {
+      |  companion object
+      |}
+      """.compilationSucceeds()
+  }
+
   // Db.content.at(At.map(), One).set(db, None)
 }