Merge pull request #438 from AVSystem/generated-fix

fixed `generated` annotation on vals & vars

Author: Roman Janusz

core/src/test/scala/com/avsystem/commons/serialization/CodecTestData.scala

@@ -5,6 +5,8 @@ import com.avsystem.commons.annotation.AnnotationAggregate
 import com.avsystem.commons.meta.{AutoOptionalParams, MacroInstances}
 import com.avsystem.commons.misc.{AutoNamedEnum, NamedEnumCompanion, TypedKey}
 
+import scala.annotation.meta.getter
+
 object CodecTestData {
   def col[T <: JCollection[Int]](col: T): T = {
     col.add(1)
@@ -373,4 +375,18 @@ object CodecTestData {
     case class LocalStuff()
     object LocalStuff extends HasGenCodec[LocalStuff]()(MacroInstances.materialize)
   }
+
+  trait GeneratorBase {
+    def value: String
+    @generated def upper: String = value.toUpperCase
+    @generated def abstractUpper: String
+  }
+  case class Generator(value: String) extends GeneratorBase {
+    def abstractUpper: String = value.toUpperCase
+    @generated val valUpper: String = value.toUpperCase
+    @(generated@getter) val getterUpper: String = value.toUpperCase
+    @generated var varUpper: String = value.toUpperCase
+    @generated val lazyValUpper: String = value.toUpperCase
+  }
+  object Generator extends HasGenCodec[Generator]
 }

core/src/test/scala/com/avsystem/commons/serialization/SimpleGenCodecTest.scala

@@ -384,4 +384,19 @@ class SimpleGenCodecTest extends SimpleIOCodecTest {
     testWrite[BuildablePojo](BuildablePojo.builder().setStr("foo").setFlags(JList(true, false)).setCool(false).build(),
       Map("str" -> "foo", "flags" -> List(true, false), "cool" -> false))
   }
+
+  test("generated fields") {
+    testWrite[Generator](
+      Generator("v"),
+      Map(
+        "value" -> "v",
+        "upper" -> "V",
+        "abstractUpper" -> "V",
+        "valUpper" -> "V",
+        "getterUpper" -> "V",
+        "varUpper" -> "V",
+        "lazyValUpper" -> "V"
+      )
+    )
+  }
 }

macros/src/main/scala/com/avsystem/commons/macros/serialization/CodecMacroCommons.scala

@@ -58,6 +58,11 @@ abstract class CodecMacroCommons(ctx: blackbox.Context) extends AbstractMacroCom
   def isTransparent(sym: Symbol): Boolean =
     hasAnnotation(sym, TransparentAnnotType)
 
-  def isGenerated(sym: Symbol): Boolean =
-    hasAnnotation(sym, GeneratedAnnotType)
+  def isGenerated(sym: Symbol): Boolean = sym.isTerm && {
+    val ts = sym.asTerm
+    // do not treat val/var's underlying field as a generated member,
+    // pretend that the annotation is actually applied on its getter
+    (ts.getter == ts || ts.getter == NoSymbol) && hasAnnotation(ts, GeneratedAnnotType) ||
+      ts.isGetter && hasAnnotation(ts.accessed, GeneratedAnnotType)
+  }
 }