Merge pull request #983 from retronym/ticket/690-package-object

Fix package object invalidation when ancestor has inner class (avoiding "Symbol 'type b.A' is missing from the classpath" error)

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

@@ -44,9 +44,16 @@ private[inc] class IncrementalNameHashingCommon(
       apis: APIs
   ): Set[String] = {
     val findSubclasses = relations.inheritance.internal.reverse _
+    val invalidatedClassesAndCodefinedClasses = for {
+      cls <- invalidatedClasses.iterator
+      file <- relations.definesClass(cls).iterator
+      cls1 <- relations.classNames(file)
+    } yield cls1
+
     debug("Invalidate package objects by inheritance only...")
     val invalidatedPackageObjects =
-      transitiveDeps(invalidatedClasses, log)(findSubclasses).filter(_.endsWith(".package"))
+      transitiveDeps(invalidatedClassesAndCodefinedClasses.toSet, log)(findSubclasses)
+        .filter(_.endsWith(".package"))
     debug(s"Package object invalidations: ${invalidatedPackageObjects.mkString(", ")}")
     invalidatedPackageObjects
   }

zinc/src/sbt-test/source-dependencies/package-object-name-inner/A.scala

@@ -0,0 +1,7 @@
+package b
+
+class A {
+  class Inner {
+    O.o
+  }
+}

zinc/src/sbt-test/source-dependencies/package-object-name-inner/O.scala

@@ -0,0 +1,5 @@
+package b
+
+object O {
+  def o = ""
+}

zinc/src/sbt-test/source-dependencies/package-object-name-inner/b.scala

@@ -0,0 +1 @@
+package object b extends A

zinc/src/sbt-test/source-dependencies/package-object-name-inner/changes/O1.scala

@@ -0,0 +1,5 @@
+package b
+
+object O {
+  def o = 42
+}

zinc/src/sbt-test/source-dependencies/package-object-name-inner/test

@@ -0,0 +1,4 @@
+> compile
+$ copy-file changes/O1.scala O.scala
+> compile
+> checkIterations 3