Fix various deprecated usage

Author: kitbellew

scalafix-core/src/main/scala/scalafix/internal/util/FileOps.scala

@@ -18,21 +18,25 @@ object FileOps {
     if (file.isFile) {
       Vector(file.getAbsolutePath)
     } else {
-      def listFilesIter(s: File): Iterable[String] = {
-        val (dirs, files) = Option(s.listFiles()).toIterable
-          .flatMap(_.iterator)
-          .partition(_.isDirectory)
-        files.map(_.getPath) ++ dirs.flatMap(listFilesIter)
+      val res = Vector.newBuilder[String]
+      def listFilesIter(s: File): Unit = {
+        val allFiles = s.listFiles()
+        if (allFiles ne null) {
+          allFiles.foreach { f =>
+            if (f.isDirectory) listFilesIter(f)
+            else res += f.getPath
+          }
+        }
       }
-      for {
-        f0 <- Option(listFilesIter(file)).toVector
-        filename <- f0
-      } yield filename
+      listFilesIter(file)
+      res.result()
     }
   }
 
   def readURL(url: URL): String = {
-    scala.io.Source.fromURL(url)("UTF-8").getLines().mkString("\n")
+    val src = scala.io.Source.fromURL(url)("UTF-8")
+    try src.getLines().mkString("\n")
+    finally src.close()
   }
 
   /**

scalafix-reflect/src/main/scala-2/scalafix/internal/reflect/CurrentClasspathCompiler.scala

@@ -37,7 +37,7 @@ object CurrentClasspathCompiler {
       .mkString(File.pathSeparator)
 
     val settings = CompilerSetup.newSettings(classpath, output)
-    val reporter = new StoreReporter
+    val reporter = new StoreReporter(settings)
     val global = new Global(settings, reporter)
 
     reporter.reset()
@@ -52,7 +52,7 @@ object CurrentClasspathCompiler {
     )
 
     val errors = reporter.infos.collect {
-      case r: reporter.Info if r.severity == reporter.ERROR =>
+      case r: StoreReporter.Info if r.severity == reporter.ERROR =>
         ConfError
           .message(r.msg)
           .atPos(

scalafix-reflect/src/main/scala-2/scalafix/internal/reflect/IsolatedScala213Compiler.scala

@@ -85,15 +85,15 @@ object IsolatedScala213Compiler {
   private def classpathWithStdLibOverride(
       toolClasspath: URLClassLoader
   ): Seq[File] = {
-    def isScalaLibrary(f: File): Boolean =
-      f.getName.startsWith("scala-library")
+    val res = Seq.newBuilder[File]
+    def append(file: File): Unit =
+      if (!file.getName.startsWith("scala-library")) res += file
 
-    val classpathWithoutStdLib = (
-      toolClasspath.getURLs.map(url => new File(url.toURI)) ++
-        RuleCompilerClasspath.defaultClasspathPaths.map(_.toFile)
-    ).filterNot(isScalaLibrary)
+    toolClasspath.getURLs.foreach(url => append(new File(url.toURI)))
+    RuleCompilerClasspath.defaultClasspathPaths.foreach(p => append(p.toFile))
 
-    classpathWithoutStdLib ++ fetchScala213LibraryJars()
+    res ++= fetchScala213LibraryJars()
+    res.result()
   }
 
   private def fetchScala213LibraryJars(): Seq[File] = {

scalafix-reflect/src/main/scala-2/scalafix/internal/reflect/bridge/Scala2CompilerBridge.scala

@@ -31,7 +31,7 @@ class Scala2CompilerBridge {
     val output = new PlainDirectory(new Directory(outputFile))
 
     val settings = CompilerSetup.newSettings(classpath, output)
-    val reporter = new StoreReporter()
+    val reporter = new StoreReporter(settings)
     val global = new Global(settings, reporter)
 
     try {

scalafix-rules/src/main/scala-2/scalafix/internal/pc/Identifier.scala

@@ -109,10 +109,9 @@ object Identifier {
 
   def backtickWrap(s: String): String = {
     if (s.isEmpty) "``"
-    else if (s(0) == '`' && s.last == '`') s
-    else if (needsBacktick(s)) '`' + s + '`'
-    else s
+    else if (s.head == '`' && s.last == '`' || !needsBacktick(s)) s
+    else backtickWrapWithoutCheck(s)
   }
 
-  def backtickWrapWithoutCheck(typeName: String): String = '`' + typeName + '`'
+  def backtickWrapWithoutCheck(typeName: String): String = s"`$typeName`"
 }

scalafix-rules/src/main/scala-2/scalafix/internal/pc/ScalafixGlobal.scala

@@ -39,9 +39,8 @@ object ScalafixGlobal {
       settings.processArguments(options, processAll = true)
     (isSuccess, unprocessed) match {
       case (true, Nil) =>
-        Try(
-          new ScalafixGlobal(settings, new StoreReporter(), symbolReplacements)
-        )
+        val reporter = new StoreReporter(settings)
+        Try(new ScalafixGlobal(settings, reporter, symbolReplacements))
       case (isSuccess, unprocessed) =>
         Failure(
           new Exception(

scalafix-rules/src/main/scala/scalafix/internal/rule/ExplicitResultTypesConfig.scala

@@ -1,5 +1,6 @@
 package scalafix.internal.rule
 
+import scala.annotation.tailrec
 import scala.{meta => m}
 
 import metaconfig.Conf.Bool
@@ -61,6 +62,7 @@ case class SimpleDefinitions(kinds: Set[String]) {
 
   import scala.meta.classifiers.XtensionClassifiable
 
+  @tailrec
   private def isSimpleRef(tree: m.Tree): Boolean = tree match {
     case _: m.Name => true
     case t: m.Term.Select => isSimpleRef(t.qual)

scalafix-testkit/src/main/scala/scalafix/testkit/DiffAssertions.scala

@@ -11,10 +11,7 @@ import org.scalatest.exceptions.TestFailedException
 object DiffAssertions {
   def compareContents(original: String, revised: String): String = {
     def splitLines(s: String) =
-      s.trim
-        .replaceAllLiterally("\r\n", "\n")
-        .replace(" +$", "")
-        .split("\n")
+      s.trim.linesIterator.map(_.stripLineEnd).toSeq
     compareContents(splitLines(original), splitLines(revised))
   }
 

scalafix-tests/integration/src/test/scala/scalafix/tests/core/BaseSemanticSuite.scala

@@ -22,10 +22,7 @@ object BaseSemanticSuite {
       Classpaths.withDirectory(AbsolutePath(BuildInfo.classDirectory))
     ClasspathOps.newSymbolTable(classpath)
   }
-  def loadDoc(
-      filename: String,
-      scalaVersion: Option[String] = None
-  ): SemanticDocument = {
+  def loadDoc(filename: String): SemanticDocument = {
     val (abspath, scalaVersion) = {
       val root = AbsolutePath(BuildInfo.sourceroot)
       val commonPath = root.resolve("scala/test").resolve(filename)

scalafix-tests/integration/src/test/scala/scalafix/tests/interfaces/ScalafixArgumentsSuite.scala

@@ -240,7 +240,7 @@ class ScalafixArgumentsSuite extends AnyFunSuite with DiffAssertions {
     val stdout = fansi
       .Str(out.toString(StandardCharsets.US_ASCII.name()))
       .plainText
-      .replaceAllLiterally(cwd.toString, "")
+      .replace(cwd.toString, "")
       .replace('\\', '/') // for windows
       .linesIterator
       .filterNot(_.trim.isEmpty)
@@ -254,7 +254,7 @@ class ScalafixArgumentsSuite extends AnyFunSuite with DiffAssertions {
           .formatMessage(d.severity().toString, d.message())
       }
       .mkString("\n\n")
-      .replaceAllLiterally(cwd.toString, "")
+      .replace(cwd.toString, "")
       .replace('\\', '/') // for windows
     assertNoDiff(
       linterDiagnostics,
@@ -307,7 +307,7 @@ class ScalafixArgumentsSuite extends AnyFunSuite with DiffAssertions {
           .formatMessage(d.severity().toString, d.message())
       }
       .mkString("\n\n")
-      .replaceAllLiterally(cwd.toString, "")
+      .replace(cwd.toString, "")
       .replace('\\', '/') // for windows
     assertNoDiff(
       linterErrorFormatted,