Merge pull request sbt#6711 from xuwei-k/fix-scala-2-13-warn

fix Scala 2.13 warnings

Author: eed3si9n

build.sbt

@@ -1104,7 +1104,7 @@ lazy val serverTestProj = (project in file("server-test"))
       val rawClasspath =
         (Compile / fullClasspathAsJars).value.map(_.data).mkString(java.io.File.pathSeparator)
       val cp =
-        if (scala.util.Properties.isWin) rawClasspath.replaceAllLiterally("\\", "\\\\")
+        if (scala.util.Properties.isWin) rawClasspath.replace("\\", "\\\\")
         else rawClasspath
       val content = {
         s"""|

internal/util-collection/src/main/scala/sbt/internal/util/HList.scala

@@ -30,7 +30,7 @@ final case class HCons[H, T <: HList](head: H, tail: T) extends HList {
   type Wrap[M[_]] = M[H] :+: T#Wrap[M]
   def :+:[G](g: G): G :+: H :+: T = HCons(g, this)
 
-  override def toString = head + " :+: " + tail.toString
+  override def toString = head.toString + " :+: " + tail.toString
 }
 
 object HList {

internal/util-collection/src/main/scala/sbt/internal/util/Settings.scala

@@ -43,7 +43,7 @@ private final class Settings0[ScopeType](
     (data get scope).flatMap(_ get key)
 
   def set[T](scope: ScopeType, key: AttributeKey[T], value: T): Settings[ScopeType] = {
-    val map = data getOrElse (scope, AttributeMap.empty)
+    val map = data.getOrElse(scope, AttributeMap.empty)
     val newData = data.updated(scope, map.put(key, value))
     new Settings0(newData, delegates)
   }
@@ -476,7 +476,7 @@ trait Init[ScopeType] {
         if (posDefined.size == settings.size) "defined at:"
         else
           "some of the defining occurrences:"
-      header + (posDefined.distinct mkString ("\n\t", "\n\t", "\n"))
+      header + (posDefined.distinct.mkString("\n\t", "\n\t", "\n"))
     } else ""
   }
 
@@ -711,10 +711,10 @@ trait Init[ScopeType] {
     def mapReferenced(g: MapScoped): Setting[T] = make(key, init mapReferenced g, pos)
 
     def validateReferenced(g: ValidateRef): Either[Seq[Undefined], Setting[T]] =
-      (init validateReferenced g).right.map(newI => make(key, newI, pos))
+      (init validateReferenced g).map(newI => make(key, newI, pos))
 
     private[sbt] def validateKeyReferenced(g: ValidateKeyRef): Either[Seq[Undefined], Setting[T]] =
-      (init validateKeyReferenced g).right.map(newI => make(key, newI, pos))
+      (init validateKeyReferenced g).map(newI => make(key, newI, pos))
 
     def mapKey(g: MapScoped): Setting[T] = make(g(key), init, pos)
     def mapInit(f: (ScopedKey[T], T) => T): Setting[T] = make(key, init(t => f(key, t)), pos)
@@ -879,9 +879,8 @@ trait Init[ScopeType] {
     def evaluate(ss: Settings[ScopeType]): T = f(in evaluate ss) evaluate ss
     def mapReferenced(g: MapScoped) = new Bind[S, T](s => f(s) mapReferenced g, in mapReferenced g)
 
-    def validateKeyReferenced(g: ValidateKeyRef) = (in validateKeyReferenced g).right.map {
-      validIn =>
-        new Bind[S, T](s => handleUndefined(f(s) validateKeyReferenced g), validIn)
+    def validateKeyReferenced(g: ValidateKeyRef) = (in validateKeyReferenced g).map { validIn =>
+      new Bind[S, T](s => handleUndefined(f(s) validateKeyReferenced g), validIn)
     }
 
     def mapConstant(g: MapConstant) = new Bind[S, T](s => f(s) mapConstant g, in mapConstant g)
@@ -898,7 +897,7 @@ trait Init[ScopeType] {
 
     def validateKeyReferenced(g: ValidateKeyRef) = a match {
       case None    => Right(this)
-      case Some(i) => Right(new Optional(i.validateKeyReferenced(g).right.toOption, f))
+      case Some(i) => Right(new Optional(i.validateKeyReferenced(g).toOption, f))
     }
 
     def mapConstant(g: MapConstant): Initialize[T] = new Optional(a map mapConstantT(g).fn, f)

internal/util-collection/src/main/scala/sbt/internal/util/Util.scala

@@ -43,7 +43,7 @@ object Util {
   def camelToHyphen(s: String): String =
     Camel.replaceAllIn(s, m => m.group(1) + "-" + m.group(2).toLowerCase(Locale.ENGLISH))
 
-  def quoteIfKeyword(s: String): String = if (ScalaKeywords.values(s)) '`' + s + '`' else s
+  def quoteIfKeyword(s: String): String = if (ScalaKeywords.values(s)) s"`${s}`" else s
 
   def ignoreResult[T](f: => T): Unit = macro Macro.ignore
 

internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala

@@ -909,7 +909,7 @@ private final class StringLiteral(str: String, start: Int) extends ValidParser[S
     if (str.charAt(start) == c) stringLiteral(str, start + 1) else new Invalid(resultEmpty)
 
   def completions(level: Int) = Completions.single(Completion.suggestion(str.substring(start)))
-  override def toString = '"' + str + '"'
+  override def toString = "\"" + str + "\""
 }
 
 private final class CharacterClass(f: Char => Boolean, label: String) extends ValidParser[Char] {

internal/util-complete/src/main/scala/sbt/internal/util/complete/Parsers.scala

@@ -238,12 +238,12 @@ trait Parsers {
     val notDelim = charClass(c => c != open && c != close).*.string
     def impl(): Parser[String] = {
       (open ~ (notDelim ~ close).?).flatMap {
-        case (l, Some((content, r))) => Parser.success(l + content + r)
+        case (l, Some((content, r))) => Parser.success(s"$l$content$r")
         case (l, None) =>
           ((notDelim ~ impl()).map {
             case (leftPrefix, nestedBraces) => leftPrefix + nestedBraces
           }.+ ~ notDelim ~ close).map {
-            case ((nested, suffix), r) => l + nested.mkString + suffix + r
+            case ((nested, suffix), r) => s"$l${nested.mkString}$suffix$r"
           }
       }
     }

internal/util-logging/src/main/scala/sbt/internal/util/GlobalLogging.scala

@@ -83,7 +83,7 @@ object GlobalLogging {
   ): GlobalLogging = {
     val loggerName = generateName
     val log = LoggerContext.globalContext.logger(loggerName, None, None)
-    val appender = ConsoleAppender(ConsoleAppender.generateName, console)
+    val appender = ConsoleAppender(ConsoleAppender.generateName(), console)
     LoggerContext.globalContext.addAppender(loggerName, appender -> Level.Info)
     GlobalLogging(log, console, appender, GlobalLogBacking(newBackingFile), newAppender)
   }

internal/util-logging/src/main/scala/sbt/internal/util/MainAppender.scala

@@ -67,14 +67,14 @@ object MainAppender {
     )
 
   def defaultScreen(console: ConsoleOut): Appender =
-    ConsoleAppender(ConsoleAppender.generateName, console)
+    ConsoleAppender(ConsoleAppender.generateName(), console)
 
   def defaultScreen(
       console: ConsoleOut,
       suppressedMessage: SuppressedTraceContext => Option[String]
   ): Appender = {
     ConsoleAppender(
-      ConsoleAppender.generateName,
+      ConsoleAppender.generateName(),
       console,
       suppressedMessage = suppressedMessage
     )
@@ -99,7 +99,7 @@ object MainAppender {
   def defaultBacked(loggerName: String, useFormat: Boolean): PrintWriter => Appender =
     to => {
       ConsoleAppender(
-        ConsoleAppender.generateName,
+        ConsoleAppender.generateName(),
         ConsoleOut.printWriterOut(to),
         useFormat = useFormat
       )

internal/util-logging/src/main/scala/sbt/internal/util/ProgressState.scala

@@ -99,8 +99,8 @@ private[sbt] final class ProgressState(
       addBytes(terminal, bytes)
       val toWrite = new ArrayBuffer[Byte]
       terminal.prompt match {
-        case a: Prompt.AskUser if a.render.nonEmpty && canClearPrompt => toWrite ++= cleanPrompt
-        case _                                                        =>
+        case a: Prompt.AskUser if a.render().nonEmpty && canClearPrompt => toWrite ++= cleanPrompt
+        case _                                                          =>
       }
       val endsWithNewLine = bytes.endsWith(lineSeparatorBytes)
       if (endsWithNewLine || bytes.containsSlice(lineSeparatorBytes)) {

internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala

@@ -905,7 +905,7 @@ object Terminal {
       new AtomicReference[((Int, Int), Deadline)](((1, 1), Deadline.now - 1.day))
     private[this] def setSize() = size.set((Try(getSizeImpl).getOrElse((1, 1)), Deadline.now))
     private[this] def getSize = size.get match {
-      case (s, d) if (d + sizeRefreshPeriod).isOverdue =>
+      case (s, d) if (d + sizeRefreshPeriod).isOverdue() =>
         setSize()
         size.get._1
       case (s, _) => s

internal/util-logging/src/main/scala/sbt/internal/util/WindowsInputStream.scala

@@ -56,7 +56,7 @@ private[util] class WindowsInputStream(term: org.jline.terminal.Terminal, in: In
   private val SHIFT_PRESSED = 0x0010;
   private def getCapability(cap: Capability): String = term.getStringCapability(cap) match {
     case null => null
-    case c    => c.replaceAllLiterally("\\E", "\u001B")
+    case c    => c.replace("\\E", "\u001B")
   }
   /*
    * This function is a hybrid of jline 2 WindowsTerminal.readConsoleInput

internal/util-logging/src/test/scala/Escapes.scala

@@ -96,7 +96,7 @@ object Escapes extends Properties("Escapes") {
       )
     }
     assert(isEscapeTerminator(terminator))
-    def makeString: String = ESC + content + terminator
+    def makeString: String = s"$ESC$content$terminator"
 
     override def toString =
       if (content.isEmpty) s"ESC (${terminator.toInt})"

internal/util-relation/src/main/scala/sbt/internal/util/Relation.scala

@@ -214,5 +214,5 @@ private final class MRelation[A, B](fwd: Map[A, Set[B]], rev: Map[B, Set[A]])
   override def hashCode = fwd.filterNot(_._2.isEmpty).hashCode()
 
   override def toString =
-    all.map { case (a, b) => a + " -> " + b }.mkString("Relation [", ", ", "]")
+    all.map { case (a, b) => s"$a -> $b" }.mkString("Relation [", ", ", "]")
 }

internal/util-scripted/src/main/scala/sbt/internal/scripted/FileCommands.scala

@@ -13,7 +13,6 @@ import java.io.File
 import sbt.io.{ IO, Path }
 import sbt.io.syntax._
 import Path._
-import sbt.io.IO
 
 class FileCommands(baseDirectory: File) extends BasicStatementHandler {
   lazy val commands = commandMap
@@ -25,19 +24,19 @@ class FileCommands(baseDirectory: File) extends BasicStatementHandler {
       "mkdir" nonEmpty makeDirectories _,
       "absent" nonEmpty absent _,
       //			"sync" twoArg("Two directory paths", sync _),
-      "newer" twoArg ("Two paths", newer _),
+      "newer".twoArg("Two paths", newer _),
       "pause" noArg {
         println("Pausing in " + baseDirectory)
         /*readLine("Press enter to continue. ") */
         print("Press enter to continue. ")
         System.console.readLine
         println()
       },
-      "sleep" oneArg ("Time in milliseconds", time => Thread.sleep(time.toLong)),
+      "sleep".oneArg("Time in milliseconds", time => Thread.sleep(time.toLong)),
       "exec" nonEmpty (execute _),
       "copy" copy (to => rebase(baseDirectory, to)),
-      "copy-file" twoArg ("Two paths", copyFile _),
-      "must-mirror" twoArg ("Two paths", diffFiles _),
+      "copy-file".twoArg("Two paths", copyFile _),
+      "must-mirror".twoArg("Two paths", diffFiles _),
       "copy-flat" copy flat
     )
 

internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala

@@ -103,7 +103,7 @@ final class ScriptedTests(
       log: ManagedLogger,
       context: LoggerContext,
   ): Seq[() => Option[String]] = {
-    for (groupDir <- (resourceBaseDirectory * group).get; nme <- (groupDir * name).get) yield {
+    for (groupDir <- (resourceBaseDirectory * group).get(); nme <- (groupDir * name).get()) yield {
       val g = groupDir.getName
       val n = nme.getName
       val str = s"$g / $n"

launcher-package/build.sbt

@@ -273,7 +273,7 @@ val root = (project in file(".")).
         case (k, BinSbt) =>
           import java.nio.file.{Files, FileSystems}
           val x = IO.read(k)
-          IO.write(t / "sbt", x.replaceAllLiterally(
+          IO.write(t / "sbt", x.replace(
             "declare init_sbt_version=_to_be_replaced",
             s"declare init_sbt_version=$sbtVersionToRelease"))
 

main-actions/src/main/scala/sbt/ForkTests.scala

@@ -162,7 +162,7 @@ private[sbt] object ForkTests {
         RunningProcesses.add(p)
         val ec = try p.exitValue()
         finally {
-          if (p.isAlive) p.destroy()
+          if (p.isAlive()) p.destroy()
           RunningProcesses.remove(p)
         }
         val result =
@@ -223,7 +223,7 @@ private final class React(
       listeners.foreach(_ testEvent event)
       val suiteResult = SuiteResult(tEvents)
       results += group -> suiteResult
-      listeners.foreach(_ endGroup (group, suiteResult.result))
+      listeners.foreach(_.endGroup(group, suiteResult.result))
       react()
   }
 }

main-actions/src/main/scala/sbt/Package.scala

@@ -88,7 +88,7 @@ object Package {
     for ((key, value) <- mergeManifest.getEntries.asScala) {
       entryMap.get(key) match {
         case Some(attributes) => mergeAttributes(attributes, value); ()
-        case None             => entryMap put (key, value); ()
+        case None             => entryMap.put(key, value); ()
       }
     }
   }

main-actions/src/main/scala/sbt/RawCompileLike.scala

@@ -65,7 +65,7 @@ object RawCompileLike {
               log.debug("Uptodate: " + outputDirectory.getAbsolutePath)
         }
       }
-      cachedComp(inputs)(exists(outputDirectory.allPaths.get.toSet))
+      cachedComp(inputs)(exists(outputDirectory.allPaths.get().toSet))
     }
 
   def prepare(description: String, doCompile: Gen): Gen =

main-actions/src/main/scala/sbt/compiler/Eval.scala

@@ -265,7 +265,7 @@ final class Eval(
       if (phase == null || phase == phase.next || evalReporter.hasErrors)
         ()
       else {
-        enteringPhase(phase) { phase.run }
+        enteringPhase(phase) { phase.run() }
         compile(phase.next)
       }
     }

main-actions/src/test/scala/sbt/CacheIvyTest.scala

@@ -85,7 +85,7 @@ class CacheIvyTest extends Properties("CacheIvy") {
     for {
       o <- Gen.identifier
       n <- Gen.identifier
-      r <- for { n <- Gen.numChar; ns <- Gen.numStr } yield n + ns
+      r <- for { n <- Gen.numChar; ns <- Gen.numStr } yield s"$n$ns"
       cs <- arbitrary[Option[String]]
       branch <- arbitrary[Option[String]]
       isChanging <- arbitrary[Boolean]

main-command/src/main/scala/sbt/BasicCommands.scala

@@ -153,7 +153,7 @@ object BasicCommands {
   private[this] def completionsParser: Parser[String] = {
     val notQuoted = (NotQuoted ~ any.*) map { case (nq, s) => nq + s }
     val quotedOrUnquotedSingleArgument = Space ~> (StringVerbatim | StringEscapable | notQuoted)
-    token(quotedOrUnquotedSingleArgument ?? "" examples ("", " "))
+    token((quotedOrUnquotedSingleArgument ?? "").examples("", " "))
   }
 
   def runCompletions(state: State)(input: String): State = {
@@ -199,7 +199,7 @@ object BasicCommands {
       val it = s.iterator
       var fail = false
       while (it.hasNext && !fail) {
-        it.next match {
+        it.next() match {
           case ""   => fail = it.hasNext; ()
           case next => result += next; ()
         }

main-command/src/main/scala/sbt/CommandUtil.scala

@@ -88,10 +88,10 @@ object CommandUtil {
   }
 
   def layoutDetails(details: Map[String, String]): String =
-    details.map { case (k, v) => k + "\n\n  " + v } mkString ("\n", "\n\n", "\n")
+    details.map { case (k, v) => k + "\n\n  " + v }.mkString("\n", "\n\n", "\n")
 
   final val HelpPatternFlags = Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE
 
   private[sbt] def isSbtBuild(baseDir: File) =
-    (baseDir / "project").exists() || (baseDir * "*.sbt").get.nonEmpty
+    (baseDir / "project").exists() || (baseDir * "*.sbt").get().nonEmpty
 }

main-command/src/main/scala/sbt/internal/LegacyWatched.scala

@@ -44,7 +44,7 @@ private[sbt] object LegacyWatched {
         (ClearOnFailure :: next :: FailureWall :: repeat :: s)
           .put(ContinuousEventMonitor, monitor: EventMonitor)
       case Some(eventMonitor) =>
-        Watched.printIfDefined(watched watchingMessage eventMonitor.state)
+        Watched.printIfDefined(watched watchingMessage eventMonitor.state())
         @tailrec def impl(): State = {
           val triggered = try eventMonitor.awaitEvent()
           catch {
@@ -56,7 +56,7 @@ private[sbt] object LegacyWatched {
               false
           }
           if (triggered) {
-            Watched.printIfDefined(watched triggeredMessage eventMonitor.state)
+            Watched.printIfDefined(watched triggeredMessage eventMonitor.state())
             ClearOnFailure :: next :: FailureWall :: repeat :: s
           } else if (shouldTerminate) {
             while (System.in.available() > 0) System.in.read()

main-command/src/main/scala/sbt/internal/client/NetworkClient.scala

@@ -380,7 +380,7 @@ class NetworkClient(
     }
     if (!startServer) {
       val deadline = 5.seconds.fromNow
-      while (socket.isEmpty && !deadline.isOverdue) {
+      while (socket.isEmpty && !deadline.isOverdue()) {
         socket = Try(ClientSocket.localSocket(bootSocketName, useJNI)).toOption
         if (socket.isEmpty) Thread.sleep(20)
       }
@@ -836,12 +836,12 @@ class NetworkClient(
         case -1 => (query, query, None, None) // shouldn't happen
         case i =>
           val rawPrefix = query.substring(0, i)
-          val prefix = rawPrefix.replaceAllLiterally("\"", "").replaceAllLiterally("\\;", ";")
-          val rawSuffix = query.substring(i).replaceAllLiterally("\\;", ";")
+          val prefix = rawPrefix.replace("\"", "").replace("\\;", ";")
+          val rawSuffix = query.substring(i).replace("\\;", ";")
           val suffix = if (rawSuffix.length > 1) rawSuffix.substring(1) else ""
           (rawPrefix, prefix, Some(rawSuffix), Some(suffix))
       }
-    } else (query, query.replaceAllLiterally("\\;", ";"), None, None)
+    } else (query, query.replace("\\;", ";"), None, None)
     val tailSpace = query.endsWith(" ") || query.endsWith("\"")
     val sanitizedQuery = suffix.foldLeft(prefix) { _ + _ }
     def getCompletions(query: String, sendCommand: Boolean): Seq[String] = {
@@ -885,7 +885,7 @@ class NetworkClient(
     }
     getCompletions(sanitizedQuery, true) collect {
       case c if inQuote                      => c
-      case c if tailSpace && c.contains(" ") => c.replaceAllLiterally(prefix, "")
+      case c if tailSpace && c.contains(" ") => c.replace(prefix, "")
       case c if !tailSpace                   => c.split(" ").last
     }
   }
@@ -1106,10 +1106,10 @@ object NetworkClient {
           launchJar = a
             .split("--sbt-launch-jar=")
             .lastOption
-            .map(_.replaceAllLiterally("%20", " "))
+            .map(_.replace("%20", " "))
         case "--sbt-launch-jar" if i + 1 < sanitized.length =>
           i += 1
-          launchJar = Option(sanitized(i).replaceAllLiterally("%20", " "))
+          launchJar = Option(sanitized(i).replace("%20", " "))
         case "-bsp" | "--bsp"        => bsp = true
         case a if !a.startsWith("-") => commandArgs += a
         case a @ SysProp(key, value) =>
@@ -1131,7 +1131,7 @@ object NetworkClient {
       sbtArguments.toSeq,
       commandArgs.toSeq,
       completionArguments.toSeq,
-      sbtScript.getOrElse(defaultSbtScript).replaceAllLiterally("%20", " "),
+      sbtScript.getOrElse(defaultSbtScript).replace("%20", " "),
       bsp,
       launchJar
     )