remove placeholders map

ozenzin · Jul 17, 2023 · aa27580 · aa27580
1 parent 5fde72c
commit aa27580
Showing 1 changed file with 11 additions and 22 deletions.
diff --git a/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java b/sbt-bridge/src/dotty/tools/xsbt/CompilerBridgeDriver.java
@@ -56,13 +56,14 @@ public boolean sourcesRequired() {
   }
 
   private static VirtualFile asVirtualFile(SourceFile sourceFile, DelegatingReporter reporter,
-      HashMap<AbstractFile, VirtualFile> lookup, Map<AbstractFile, VirtualFile> placeholders) {
-    VirtualFile maybeCached = lookup.get(sourceFile.file());
-    if (maybeCached != null) {
-      return maybeCached;
-    } else {
-      return fallbackVirtualFile(reporter, sourceFile, placeholders);
-    }
+      HashMap<AbstractFile, VirtualFile> lookup) {
+    return lookup.computeIfAbsent(sourceFile.file(), path -> {
+      reportMissingFile(reporter, sourceFile);
+      if (sourceFile.file().jpath() != null)
+        return new BasicPathBasedFile(sourceFile);
+      else
+        return new PlaceholderVirtualFile(sourceFile);
+    });
   }
 
   private static void reportMissingFile(DelegatingReporter reporter, SourceFile sourceFile) {
@@ -75,17 +76,6 @@ private static void reportMissingFile(DelegatingReporter reporter, SourceFile so
     reporter.reportBasicWarning(message);
   }
 
-  private static VirtualFile fallbackVirtualFile(DelegatingReporter reporter, SourceFile sourceFile,
-      Map<AbstractFile, VirtualFile> placeholders) {
-    return placeholders.computeIfAbsent(sourceFile.file(), path -> {
-      reportMissingFile(reporter, sourceFile);
-      if (sourceFile.file().jpath() != null)
-        return new BasicPathBasedFile(sourceFile);
-      else
-        return new PlaceholderVirtualFile(sourceFile);
-    });
-  }
-
   synchronized public void run(VirtualFile[] sources, AnalysisCallback callback, Logger log, Reporter delegate) {
     VirtualFile[] sortedSources = new VirtualFile[sources.length];
     System.arraycopy(sources, 0, sortedSources, 0, sources.length);
@@ -101,13 +91,12 @@ synchronized public void run(VirtualFile[] sources, AnalysisCallback callback, L
       lookup.put(abstractFile, source);
     }
 
-    HashMap<AbstractFile, VirtualFile> placeholders = new HashMap<>();
-
     DelegatingReporter reporter = new DelegatingReporter(delegate, (self, sourceFile) ->
-      asVirtualFile(sourceFile, self, lookup, placeholders).id());
+      asVirtualFile(sourceFile, self, lookup).id()
+    );
 
     IncrementalCallback incCallback = new IncrementalCallback(callback, sourceFile ->
-      asVirtualFile(sourceFile, reporter, lookup, placeholders)
+      asVirtualFile(sourceFile, reporter, lookup)
     );
 
     try {