Merge pull request #1309 from Friendseeker/plainfile-match-fail

[1.x] Generate `AbstractZincFile` during `-sourcepath` workflow

internal/compiler-bridge/src/main/scala/xsbt/CallbackGlobal.scala

@@ -11,7 +11,7 @@
 
 package xsbt
 
-import xsbti.{ AnalysisCallback, Severity }
+import xsbti.{ AnalysisCallback, AnalysisCallback3, Severity }
 import xsbti.compile._
 
 import scala.tools.nsc._
@@ -20,6 +20,7 @@ import java.nio.file.{ Files, Path }
 
 import scala.reflect.io.PlainFile
 import scala.reflect.ReflectAccess._
+import scala.reflect.internal.util.BatchSourceFile
 
 /** Defines the interface of the incremental compiler hiding implementation details. */
 sealed abstract class CallbackGlobal(
@@ -78,6 +79,15 @@ sealed class ZincCompiler(settings: Settings, dreporter: DelegatingReporter, out
     extends CallbackGlobal(settings, dreporter, output)
     with ZincGlobalCompat {
 
+  override def getSourceFile(f: AbstractFile): BatchSourceFile = {
+    val file = (f, callback) match {
+      case (plainFile: PlainFile, callback3: AnalysisCallback3) =>
+        AbstractZincFile(callback3.toVirtualFile(plainFile.file.toPath))
+      case _ => f
+    }
+    super.getSourceFile(file)
+  }
+
   final class ZincRun(compileProgress: CompileProgress) extends Run {
     override def informUnitStarting(phase: Phase, unit: CompilationUnit): Unit = {
       compileProgress.startUnit(phase.name, unit.source.path)

internal/compiler-interface/src/main/java/xsbti/AnalysisCallback3.java

@@ -10,12 +10,17 @@
  */
 
 package xsbti;
+
 import xsbti.compile.analysis.ReadSourceInfos;
 
+import java.nio.file.Path;
+
 /**
  * Extension to {@link AnalysisCallback2}.
  * Similar to {@link AnalysisCallback2}, it serves as compatibility layer for Scala compilers.
  */
 public interface AnalysisCallback3 extends AnalysisCallback2 {
+    VirtualFile toVirtualFile(Path path);
+
     ReadSourceInfos getSourceInfos();
 }

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

@@ -674,6 +674,8 @@ private final class AnalysisCallback(
     ()
   }
 
+  override def toVirtualFile(path: Path): VirtualFile = converter.toVirtualFile(path)
+
   override def problem2(
       category: String,
       pos: Position,

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

@@ -795,7 +795,10 @@ case class ProjectStructure(
     }
     val scalacOptions: List[String] =
       Option(map.get("scalac.options")).toList
-        .flatMap(_.toString.split(" +").toList) ++
+        .flatMap(_.toString.split(" +").toList.map(_.replace(
+          "[basedir]",
+          baseDirectory.toAbsolutePath.toString
+        ))) ++
         // for now assume export pipelining for all pipelining subprojects
         (if (incOptions.pipelining) List("-Ypickle-java", "-Ypickle-write", earlyOutput.toString)
          else Nil)

internal/zinc-testing/src/main/scala/xsbti/TestCallback.scala

@@ -154,6 +154,10 @@ class TestCallback extends AnalysisCallback3 {
 
   override def getPickleJarPair = Optional.empty()
 
+  override def toVirtualFile(path: Path): VirtualFile = {
+    throw new UnsupportedOperationException("This method should not be called in tests")
+  }
+
   override def getSourceInfos: ReadSourceInfos = new TestSourceInfos
 }
 

zinc/src/sbt-test/source-dependencies/sourcepath-virtualfile/changes/B.scala

@@ -0,0 +1,3 @@
+class B {
+  def f: A = new A()
+}

zinc/src/sbt-test/source-dependencies/sourcepath-virtualfile/incOptions.properties

@@ -0,0 +1 @@
+scalac.options = -sourcepath [basedir]/src/main/scala

zinc/src/sbt-test/source-dependencies/sourcepath-virtualfile/src/main/scala/A.scala

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

zinc/src/sbt-test/source-dependencies/sourcepath-virtualfile/src/main/scala/B.scala

@@ -0,0 +1,3 @@
+class B {
+  def f = new A()
+}

zinc/src/sbt-test/source-dependencies/sourcepath-virtualfile/test

@@ -0,0 +1,6 @@
+> compile
+
+$ copy-file changes/B.scala src/main/scala/B.scala
+$ touch src/main/scala/A.scala
+
+> compile