1 files changed, 16 insertions, 9 deletions
diff --git a/src/compiler/scala/tools/nsc/classpath/FlatClassPathFactory.scala b/src/compiler/scala/tools/nsc/classpath/FlatClassPathFactory.scala
index d8ca325885..463301696e 100644
--- a/src/compiler/scala/tools/nsc/classpath/FlatClassPathFactory.scala
+++ b/src/compiler/scala/tools/nsc/classpath/FlatClassPathFactory.scala
@@ -3,6 +3,7 @@
  */
 package scala.tools.nsc.classpath
 
+import scala.reflect.io.VirtualDirectory
 import scala.tools.nsc.Settings
 import scala.tools.nsc.io.AbstractFile
 import FileUtils.AbstractFileOps
@@ -12,16 +13,9 @@ import FileUtils.AbstractFileOps
  * it uses proper type of classpath depending on a types of particular files containing sources or classes.
  */
 class FlatClassPathFactory(settings: Settings) extends ClassPathFactory[FlatClassPath] {
+  def newClassPath(file: AbstractFile): FlatClassPath = FlatClassPathFactory.newClassPath(file, settings)
 
-  override def newClassPath(file: AbstractFile): FlatClassPath =
-    if (file.isJarOrZip)
-      ZipAndJarFlatClassPathFactory.create(file, settings)
-    else if (file.isDirectory)
-      new DirectoryFlatClassPath(file.file)
-    else
-      sys.error(s"Unsupported classpath element: $file")
-
-  override def sourcesInPath(path: String): List[FlatClassPath] =
+  def sourcesInPath(path: String): List[FlatClassPath] =
     for {
       file <- expandPath(path, expandStar = false)
       dir <- Option(AbstractFile getDirectory file)
@@ -35,3 +29,16 @@ class FlatClassPathFactory(settings: Settings) extends ClassPathFactory[FlatClas
     else
       sys.error(s"Unsupported sourcepath element: $file")
 }
+
+object FlatClassPathFactory {
+  def newClassPath(file: AbstractFile, settings: Settings): FlatClassPath = file match {
+    case vd: VirtualDirectory => VirtualDirectoryFlatClassPath(vd)
+    case _ =>
+      if (file.isJarOrZip)
+        ZipAndJarFlatClassPathFactory.create(file, settings)
+      else if (file.isDirectory)
+        new DirectoryFlatClassPath(file.file)
+      else
+        sys.error(s"Unsupported classpath element: $file")
+  }
+}