Merge pull request #1284 from Friendseeker/trait-class-bug-fix

Include extra invalidations in initial validation to fix initial compilation error

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

@@ -510,7 +510,14 @@ private[inc] abstract class IncrementalCommon(
     val removedClasses = classNames(removedSrcs)
     val dependentOnRemovedClasses = removedClasses.flatMap(previous.memberRef.internal.reverse)
     val modifiedClasses = classNames(modifiedSrcs)
-    val invalidatedClasses = removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses
+    val mutualDependentOnModifiedClasses = {
+      val dependentOnModifiedClasses = modifiedClasses.flatMap(previous.memberRef.internal.reverse)
+      dependentOnModifiedClasses.filter(dependent =>
+        previous.memberRef.internal.reverse(dependent).exists(modifiedClasses)
+      )
+    }
+    val invalidatedClasses =
+      removedClasses ++ dependentOnRemovedClasses ++ modifiedClasses ++ mutualDependentOnModifiedClasses
 
     val byProduct = changes.removedProducts.flatMap(previous.produced)
     val byLibraryDep = changes.libraryDeps.flatMap(previous.usesLibrary)

zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/A.scala

@@ -0,0 +1,4 @@
+abstract class A
+object Test {
+  new B
+}

zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/B.scala

@@ -0,0 +1 @@
+class B extends A

zinc/src/sbt-test/source-dependencies/abstract-class-to-trait/changes/A.scala

@@ -0,0 +1,4 @@
+trait A
+object Test {
+  new B
+}

zinc/src/sbt-test/source-dependencies/false-error/test

@@ -0,0 +1,5 @@
+> compile
+
+$ copy-file changes/A.scala A.scala
+
+> compile

zinc/src/sbt-test/source-dependencies/nested-type-params/test

@@ -3,6 +3,6 @@
 $ copy-file changes/Providers.scala Providers.scala
 $ copy-file changes/Bar.scala Bar.scala
 
--> compile # This should compile
+> compile # This should compile
 > clean
 > compile # Make sure that clean compile is fine

zinc/src/sbt-test/source-dependencies/no-type-annotation/Before.scala

@@ -0,0 +1 @@
+class Before

zinc/src/sbt-test/source-dependencies/no-type-annotation/Problem.scala

@@ -0,0 +1,3 @@
+class Problem(wrapper: Wrapper) {
+  def x = wrapper.x
+}

zinc/src/sbt-test/source-dependencies/no-type-annotation/ProblemUser.scala

@@ -0,0 +1,7 @@
+class ProblemUser {
+  val y: Seq[Before] = ???
+
+  private def method(p: Problem): Unit = {
+    println(p.x)
+  }
+}

zinc/src/sbt-test/source-dependencies/no-type-annotation/Wrapper.scala

@@ -0,0 +1,3 @@
+class Wrapper {
+  def x: Before = new Before
+}

zinc/src/sbt-test/source-dependencies/no-type-annotation/changes/Before.scala

@@ -0,0 +1 @@
+class After

zinc/src/sbt-test/source-dependencies/no-type-annotation/changes/ProblemUser.scala

@@ -0,0 +1,7 @@
+class ProblemUser {
+  val y: Seq[After] = ???
+
+  private def method(p: Problem): Unit = {
+    println(p.x)
+  }
+}

zinc/src/sbt-test/source-dependencies/no-type-annotation/changes/Wrapper.scala

@@ -0,0 +1,3 @@
+class Wrapper {
+  def x: After = new After
+}

zinc/src/sbt-test/source-dependencies/no-type-annotation/test

@@ -0,0 +1,7 @@
+> compile
+
+$ copy-file changes/Before.scala Before.scala
+$ copy-file changes/ProblemUser.scala ProblemUser.scala
+$ copy-file changes/Wrapper.scala Wrapper.scala
+
+> compile