NIT Refactoring

alexarchambault · Jan 16, 2025 · 8bdb2bb · 8bdb2bb
1 parent e4384f3
commit 8bdb2bb
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/src/main/scala/dataclass/Macros.scala b/src/main/scala/dataclass/Macros.scala
@@ -56,6 +56,8 @@ private[dataclass] class Macros(val c: Context) extends ImplTransformers {
           val hasToString = hasMethod("toString")
           val hasHashCode = hasMethod("hashCode")
           val hasTuple = hasMethod("tuple")
+          val hasCanEqual = hasMethod("canEqual")
+          val hasEquals = hasMethod("equals")
 
           val namedArgs = paramss.map(_.map { p =>
             q"${p.name}=this.${p.name}"
@@ -122,20 +124,24 @@ private[dataclass] class Macros(val c: Context) extends ImplTransformers {
               tq"({type L[..$tparams0]=$WildcardType})#L"
           }
 
-          val equalMethods = {
-            val fldChecks = paramss.flatten
-              .map { param =>
-                q"this.${param.name} == other.${param.name}"
-              }
-              .foldLeft[Tree](q"true")((a, b) => q"$a && $b")
-
+          val canEqualMethod = {
             val hashCheck =
               if (cachedHashCode) q"obj.hashCode == hashCode" else q"true"
             Seq(
               q"""
                 override def canEqual(obj: Any): _root_.scala.Boolean =
                   obj != null && obj.isInstanceOf[$tpname[..$wildcardedTparams]] && $hashCheck
-               """,
+               """
+            )
+          }
+
+          val equalsMethod = {
+            val fldChecks = paramss.flatten
+              .map { param =>
+                q"this.${param.name} == other.${param.name}"
+              }
+              .foldLeft[Tree](q"true")((a, b) => q"$a && $b")
+            Seq(
               q"""
                 override def equals(obj: Any): _root_.scala.Boolean =
                   this.eq(obj.asInstanceOf[AnyRef]) || canEqual(obj) && {
@@ -384,7 +390,8 @@ private[dataclass] class Macros(val c: Context) extends ImplTransformers {
               ..$stats
               ..$setters
               ..$toStringMethod
-              ..$equalMethods
+              ..$canEqualMethod
+              ..$equalsMethod
               ..$hashCodeMethod
               ..$tupleMethod
               ..$productMethods