Make virtual source files explicit

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/Comments.scala

@@ -119,7 +119,7 @@ object Comments {
   object UseCase {
     def apply(code: String, codePos: Span)(implicit ctx: Context): UseCase = {
       val tree = {
-        val tree = new Parser(new SourceFile("<usecase>", code)).localDef(codePos.start)
+        val tree = new Parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
         tree match {
           case tree: untpd.DefDef =>
             val newName = ctx.freshNames.newName(tree.name, NameKinds.DocArtifactName)

compiler/src/dotty/tools/dotc/printing/SyntaxHighlighting.scala

@@ -33,7 +33,7 @@ object SyntaxHighlighting {
     if (in.isEmpty || ctx.settings.color.value == "never") in
     else {
       implicit val ctx = freshCtx
-      val source = new SourceFile("<highlighting>", in)
+      val source = SourceFile.virtual("<highlighting>", in)
       val colorAt = Array.fill(in.length)(NoColor)
 
       def highlightRange(from: Int, to: Int, color: String) =

compiler/src/dotty/tools/dotc/quoted/QuoteCompiler.scala

@@ -51,12 +51,12 @@ class QuoteCompiler extends Compiler {
           val tree =
             if (putInClass) inClass(exprUnit.expr)
             else PickledQuotes.quotedExprToTree(exprUnit.expr)
-          val source = new SourceFile("", "")
+          val source = SourceFile.virtual("<quoted.Expr>", "")
           CompilationUnit.mkCompilationUnit(source, tree, forceTrees = true)
         case typeUnit: TypeCompilationUnit =>
           assert(!putInClass)
           val tree = PickledQuotes.quotedTypeToTree(typeUnit.tpe)
-          val source = new SourceFile("", "")
+          val source = SourceFile.virtual("<quoted.Type>", "")
           CompilationUnit.mkCompilationUnit(source, tree, forceTrees = true)
       }
     }

compiler/src/dotty/tools/dotc/util/SourceFile.scala

@@ -50,7 +50,6 @@ class SourceFile(val file: AbstractFile, computeContent: => Array[Char]) extends
   }
 
   def this(file: AbstractFile, codec: Codec) = this(file, new String(file.toByteArray, codec.charSet).toCharArray)
-  def this(name: String, content: String) = this(new VirtualFile(name, content.getBytes), scala.io.Codec.UTF8)
 
   /** Tab increment; can be overridden */
   def tabInc: Int = 8
@@ -195,6 +194,8 @@ object SourceFile {
 
   def fromId(id: Int): SourceFile = sourceOfChunk(id >> ChunkSizeLog)
 
+  def virtual(name: String, content: String) = new SourceFile(new VirtualFile(name, content.getBytes), scala.io.Codec.UTF8)
+
   private final val ChunkSizeLog = 10
   private final val ChunkSize = 1 << ChunkSizeLog
   @sharable private var chunks: Int = 0

compiler/src/dotty/tools/repl/JLineTerminal.scala

@@ -110,7 +110,7 @@ final class JLineTerminal extends java.io.Closeable {
 
       case class TokenData(token: Token, start: Int, end: Int)
       def currentToken: TokenData /* | Null */ = {
-        val source = new SourceFile("<completions>", input)
+        val source = SourceFile.virtual("<completions>", input)
         val scanner = new Scanner(source)(ctx.fresh.setReporter(Reporter.NoReporter))
         while (scanner.token != EOF) {
           val start = scanner.offset

compiler/src/dotty/tools/repl/ParseResult.scala

@@ -109,7 +109,7 @@ object ParseResult {
   @sharable private[this] val CommandExtract = """(:[\S]+)\s*(.*)""".r
 
   private def parseStats(sourceCode: String)(implicit ctx: Context): List[untpd.Tree] = {
-    val source = new SourceFile("<console>", sourceCode)
+    val source = SourceFile.virtual("<console>", sourceCode)
     val parser = new Parser(source)(ctx.withSource(source))
     val stats = parser.blockStatSeq()
     parser.accept(Tokens.EOF)

compiler/src/dotty/tools/repl/ReplCompiler.scala

@@ -141,7 +141,7 @@ class ReplCompiler extends Compiler {
   }
 
   private def createUnit(defs: Definitions, sourceCode: String): CompilationUnit = {
-    val unit = new CompilationUnit(new SourceFile(objectName(defs.state).toString, sourceCode))
+    val unit = new CompilationUnit(SourceFile.virtual(objectName(defs.state).toString, sourceCode))
     unit.untpdTree = wrapped(defs)
     unit
   }
@@ -267,7 +267,7 @@ class ReplCompiler extends Compiler {
     }
 
 
-    val src = new SourceFile("<typecheck>", expr)
+    val src = SourceFile.virtual("<typecheck>", expr)
     implicit val ctx: Context = state.context.fresh
       .setReporter(newStoreReporter)
       .setSetting(state.context.settings.YstopAfter, List("frontend"))

compiler/src/dotty/tools/repl/ReplDriver.scala

@@ -165,7 +165,7 @@ class ReplDriver(settings: Array[String],
     compiler
       .typeCheck(expr, errorsAllowed = true)
       .map { tree =>
-        val file = new SourceFile("<completions>", expr)
+        val file = SourceFile.virtual("<completions>", expr)
         val unit = new CompilationUnit(file)
         unit.tpdTree = tree
         implicit val ctx = state.context.fresh.setCompilationUnit(unit)

compiler/test/dotty/tools/dotc/ast/UntypedTreeMapTest.scala

@@ -14,7 +14,7 @@ class UntpdTreeMapTest extends DottyTest {
   import untpd._
 
   def parse(code: String): Tree = {
-    val (_, stats) = new Parser(new SourceFile("<meta>", code)).templateStatSeq()
+    val (_, stats) = new Parser(SourceFile.virtual("<meta>", code)).templateStatSeq()
     stats match { case List(stat) => stat; case stats => untpd.Thicket(stats) }
   }
 

compiler/test/dotty/tools/dotc/parsing/ModifiersParsingTest.scala

@@ -17,7 +17,7 @@ object ModifiersParsingTest {
   implicit val ctx: Context = (new ContextBase).initialCtx
 
   def parse(code: String): Tree = {
-    val (_, stats) = new Parser(new SourceFile("<meta>", code)).templateStatSeq()
+    val (_, stats) = new Parser(SourceFile.virtual("<meta>", code)).templateStatSeq()
     stats match { case List(stat) => stat; case stats => Thicket(stats) }
   }
 

doc-tool/test/dotty/tools/dottydoc/TypeRendering.scala

@@ -13,7 +13,7 @@ class TypeRenderingTestFromTasty extends TypeRenderingTest with CheckFromTasty
 class TypeRenderingTestFromSource extends TypeRenderingTest with CheckFromSource
 abstract class TypeRenderingTest extends DottyDocTest {
   @Test def renderImplicitFunctionType = {
-    val source = new SourceFile(
+    val source = SourceFile.virtual(
       "ImplicitFunctionType.scala",
       """
       |package scala