reorganized scala.tools.nsc.io!

1 files changed, 6 insertions, 9 deletions

diff --git a/src/compiler/scala/tools/nsc/util/SourceFile.scala b/src/compiler/scala/tools/nsc/util/SourceFile.scala
index bbad817896..e10f0e903c 100644
--- a/src/compiler/scala/tools/nsc/util/SourceFile.scala
+++ b/src/compiler/scala/tools/nsc/util/SourceFile.scala
@@ -11,7 +11,7 @@
 package scala.tools.nsc.util
 
 
-import scala.tools.nsc.io.{AbstractFile, CharArrayFile}
+import scala.tools.nsc.io.{AbstractFile,VirtualFile}
 
 /** Uses positions that are offsets rather than line/column pairs.
  *
@@ -26,23 +26,20 @@ object SourceFile {
 }
 
 
-class SourceFile(_file: AbstractFile, _content: Array[Char]) {
+class SourceFile(val file: AbstractFile, _content: Array[Char]) {
   import SourceFile._
 
-  def this(_file: AbstractFile) = {
-    this(_file, (new String(_file.read)).toCharArray)
-  }
+  //def this(_file: AbstractFile) = this(_file, _file.getChars)
+
+  def this(sourceName: String, content: Array[Char]) =
+    this(new VirtualFile(sourceName), content)
 
-  val file    = _file
   val content = normalize(_content)
 
   def getContent() = content
 
   def getFile() = file
 
-  def this(sourceName: String, content: Array[Char]) =
-    this(new CharArrayFile(sourceName, content), content)
-
   def isLineBreak(idx: Int) =
     if (!SourceFile.isLineBreak(content(idx))) false
     else if (content(idx) == CR && idx + 1 < content.length && content(idx + 1) == LF) false;