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

fix Scala 2.13 warnings

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
     )

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

@@ -79,7 +79,7 @@ abstract class ServerConnection(connection: Socket) {
       if (a.nonEmpty) {
         out.write(a)
       }
-      writeEndLine
+      writeEndLine()
     } catch {
       case e: IOException =>
         shutdown()
@@ -100,7 +100,7 @@ abstract class ServerConnection(connection: Socket) {
       out.close()
       connection.close()
     } catch { case e: IOException => e.printStackTrace() }
-    onShutdown
+    onShutdown()
   }
 
 }

main-command/src/main/scala/sbt/internal/util/JoinThread.scala

@@ -20,7 +20,7 @@ object JoinThread {
           t.interrupt()
           t.join(10)
         } catch { case e: InterruptedException => }
-        if (t.isAlive && !deadline.isOverdue) impl()
+        if (t.isAlive && !deadline.isOverdue()) impl()
       }
       impl()
       if (t.isAlive) {