Ensure optics type with "data" modifier is a class (arrow-kt#3036)

jsoizo · Apr 10, 2023 · b1ad7f7 · b1ad7f7
1 parent 58c37f9
commit b1ad7f7
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/...bs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/DeclarationUtils.kt b/...bs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/DeclarationUtils.kt
@@ -1,5 +1,6 @@
 package arrow.optics.plugin
 
+import com.google.devtools.ksp.symbol.ClassKind
 import com.google.devtools.ksp.symbol.KSClassDeclaration
 import com.google.devtools.ksp.symbol.Modifier
 
@@ -9,8 +10,8 @@ val KSClassDeclaration.companionObject: KSClassDeclaration?
 val KSClassDeclaration.isSealed
   get() = modifiers.contains(Modifier.SEALED)
 
-val KSClassDeclaration.isData
-  get() = modifiers.contains(Modifier.DATA)
+val KSClassDeclaration.isDataClass
+  get() = classKind == ClassKind.CLASS && modifiers.contains(Modifier.DATA)
 
 val KSClassDeclaration.isValue
   get() = modifiers.contains(Modifier.VALUE)
diff --git a/...ibs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/OpticsProcessor.kt b/...ibs/optics/arrow-optics-ksp-plugin/src/main/kotlin/arrow/optics/plugin/OpticsProcessor.kt
@@ -32,7 +32,7 @@ class OpticsProcessor(private val codegen: CodeGenerator, private val logger: KS
 
   private fun processClass(klass: KSClassDeclaration) {
     // check that it is sealed or data
-    if (!klass.isSealed && !klass.isData && !klass.isValue) {
+    if (!klass.isSealed && !klass.isDataClass && !klass.isValue) {
       logger.error(klass.qualifiedNameOrSimpleName.otherClassTypeErrorMessage, klass)
       return
     }

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
@@ -1,6 +1,6 @@
 package arrow.optics.plugin.internals
 
-import arrow.optics.plugin.isData
+import arrow.optics.plugin.isDataClass
 import arrow.optics.plugin.isSealed
 import arrow.optics.plugin.isValue
 import com.google.devtools.ksp.processing.KSPLogger
@@ -100,7 +100,7 @@ internal fun evalAnnotatedDataClass(
   logger: KSPLogger
 ): List<Focus> =
   when {
-    element.isData ->
+    element.isDataClass ->
       element
         .getConstructorTypesNames()
         .zip(element.getConstructorParamNames(), Focus.Companion::invoke)
@@ -112,7 +112,7 @@ internal fun evalAnnotatedDataClass(
 
 internal fun evalAnnotatedDslElement(element: KSClassDeclaration, logger: KSPLogger): Target =
   when {
-    element.isData ->
+    element.isDataClass ->
       DataClassDsl(
         element
           .getConstructorTypesNames()
@@ -133,7 +133,7 @@ internal fun evalAnnotatedIsoElement(
   logger: KSPLogger
 ): List<Focus> =
   when {
-    element.isData ->
+    element.isDataClass ->
       element
         .getConstructorTypesNames()
         .zip(element.getConstructorParamNames(), Focus.Companion::invoke)