only add @compileTimeOnly if it is not already defined

scalamacros · Jun 18, 2017 · 7d38641 · 7d38641
1 parent d2da77c
commit 7d38641
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/plugin/src/main/scala/org/scalamacros/paradise/typechecker/Compilers.scala b/plugin/src/main/scala/org/scalamacros/paradise/typechecker/Compilers.scala
@@ -22,7 +22,7 @@ trait Compilers {
           val macroTransform = clazz.info.member(nme.macroTransform)
           if (macroTransform != NoSymbol) {
             clazz.setFlag(MACRO)
-            clazz.addAnnotation(AnnotationInfo(CompileTimeOnlyAttr.tpe, List(Literal(Constant(MacroAnnotationNotExpandedMessage)) setType StringClass.tpe), Nil))
+            if (clazz.getAnnotation(CompileTimeOnlyAttr).isEmpty) clazz.addAnnotation(AnnotationInfo(CompileTimeOnlyAttr.tpe, List(Literal(Constant(MacroAnnotationNotExpandedMessage)) setType StringClass.tpe), Nil))
             def flavorOk = macroTransform.isMacro
             def paramssOk = mmap(macroTransform.paramss)(p => (p.name, p.info)) == List(List((nme.annottees, scalaRepeatedType(AnyTpe))))
             def tparamsOk = macroTransform.typeParams.isEmpty
@@ -38,4 +38,4 @@ trait Compilers {
       cdef
     }
   }
-}
+}
diff --git a/tests/src/main/scala/issue90Class.scala b/tests/src/main/scala/issue90Class.scala
@@ -0,0 +1,16 @@
+import scala.annotation.compileTimeOnly
+import scala.annotation.StaticAnnotation
+import scala.language.experimental.macros
+import scala.reflect.macros.whitebox.Context
+
+object issue90Macro {
+    def impl(c: Context)(annottees: c.Expr[Any]*): c.Expr[Any] = {
+      import c.universe._
+        c.Expr(EmptyTree)
+    }
+}
+
+@compileTimeOnly("this is the only annotation")
+final class issue90Class extends StaticAnnotation {
+  def macroTransform(annottees: Any*): Any = macro issue90Macro.impl
+}
diff --git a/tests/src/test/scala/annotations/run/Issue90.scala b/tests/src/test/scala/annotations/run/Issue90.scala
@@ -0,0 +1,10 @@
+import org.scalatest.FunSuite
+
+import scala.reflect.runtime.{currentMirror => cm}
+
+class Issue90 extends FunSuite {
+  test("compileTimeOnly annotation is not added if it is already in the class definition") {
+    assert(cm.staticClass("issue90Class").annotations.length == 1)
+    assert(cm.staticClass("issue90Class").annotations.head.toString == "scala.annotation.compileTimeOnly(\"this is the only annotation\")")
+  }
+}