always fallback when missing virtual file

Author: bishabosha

sbt-bridge/src/dotty/tools/xsbt/BasicPathBasedFile.java

@@ -0,0 +1,20 @@
+package dotty.tools.xsbt;
+
+import dotty.tools.dotc.interfaces.SourceFile;
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+
+public class BasicPathBasedFile extends PlaceholderVirtualFile implements xsbti.PathBasedFile {
+
+  private final SourceFile sourceFile;
+
+  public BasicPathBasedFile(SourceFile sourceFile) {
+    super(sourceFile);
+    this.sourceFile = sourceFile;
+  }
+
+  public java.nio.file.Path toPath() {
+    return sourceFile.jfile().get().toPath();
+  }
+
+}

sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java

@@ -55,11 +55,12 @@ public boolean sourcesRequired() {
     return false;
   }
 
-  private static VirtualFile asVirtualFileOrNull(SourceFile sourceFile) {
+  private static VirtualFile asVirtualFile(SourceFile sourceFile, DelegatingReporter reporter,
+      Map<String, VirtualFile> placeholders) {
     if (sourceFile.file() instanceof AbstractZincFile) {
       return ((AbstractZincFile) sourceFile.file()).underlying();
     } else {
-      return null;
+      return fallbackVirtualFile(reporter, sourceFile, placeholders);
     }
   }
 
@@ -78,7 +79,10 @@ private static VirtualFile fallbackVirtualFile(DelegatingReporter reporter,
       Map<String, VirtualFile> placeholders) {
     return placeholders.computeIfAbsent(sourceFile.path(), path -> {
       reportMissingFile(reporter, sourceFile);
-      return new PlaceholderVirtualFile(sourceFile);
+      if (sourceFile.jfile().isPresent())
+        return new BasicPathBasedFile(sourceFile);
+      else
+        return new PlaceholderVirtualFile(sourceFile);
     });
   }
 
@@ -97,26 +101,14 @@ synchronized public void run(VirtualFile[] sources, AnalysisCallback callback, L
       sourcesSet.put(abstractFile);
     }
 
-    DelegatingReporter reporter = new DelegatingReporter(delegate, sourceFile -> {
-      VirtualFile vf = asVirtualFileOrNull(sourceFile);
-      if (vf != null) {
-        return vf.id();
-      } else {
-        return sourceFile.path(); // same as in Zinc for 2.13
-      }
-    });
-
     HashMap<String, VirtualFile> placeholders = new HashMap<>();
 
+    DelegatingReporter reporter = new DelegatingReporter(delegate, (self, sourceFile) ->
+      asVirtualFile(sourceFile, self, placeholders).id());
+
     IncrementalCallback incCallback = new IncrementalCallback(callback, sourceFile -> {
       if (sourceFile instanceof SourceFile) {
-        SourceFile sf = (SourceFile) sourceFile;
-        VirtualFile vf = asVirtualFileOrNull(sf);
-        if (vf != null) {
-          return vf;
-        } else {
-          return fallbackVirtualFile(reporter, sourceFile, placeholders);
-        }
+        return asVirtualFile(((SourceFile) sourceFile), reporter, placeholders);
       } else {
         return fallbackVirtualFile(reporter, sourceFile, placeholders);
       }

sbt-bridge/src/dotty/tools/xsbt/DelegatingReporter.java

@@ -24,12 +24,14 @@
 
 final public class DelegatingReporter extends AbstractReporter {
   private xsbti.Reporter delegate;
+  private final BiFunction<DelegatingReporter, SourceFile, String> baseLookup;
   private final Function<SourceFile, String> lookup;
 
-  public DelegatingReporter(xsbti.Reporter delegate, Function<SourceFile, String> lookup) {
+  public DelegatingReporter(xsbti.Reporter delegate, BiFunction<DelegatingReporter, SourceFile, String> baseLookup) {
     super();
     this.delegate = delegate;
-    this.lookup = lookup;
+    this.baseLookup = baseLookup;
+    this.lookup = sourceFile -> baseLookup.apply(this, sourceFile);
   }
 
   public void dropDelegate() {

sbt-bridge/src/dotty/tools/xsbt/PlaceholderVirtualFile.java

@@ -4,7 +4,7 @@
 import java.io.InputStream;
 import java.nio.charset.StandardCharsets;
 
-public final class PlaceholderVirtualFile extends xsbti.BasicVirtualFileRef implements xsbti.VirtualFile {
+public class PlaceholderVirtualFile extends xsbti.BasicVirtualFileRef implements xsbti.VirtualFile {
 
   private final SourceFile sourceFile;
 

sbt-bridge/src/dotty/tools/xsbt/Problem.java

@@ -16,6 +16,7 @@
 
 import xsbti.Position;
 import xsbti.Severity;
+import xsbti.VirtualFile;
 
 
 final public class Problem implements xsbti.Problem {

sbt-bridge/src/xsbt/CachedCompilerImpl.java

@@ -67,7 +67,7 @@ synchronized public void run(File[] sources, DependencyChanges changes, Analysis
 
     Context ctx = new ContextBase().initialCtx().fresh()
       .setIncCallback(incCallback)
-      .setReporter(new DelegatingReporter(delegate, source -> source.file().absolutePath()));
+      .setReporter(new DelegatingReporter(delegate, (self, source) -> source.file().absolutePath()));
 
     dotty.tools.dotc.reporting.Reporter reporter = Main.process(commandArguments(sources), ctx);
     if (reporter.hasErrors()) {

sbt-bridge/src/xsbt/DottydocRunner.java

@@ -53,7 +53,7 @@ public void run() {
     args = retained.toArray(new String[retained.size()]);
 
     Context ctx = new ContextBase().initialCtx().fresh()
-      .setReporter(new DelegatingReporter(delegate, source -> source.file().absolutePath()));
+      .setReporter(new DelegatingReporter(delegate, (self, source) -> source.file().absolutePath()));
 
     try {
       Class<?> dottydocMainClass = Class.forName("dotty.tools.dottydoc.Main");