From 13563f9d49bf59c4aa1c2abbe4430f9978ce5141 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Wed, 1 Jan 2025 16:02:11 +0900 Subject: [PATCH] use string interpolation instead of `format` method --- .../main/scala/sbt/internal/util/complete/Parser.scala | 4 ++-- .../scala/sbt/internal/librarymanagement/MakePom.scala | 3 +-- main/src/main/scala/sbt/EvaluateTask.scala | 2 +- main/src/main/scala/sbt/Opts.scala | 9 ++------- .../main/scala/sbt/internal/SettingCompletions.scala | 4 ++-- main/src/main/scala/sbt/internal/SettingGraph.scala | 2 +- .../main/scala/sbt/internal/graph/rendering/DOT.scala | 2 +- .../scala/sbt/plugins/DependencyTreeSettings.scala | 10 +++++----- 8 files changed, 15 insertions(+), 21 deletions(-) diff --git a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala index 0c126584c..88d2543ef 100644 --- a/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala +++ b/internal/util-complete/src/main/scala/sbt/internal/util/complete/Parser.scala @@ -868,7 +868,7 @@ private final class And[T](a: Parser[T], b: Parser[?]) extends ValidParser[T] { def derive(c: Char) = a.derive(c) & b.derive(c) def completions(level: Int) = a.completions(level).filterS(s => apply(b)(s).resultEmpty.isValid) lazy val resultEmpty = a.resultEmpty && b.resultEmpty - override def toString = "(%s) && (%s)".format(a, b) + override def toString = s"(${a}) && (${b})" } private final class Not(delegate: Parser[?], failMessage: String) extends ValidParser[Unit] { @@ -881,7 +881,7 @@ private final class Not(delegate: Parser[?], failMessage: String) extends ValidP case _: Value[_] => mkFailure(failMessage) } - override def toString = " -(%s)".format(delegate) + override def toString = s" -(${delegate})" } /** diff --git a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala index 97354df58..b90582737 100644 --- a/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala +++ b/lm-ivy/src/main/scala/sbt/internal/librarymanagement/MakePom.scala @@ -364,8 +364,7 @@ class MakePom(val log: Logger) { val (g, a) = (m.getOrganisation, m.getName) if (g == null || g.isEmpty || a == null || a.isEmpty) Left( - "Skipped generating '' for %s. Dependency exclusion should have both 'org' and 'module' to comply with Maven POM's schema." - .format(m) + s"Skipped generating '' for ${m}. Dependency exclusion should have both 'org' and 'module' to comply with Maven POM's schema." ) else Right( diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala index 110cd7967..8cdf8ce3e 100644 --- a/main/src/main/scala/sbt/EvaluateTask.scala +++ b/main/src/main/scala/sbt/EvaluateTask.scala @@ -426,7 +426,7 @@ object EvaluateTask { Project.showContextKey(state, if (highlight) Some(RED) else None) def suppressedMessage(key: ScopedKey[?])(using display: Show[ScopedKey[?]]): String = - "Stack trace suppressed. Run 'last %s' for the full log.".format(display.show(key)) + s"Stack trace suppressed. Run 'last ${display.show(key)}' for the full log." def getStreams(key: ScopedKey[?], streams: Streams): TaskStreams = streams(ScopedKey(Project.fillTaskAxis(key).scope, Keys.streams.key)) diff --git a/main/src/main/scala/sbt/Opts.scala b/main/src/main/scala/sbt/Opts.scala index 9490d6508..3168f2438 100644 --- a/main/src/main/scala/sbt/Opts.scala +++ b/main/src/main/scala/sbt/Opts.scala @@ -75,7 +75,7 @@ object DefaultOptions { def javac: Seq[String] = compile.encoding("UTF-8") def scalac: Seq[String] = compile.encoding("UTF-8") def javadoc(name: String, version: String): Seq[String] = - Seq("-doctitle", "%s %s API".format(name, version)) + Seq("-doctitle", s"${name} ${version} API") def scaladoc(name: String, version: String): Seq[String] = doc.title(name) ++ doc.version(version) @@ -95,11 +95,6 @@ object DefaultOptions { def addCredentials: Setting[?] = Keys.credentials += { credentials(Keys.state.value) } def shellPrompt(version: String): State => String = - s => - "%s:%s:%s> ".format( - s.configuration.provider.id.name, - Project.extract(s).currentProject.id, - version - ) + s => s"${s.configuration.provider.id.name}:${Project.extract(s).currentProject.id}:${version}> " def setupShellPrompt: Setting[?] = Keys.shellPrompt := { shellPrompt(Keys.version.value) } } diff --git a/main/src/main/scala/sbt/internal/SettingCompletions.scala b/main/src/main/scala/sbt/internal/SettingCompletions.scala index f19264b17..1cdd7931a 100644 --- a/main/src/main/scala/sbt/internal/SettingCompletions.scala +++ b/main/src/main/scala/sbt/internal/SettingCompletions.scala @@ -125,7 +125,7 @@ private[sbt] object SettingCompletions { val (used, trimU) = lines(strings(affected)) val details = if (trimR || trimU) "\n\tRun `last` for details." else "" val valuesString = if (redefined.size == 1) "value" else "values" - "Defining %s\nThe new %s will be used by %s%s".format(redef, valuesString, used, details) + s"Defining ${redef}\nThe new ${valuesString} will be used by ${used}${details}" } } @@ -170,7 +170,7 @@ private[sbt] object SettingCompletions { } /** Parser for the `in` method name that slightly augments the naive completion to give a hint of the purpose of `in`. */ - val inParser = tokenDisplay(Space ~> InMethod, "%s ".format(InMethod)) + val inParser = tokenDisplay(Space ~> InMethod, s"${InMethod} ") /** * Parser for the initialization expression for the assignment method `assign` on the key `sk`. diff --git a/main/src/main/scala/sbt/internal/SettingGraph.scala b/main/src/main/scala/sbt/internal/SettingGraph.scala index 1d725a12c..95a803129 100644 --- a/main/src/main/scala/sbt/internal/SettingGraph.scala +++ b/main/src/main/scala/sbt/internal/SettingGraph.scala @@ -67,7 +67,7 @@ case class SettingGraph( def dependsAscii(defaultWidth: Int): String = Graph.toAscii( this, (x: SettingGraph) => x.depends.toSeq.sortBy(_.name), - (x: SettingGraph) => "%s = %s" format (x.definedIn getOrElse { "" }, x.dataString), + (x: SettingGraph) => s"${x.definedIn getOrElse { "" }} = ${x.dataString}", defaultWidth ) } diff --git a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala index e0b3759a7..3c31b61a6 100644 --- a/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala +++ b/main/src/main/scala/sbt/internal/graph/rendering/DOT.scala @@ -75,7 +75,7 @@ object DOT: if (graph.module(e._1).exists(_.isEvicted)) s""" [label="Evicted By" style="$EvictedStyle"]""" else "" - """ "%s" -> "%s"%s""".format(e._1.idString, e._2.idString, extra) + s""" "${e._1.idString}" -> "${e._2.idString}"${extra}""" } }.sorted.mkString("\n") diff --git a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala index 27686d307..89cb957bd 100644 --- a/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala +++ b/main/src/main/scala/sbt/plugins/DependencyTreeSettings.scala @@ -105,7 +105,7 @@ object DependencyTreeSettings { // dot support dependencyDotFile := { val config = configuration.value - target.value / "dependencies-%s.dot".format(config.toString) + target.value / s"dependencies-${config.toString}.dot" }, dependencyDot / asString := rendering.DOT.dotGraph( dependencyTreeModuleGraph0.value, @@ -123,12 +123,12 @@ object DependencyTreeSettings { | ]""".stripMargin, dependencyDotNodeColors := true, dependencyDotNodeLabel := { (organization: String, name: String, version: String) => - """%s
%s
%s""".format(organization, name, version) + s"""${organization}
${name}
${version}""" }, // GraphML support dependencyGraphMLFile := { val config = configuration.value - target.value / "dependencies-%s.graphml".format(config.toString) + target.value / s"dependencies-${config.toString}.graphml" }, dependencyGraphML := dependencyGraphMLTask.value, whatDependsOn := { @@ -188,7 +188,7 @@ object DependencyTreeSettings { val resultFile = dependencyGraphMLFile.value val graph = dependencyTreeModuleGraph0.value rendering.GraphML.saveAsGraphML(graph, resultFile.getAbsolutePath) - streams.value.log.info("Wrote dependency graph to '%s'" format resultFile) + streams.value.log.info(s"Wrote dependency graph to '${resultFile}'") resultFile } @@ -221,7 +221,7 @@ object DependencyTreeSettings { val outFile = fileTask.value IO.write(outFile, dataTask.value, IO.utf8) - streams.value.log.info("Wrote dependency graph to '%s'" format outFile) + streams.value.log.info(s"Wrote dependency graph to '${outFile}'") outFile }