Address review

Author: liufengyun

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

@@ -2,19 +2,21 @@ package dotty.tools
 package dotc
 package util
 
-import scala.collection.mutable.ArrayBuffer
 import dotty.tools.io._
-import java.util.regex.Pattern
-import java.io.IOException
-import scala.internal.Chars._
 import Spans._
-import scala.io.Codec
 import core.Contexts._
+
+import scala.io.Codec
+import scala.internal.Chars._
 import scala.annotation.internal.sharable
-import java.util.concurrent.atomic.AtomicInteger
 import scala.collection.mutable
+import scala.collection.mutable.ArrayBuffer
 
+import java.io.IOException
+import java.nio.charset.StandardCharsets
 import java.util.Optional
+import java.util.concurrent.atomic.AtomicInteger
+import java.util.regex.Pattern
 
 object ScriptSourceFile {
   @sharable private val headerPattern = Pattern.compile("""^(::)?!#.*(\r|\n|\r\n)""", Pattern.MULTILINE)
@@ -212,7 +214,7 @@ object SourceFile {
   def fromId(id: Int): SourceFile = sourceOfChunk(id >> ChunkSizeLog)
 
   def virtual(name: String, content: String, maybeIncomplete: Boolean = false) =
-    val src = new SourceFile(new VirtualFile(name, content.getBytes("UTF-8")), scala.io.Codec.UTF8)
+    val src = new SourceFile(new VirtualFile(name, content.getBytes(StandardCharsets.UTF_8)), scala.io.Codec.UTF8)
     src._maybeInComplete = maybeIncomplete
     src
 

compiler/test/dotty/tools/dotc/printing/PrintingTest.scala

@@ -10,6 +10,7 @@ import reporting.TestReporter
 import java.io._
 import java.nio.file.{Path => JPath}
 import java.lang.System.{lineSeparator => EOL}
+import java.nio.charset.StandardCharsets
 
 import interfaces.Diagnostic.INFO
 import dotty.tools.io.Directory
@@ -35,7 +36,7 @@ class PrintingTest {
         e.printStackTrace()
     }
 
-    val actualLines = byteStream.toString("UTF-8").linesIterator
+    val actualLines = byteStream.toString(StandardCharsets.UTF_8.name).linesIterator
     FileDiff.checkAndDump(path.toString, actualLines.toIndexedSeq, checkFilePath)
   }
 

compiler/test/dotty/tools/repl/ReplTest.scala

@@ -6,9 +6,10 @@ import vulpix.FileDiff
 
 import java.lang.System.{lineSeparator => EOL}
 import java.io.{ByteArrayOutputStream, File => JFile, PrintStream}
+import java.nio.charset.StandardCharsets
+
 import scala.io.Source
 import scala.util.Using
-
 import scala.collection.mutable.ArrayBuffer
 
 import dotty.tools.dotc.reporting.MessageRendering
@@ -26,11 +27,11 @@ class ReplTest(withStaging: Boolean = false, out: ByteArrayOutputStream = new By
     "-color:never",
     "-Yerased-terms",
   ),
-  new PrintStream(out, true, "UTF-8")
+  new PrintStream(out, true, StandardCharsets.UTF_8.name)
 ) with MessageRendering {
   /** Get the stored output from `out`, resetting the buffer */
   def storedOutput(): String = {
-    val output = stripColor(out.toString("UTF-8"))
+    val output = stripColor(out.toString(StandardCharsets.UTF_8.name))
     out.reset()
     output
   }
@@ -77,11 +78,11 @@ class ReplTest(withStaging: Boolean = false, out: ByteArrayOutputStream = new By
       }
 
     val expectedOutput =
-      Using(Source.fromFile(f, "UTF-8"))(_.getLines().flatMap(filterEmpties).toList).get
+      Using(Source.fromFile(f, StandardCharsets.UTF_8.name))(_.getLines().flatMap(filterEmpties).toList).get
     val actualOutput = {
       resetToInitial()
 
-      val lines = Using(Source.fromFile(f, "UTF-8"))(_.getLines.toList).get
+      val lines = Using(Source.fromFile(f, StandardCharsets.UTF_8.name))(_.getLines.toList).get
       assert(lines.head.startsWith(prompt),
         s"""Each file has to start with the prompt: "$prompt"""")
       val inputRes = lines.filter(_.startsWith(prompt))

compiler/test/dotty/tools/vulpix/FileDiff.scala

@@ -2,9 +2,12 @@ package dotty.tools.vulpix
 
 import scala.io.Source
 import scala.util.Using
+
 import java.io.File
 import java.lang.System.{lineSeparator => EOL}
 import java.nio.file.{Files, Paths}
+import java.nio.charset.StandardCharsets
+
 
 object FileDiff {
   def diffMessage(expectFile: String, actualFile: String): String =
@@ -18,7 +21,7 @@ object FileDiff {
   def check(sourceTitle: String, outputLines: Seq[String], checkFile: String): Option[String] = {
     val checkLines =
       if (!(new File(checkFile)).exists) Nil
-      else Using(Source.fromFile(checkFile, "UTF-8"))(_.getLines().toList).get
+      else Using(Source.fromFile(checkFile, StandardCharsets.UTF_8.name))(_.getLines().toList).get
 
     if (!matches(outputLines, checkLines)) Some(
       s"""|Output from '$sourceTitle' did not match check file. Actual output:

compiler/test/dotty/tools/vulpix/ParallelTesting.scala

@@ -2,10 +2,11 @@ package dotty
 package tools
 package vulpix
 
-import java.io.{File => JFile}
+import java.io.{File => JFile, IOException}
 import java.lang.System.{lineSeparator => EOL}
 import java.nio.file.StandardCopyOption.REPLACE_EXISTING
 import java.nio.file.{Files, NoSuchFileException, Path, Paths}
+import java.nio.charset.StandardCharsets
 import java.text.SimpleDateFormat
 import java.util.{HashMap, Timer, TimerTask}
 import java.util.concurrent.{TimeUnit, TimeoutException, Executors => JExecutors}
@@ -451,7 +452,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       def compileWithJavac(fs: Array[String]) = if (fs.nonEmpty) {
         val fullArgs = Array(
           "javac",
-          "-encoding", "UTF-8",
+          "-encoding", StandardCharsets.UTF_8.name,
         ) ++ flags.javacFlags ++ fs
 
         val process = Runtime.getRuntime.exec(fullArgs)
@@ -607,9 +608,11 @@ trait ParallelTesting extends RunnerOrchestration { self =>
         if checkFiles.contains(file) then
           val checkFile = checkFiles(file)
           val actual = {
-            val source = Source.fromFile(file, "UTF-8")
+            val source = Source.fromFile(file, StandardCharsets.UTF_8.name)
             val lines  = source.getLines().toList
-            source.close()
+            try source.close()
+            catch
+              case _: IOException => // ignore file close errors
             lines
           }
           diffTest(testSource, checkFile, actual, reporters, logger)
@@ -695,7 +698,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
       val errorMap = new HashMap[String, Integer]()
       var expectedErrors = 0
       files.filter(isSourceFile).foreach { file =>
-        Using(Source.fromFile(file, "UTF-8")) { source =>
+        Using(Source.fromFile(file, StandardCharsets.UTF_8.name)) { source =>
           source.getLines.zipWithIndex.foreach { case (line, lineNbr) =>
             val errors = line.toSeq.sliding("// error".length).count(_.unwrap == "// error")
             if (errors > 0)