Fix #97 by adding of missing decoding for ADT class names

Author: plokhotnyuk

macros/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

@@ -12,6 +12,7 @@ import scala.collection.immutable.{BitSet, IntMap, LongMap}
 import scala.collection.mutable.ArrayBuffer
 import scala.collection.{breakOut, mutable}
 import scala.language.experimental.macros
+import scala.reflect.NameTransformer
 import scala.reflect.macros.blackbox
 
 @field
@@ -124,7 +125,7 @@ object JsonCodecMaker {
 
       def info(msg: String): Unit = c.info(c.enclosingPosition, msg, force = true)
 
-      def decodedName(s: Symbol): String = s.name.decodedName.toString
+      def decodedName(s: Symbol): String = decodeName(s.name.toString)
 
       def methodType(m: MethodSymbol): Type = m.returnType.dealias
 
@@ -382,7 +383,7 @@ object JsonCodecMaker {
         cq"${JsonReader.toHashCode(cs, cs.length)} => in.skip()"
       }
 
-      def discriminatorValue(tpe: Type): String = codecConfig.adtLeafClassNameMapper(tpe.typeSymbol.fullName)
+      def discriminatorValue(tpe: Type): String = codecConfig.adtLeafClassNameMapper(decodeName(tpe.typeSymbol.fullName))
 
       def getStringified(annotations: Map[String, FieldAnnotations], name: String): Boolean =
         annotations.get(name).fold(false)(_.stringified)
@@ -898,6 +899,10 @@ object JsonCodecMaker {
     }
   }
 
+  private[this] def decodeName(s: String): String =
+    if (s.indexOf('$') >= 0) NameTransformer.decode(s)
+    else s
+
   private[this] def isEncodingRequired(s: String): Boolean = {
     val len = s.length
     var i = 0

macros/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMakerSpec.scala

@@ -163,6 +163,12 @@ class JsonCodecMakerSpec extends WordSpec with Matchers {
 
   case object D extends AdtBase
 
+  sealed trait TimeZone
+
+  case object `US/Alaska` extends TimeZone
+
+  case object `Europe/Paris` extends TimeZone
+
   sealed abstract class База
 
   case class А(б: Б) extends База
@@ -889,6 +895,11 @@ class JsonCodecMakerSpec extends WordSpec with Matchers {
         List(А(Б("x")), Б("x")),
         """[{"тип":"А","б":{"с":"x"}},{"тип":"Б","с":"x"}]""".getBytes("UTF-8"))
     }
+    "serialize and deserialize ADTs with Scala operators in names" in {
+      verifySerDeser(make[List[TimeZone]](CodecMakerConfig(discriminatorFieldName = "zoneId")),
+        List(`US/Alaska`, `Europe/Paris`),
+        """[{"zoneId":"US/Alaska"},{"zoneId":"Europe/Paris"}]""".getBytes("UTF-8"))
+    }
     "throw parse exception in case of missing discriminator field or illegal value of discriminator field" in {
       assert(intercept[JsonParseException] {
         verifyDeser(codecOfADTList, List(A(1)), """[{"a":1}]""".getBytes("UTF-8"))