fix generated annotation applied explicitly on val getter

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)
@@ -382,6 +384,7 @@ object CodecTestData {
   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
   }

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

@@ -393,6 +393,7 @@ class SimpleGenCodecTest extends SimpleIOCodecTest {
         "upper" -> "V",
         "abstractUpper" -> "V",
         "valUpper" -> "V",
+        "getterUpper" -> "V",
         "varUpper" -> "V",
         "lazyValUpper" -> "V"
       )

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

@@ -62,7 +62,7 @@ abstract class CodecMacroCommons(ctx: blackbox.Context) extends AbstractMacroCom
     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 == NoSymbol && hasAnnotation(sym, GeneratedAnnotType) ||
+    (ts.getter == ts || ts.getter == NoSymbol) && hasAnnotation(ts, GeneratedAnnotType) ||
       ts.isGetter && hasAnnotation(ts.accessed, GeneratedAnnotType)
   }
 }