Convert PlainFile to ZincPlainFile

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

@@ -11,15 +11,15 @@
 
 package xsbt
 
-import xsbti.{ AnalysisCallback, Severity }
+import xsbti.{ AnalysisCallback, AnalysisCallback3, PathBasedFile, Severity }
 import xsbti.compile._
 
 import scala.tools.nsc._
 import io.AbstractFile
 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 +78,16 @@ sealed class ZincCompiler(settings: Settings, dreporter: DelegatingReporter, out
     extends CallbackGlobal(settings, dreporter, output)
     with ZincGlobalCompat {
 
+  override def getSourceFile(f: AbstractFile): BatchSourceFile = {
+    val file = f match {
+      case plainFile: PlainFile =>
+        val vf = callback.asInstanceOf[AnalysisCallback3].toVirtualFile(plainFile.file.toPath)
+        new ZincPlainFile(vf.asInstanceOf[PathBasedFile])
+      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

@@ -0,0 +1,18 @@
+/*
+ * Zinc - The incremental compiler for Scala.
+ * Copyright Scala Center, Lightbend, and Mark Harrah
+ *
+ * Licensed under Apache License 2.0
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ */
+
+package xsbti;
+
+import java.nio.file.Path;
+
+public interface AnalysisCallback3 extends AnalysisCallback2 {
+    VirtualFile toVirtualFile(Path path);
+}

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

@@ -590,7 +590,7 @@ private final class AnalysisCallback(
     progress: Option[CompileProgress],
     incHandlerOpt: Option[Incremental.IncrementalCallback],
     log: Logger
-) extends xsbti.AnalysisCallback2 {
+) extends xsbti.AnalysisCallback3 {
   import Incremental.CompileCycleResult
 
   // This must have a unique value per AnalysisCallback
@@ -674,6 +674,8 @@ private final class AnalysisCallback(
     ()
   }
 
+  override def toVirtualFile(path: Path): VirtualFile = converter.toVirtualFile(path)
+
   override def problem2(
       category: String,
       pos: Position,