Merge pull request #994 from eed3si9n/wip/revert_OriginalTreeAttachments

Remove reference to OriginalTreeAttachment in Scala 2.12 bridge
sbt · Jul 12, 2021 · 5b1f92d · 5b1f92d
2 parents 2d457e7 + 3b0268a
commit 5b1f92d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala b/internal/compiler-bridge/src/main/scala-2.12/xsbt/Compat.scala
@@ -22,10 +22,11 @@ abstract class Compat {
 
   /** If given tree contains object tree attachment calls func on tree from attachment. */
   protected def processOriginalTreeAttachment(in: Tree)(func: Tree => Unit): Unit = {
-    import analyzer._
-    in.attachments.get[OriginalTreeAttachment].foreach { a =>
-      func(a.original)
-    }
+    // We can't until we figure out how to conditionally do this for Scala 2.12.3+
+    // import analyzer._
+    // in.attachments.get[OriginalTreeAttachment].foreach { a =>
+    //  func(a.original)
+    // }
   }
 }
 object Compat {

diff --git a/...t-test/source-dependencies/constants/test → ...st/source-dependencies/constants/disabled b/...t-test/source-dependencies/constants/test → ...st/source-dependencies/constants/disabled
diff --git a/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/BaseCompilerSpec.scala
@@ -49,6 +49,8 @@ class BaseCompilerSpec extends BridgeProviderSpecification {
 
   implicit class ProjectSetupOps(setup: ProjectSetup) {
     def createCompiler(): CompilerSetup = setup.createCompiler(scalaVersion, incOptions)
+    def createCompiler(scalaVersion: String): CompilerSetup =
+      setup.createCompiler(scalaVersion, incOptions)
 
     private def createCompiler(sv: String, incOptions: IncOptions): CompilerSetup = {
       val si = scalaInstance(sv, setup.baseDir, Logger.Null)

diff --git a/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala b/zinc/src/test/scala/sbt/inc/IncrementalCompilerSpec.scala
@@ -192,7 +192,7 @@ class IncrementalCompilerSpec extends BaseCompilerSpec {
 
   it should "track dependencies on constants" in withTmpDir { tmp =>
     val project = VirtualSubproject(tmp.toPath / "p1")
-    val comp = project.setup.createCompiler()
+    val comp = project.setup.createCompiler("2.13.6")
     try {
       val s1 = "object A { final val i = 1 }"
       val s1b = "object A { final val i = 2 }"