Invalidate macro source when its dependency changes

internal/zinc-core/src/main/scala/sbt/internal/inc/IncrementalCommon.scala

@@ -176,7 +176,7 @@ private[inc] abstract class IncrementalCommon(
           if (isFullCompilation) Set.empty[String]
           else
             invalidateAfterInternalCompilation(
-              analysis.relations,
+              analysis,
               newApiChanges,
               recompiledClasses,
               cycleNum >= options.transitiveStep,
@@ -451,12 +451,13 @@ private[inc] abstract class IncrementalCommon(
    * @return A list of invalidated class names for the next incremental compiler run.
    */
   def invalidateAfterInternalCompilation(
-      relations: Relations,
+      analysis: Analysis,
       changes: APIChanges,
       recompiledClasses: Set[String],
       invalidateTransitively: Boolean,
       isScalaClass: String => Boolean
   ): Set[String] = {
+    val relations = analysis.relations
     val initial = changes.allModified.toSet
     val dependsOnClass = findClassDependencies(_, relations)
     val firstClassInvalidation: Set[String] = {
@@ -477,15 +478,22 @@ private[inc] abstract class IncrementalCommon(
     if (secondClassInvalidation.nonEmpty)
       log.debug(s"Invalidated due to generated class file collision: ${secondClassInvalidation}")
 
-    val newInvalidations = (firstClassInvalidation -- recompiledClasses) ++ secondClassInvalidation
+    // Invalidate macros that transitively depend on any of the recompiled classes
+    val thirdClassInvalidation = {
+      val transitive = IncrementalCommon.transitiveDeps(recompiledClasses, log)(dependsOnClass)
+      (transitive -- recompiledClasses).filter(analysis.apis.internalAPI(_).hasMacro)
+    }
+
+    val newInvalidations =
+      (firstClassInvalidation -- recompiledClasses) ++ secondClassInvalidation ++ thirdClassInvalidation
     if (newInvalidations.isEmpty) {
       log.debug("No classes were invalidated.")
       Set.empty
     } else {
       if (invalidateTransitively) {
         newInvalidations ++ recompiledClasses
       } else {
-        firstClassInvalidation ++ secondClassInvalidation
+        firstClassInvalidation ++ secondClassInvalidation ++ thirdClassInvalidation
       }
     }
   }

internal/zinc-scripted/src/test/scala/sbt/internal/inc/IncHandler.scala

@@ -508,7 +508,8 @@ case class ProjectStructure(
     compile(i).map { analysis =>
       discoverMainClasses(Some(analysis.apis)) match {
         case Seq(mainClassName) =>
-          val cp = ((i.si.allJars.map(_.toPath) :+ classesDir) ++ outputJar).map(_.toAbsolutePath)
+          val jars = i.si.allJars.map(_.toPath)
+          val cp = (jars ++ (unmanagedJars :+ output) ++ internalClasspath).map(_.toAbsolutePath)
           val loader = ClasspathUtil.makeLoader(cp, i.si, baseDirectory)
           val buffer = new ByteArrayOutputStream(8192)
           val oldOut = System.out

zinc/src/sbt-test/macros/macro-use/app/App.scala

@@ -0,0 +1,13 @@
+package app
+
+object App {
+  def main(args: Array[String]): Unit = {
+    val res = lib.Macro.append("ABC")
+    val exp = args(0)
+    if (res != exp) {
+      val e = new Exception(s"assertion failed: expected $exp, obtained $res")
+      e.setStackTrace(Array())
+      throw e
+    }
+  }
+}

zinc/src/sbt-test/macros/macro-use/build.json

@@ -0,0 +1,6 @@
+{
+  "projects": [
+    { "name": "lib", "scalaVersion": "2.13.12" },
+    { "name": "app", "scalaVersion": "2.13.12", "dependsOn": [ "lib" ] }
+  ]
+}

zinc/src/sbt-test/macros/macro-use/lib/Access.scala

@@ -0,0 +1,5 @@
+package lib
+
+class Access {
+  def give = new Data().suffix
+}

zinc/src/sbt-test/macros/macro-use/lib/Data.scala

@@ -0,0 +1,5 @@
+package lib
+
+class Data {
+  def suffix = "_" + new InternalApi().value
+}

zinc/src/sbt-test/macros/macro-use/lib/InternalApi.scala

@@ -0,0 +1,5 @@
+package lib
+
+class InternalApi {
+  def value: Int = 1
+}

zinc/src/sbt-test/macros/macro-use/lib/Macro.scala

@@ -0,0 +1,15 @@
+package lib
+
+import scala.language.experimental.macros
+
+import scala.reflect.macros.blackbox.Context
+
+object Macro {
+  def append(s: String): String = macro impl
+
+  def impl(c: Context)(s: c.Tree): c.Tree = {
+    import c.universe._
+    val suffix = new Access().give
+    q"""$s + $suffix"""
+  }
+}

zinc/src/sbt-test/macros/macro-use/lib/changes/InternalApi.scala

@@ -0,0 +1,5 @@
+package lib
+
+class InternalApi {
+  def value: Int = 2
+}

zinc/src/sbt-test/macros/macro-use/test

@@ -0,0 +1,3 @@
+> app/run ABC_1
+$ copy-file lib/changes/InternalApi.scala lib/InternalApi.scala
+> app/run ABC_2