Fix unexpected DCG superclass adding to data object

Summary: Previous diff we mute the wrong violation to user. This diff we fix the superclass expectation Reviewed By: pengj Differential Revision: D58361681 fbshipit-source-id: a4eb24fd7daf3438981f3cbf801c0458eceec78c
facebookincubator · Jun 11, 2024 · 5be9d5e · 5be9d5e
1 parent 42f8d03
commit 5be9d5e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.../kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DataClassGenerateBuilder.kt b/.../kotlin/com/facebook/kotlin/compilerplugins/dataclassgenerate/DataClassGenerateBuilder.kt
@@ -80,11 +80,8 @@ class DataClassGenerateBuilder(
     else {
       val originElement = declarationOrigin.descriptor
       if (originElement is IrBasedClassDescriptor) {
-        if (originElement.isData) {
-          // TODO(T191800312): Follow up data object support with Redex.
-          if (originElement.kind.isClass &&
-              mode == PluginMode.STRICT &&
-              !originElement.isAnnotatedWithDataClassGenerate()) {
+        if (originElement.isData && originElement.kind.isClass) {
+          if (mode == PluginMode.STRICT && !originElement.isAnnotatedWithDataClassGenerate()) {
             throw DataClassGenerateStrictModeViolationException(
                 generateStrictModeViolationMessage(originElement.fqNameSafe))
           }

diff --git a/...in/com/facebook/kotlin/compilerplugins/dataclassgenerate/misc/JavaDeclarationOriginExt.kt b/...in/com/facebook/kotlin/compilerplugins/dataclassgenerate/misc/JavaDeclarationOriginExt.kt
@@ -9,6 +9,7 @@ package com.facebook.kotlin.compilerplugins.dataclassgenerate.misc
 
 import org.jetbrains.kotlin.descriptors.CallableMemberDescriptor
 import org.jetbrains.kotlin.descriptors.ClassDescriptor
+import org.jetbrains.kotlin.descriptors.ClassKind
 import org.jetbrains.kotlin.descriptors.annotations.AnnotationDescriptor
 import org.jetbrains.kotlin.ir.declarations.IrDeclarationOrigin
 import org.jetbrains.kotlin.ir.descriptors.IrBasedClassDescriptor
@@ -30,7 +31,8 @@ internal val JvmDeclarationOrigin.containingClassDescriptor: ClassDescriptor?
       }
 
 internal fun JvmDeclarationOrigin.isDataClass(): Boolean =
-    containingClassDescriptor?.isData ?: false
+    (containingClassDescriptor?.isData == true &&
+        containingClassDescriptor?.kind == ClassKind.CLASS) ?: false
 
 internal fun JvmDeclarationOrigin.superClassLiteral(): String {
   val superName = containingClassDescriptor?.getSuperClassNotAny()?.fqNameOrNull()