Improvements to className use in DefType

Author: darkfrog26

core/shared/src/main/scala-2/fabric/rw/RWMacros.scala

@@ -277,6 +277,7 @@ object RWMacros {
           val name = field.asTerm.name
           val innerType = tpe.decl(name).typeSignature.asSeenFrom(tpe, tpe.typeSymbol.asClass)
           val companion = tpe.typeSymbol.companion
+          val className = tpe.typeSymbol.fullName
           return context.Expr[RW[T]](q"""
             import _root_.fabric._
             import _root_.fabric.rw._
@@ -286,7 +287,7 @@ object RWMacros {
               private val innerRW = implicitly[RW[$innerType]]
               override def read(t: $tpe): Json = innerRW.read(t.$name)
               override def write(value: Json): $tpe = $companion(innerRW.write(value))
-              override def definition: DefType = innerRW.definition
+              override val definition: DefType = innerRW.definition.withClassName($className)
             }
           """)
         case _ => // fall through to normal path

core/shared/src/main/scala-3/fabric/rw/CompileRW.scala

@@ -645,6 +645,7 @@ object CompileRW extends CompileRW {
         val innerRW = Expr.summon[RW[inner]].getOrElse {
           report.errorAndAbort(s"No RW found for AnyVal inner type ${fieldType.show}")
         }
+        val classNameExpr = Expr(typeSymbol.fullName)
         '{
           new RW[T] {
             override def read(value: T): Json = {
@@ -655,7 +656,7 @@ object CompileRW extends CompileRW {
               val inner = $innerRW.write(json)
               ${ Apply(Select(New(TypeTree.of[T]), typeSymbol.primaryConstructor), List('{ inner }.asTerm)).asExprOf[T] }
             }
-            override def definition: DefType = $innerRW.definition
+            override val definition: DefType = $innerRW.definition.withClassName($classNameExpr)
           }
         }
     }

core/shared/src/main/scala/fabric/define/DefType.scala

@@ -289,7 +289,6 @@ object DefType {
     override def description: Option[String] = dt.description
     override def isOpt: Boolean = dt.isOpt
     override def isNull: Boolean = dt.isNull
-    override def opt: DefType = Classed(dt.opt, cn)
     override def withClassName(cn: String): DefType = copy(cn = cn)
     override def describe(desc: String): DefType = Classed(dt.describe(desc), cn)
     override def merge(that: DefType): DefType = Classed(dt.merge(that), cn)