Update scalafmt-cli_2.13, scalafmt-core to 3.8.5 (#3442)

* Update scalafmt-cli_2.13, scalafmt-core to 3.8.5

* Reformat with scalafmt 3.8.5

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs

* Update reference docs

---------

Co-authored-by: Piotr Chabelski <[email protected]>

Author: scala-steward

.git-blame-ignore-revs

@@ -6,3 +6,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.8.3
 52b913a12d8abdff1b340db668ebe38c59b423e4
+
+# Scala Steward: Reformat with scalafmt 3.8.5
+74f069ccdaa91872cb77dc1f902752221d588db1

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.8.3"
+version = "3.8.5"
 
 align.preset = more
 maxColumn = 100

modules/build/src/main/scala/scala/build/bsp/BspClient.scala

@@ -199,8 +199,7 @@ class BspClient(
       }
         .groupBy(_.positions.headOption match
           case Some(File(Right(path), _, _, _)) => Some(path)
-          case _                                => None
-        )
+          case _                                => None)
         .filter(_._1.isDefined)
         .values
         .toSeq

modules/cli/src/main/scala/scala/cli/commands/publish/checks/PasswordCheck.scala

@@ -44,16 +44,15 @@ final case class PasswordCheck(
     }
 
   def check(pubOpt: BPublishOptions): Boolean =
-    pubOpt.retained(options.publishParams.setupCi).repoPassword.nonEmpty || {
-      !options.publishParams.setupCi && (passwordOpt(pubOpt) match {
-        case Left(ex) =>
-          logger.debug("Ignoring error while trying to get password from config")
-          logger.debug(ex)
-          true
-        case Right(valueOpt) =>
-          valueOpt.isDefined
-      })
-    }
+    pubOpt.retained(options.publishParams.setupCi).repoPassword.nonEmpty ||
+    !options.publishParams.setupCi && (passwordOpt(pubOpt) match {
+      case Left(ex) =>
+        logger.debug("Ignoring error while trying to get password from config")
+        logger.debug(ex)
+        true
+      case Right(valueOpt) =>
+        valueOpt.isDefined
+    })
 
   def defaultValue(pubOpt: BPublishOptions): Either[BuildException, OptionCheck.DefaultValue] =
     either {

modules/cli/src/main/scala/scala/cli/commands/publish/checks/UserCheck.scala

@@ -45,16 +45,15 @@ final case class UserCheck(
     }
 
   def check(pubOpt: BPublishOptions): Boolean =
-    pubOpt.retained(options.publishParams.setupCi).repoUser.nonEmpty || {
-      !options.publishParams.setupCi && (userOpt(pubOpt) match {
-        case Left(ex) =>
-          logger.debug("Ignoring error while trying to get user from config")
-          logger.debug(ex)
-          true
-        case Right(valueOpt) =>
-          valueOpt.isDefined
-      })
-    }
+    pubOpt.retained(options.publishParams.setupCi).repoUser.nonEmpty ||
+    !options.publishParams.setupCi && (userOpt(pubOpt) match {
+      case Left(ex) =>
+        logger.debug("Ignoring error while trying to get user from config")
+        logger.debug(ex)
+        true
+      case Right(valueOpt) =>
+        valueOpt.isDefined
+    })
 
   def defaultValue(pubOpt: BPublishOptions): Either[BuildException, OptionCheck.DefaultValue] =
     either {

modules/cli/src/test/scala/cli/tests/HelpCheck.scala

@@ -15,7 +15,9 @@ class HelpCheck extends munit.FunSuite {
     assert(lines <= 80)
   }
 
-  test("version help message should only contain relevant options") { // regression test - https://github.com/VirtusLab/scala-cli/issues/1666
+  test(
+    "version help message should only contain relevant options"
+  ) { // regression test - https://github.com/VirtusLab/scala-cli/issues/1666
     val helpMessage = Version.finalHelp.help(Version.helpFormat)
 
     expect(helpMessage.contains("Version options:"))

modules/core/src/main/scala/scala/build/Position.scala

@@ -115,7 +115,8 @@ object Position {
         File(path, startPos, endPos)
     }
   }
-  final case class CommandLine(arg: String = "") extends Position { // todo the exact arg should be somehow taken from CaseApp
+  final case class CommandLine(arg: String =
+    "") extends Position { // todo the exact arg should be somehow taken from CaseApp
     def render(cwd: os.Path, sep: String): String = "COMMAND_LINE"
   }
 

modules/directives/src/main/scala/scala/build/preprocessing/directives/ScalaJs.scala

@@ -112,8 +112,7 @@ final case class ScalaJs(
       case Some(importmap) =>
         BuildOptions(
           scalaJsOptions = scalaJsOptions.copy(remapEsModuleImportMap = Some(importmap))
-        )
-    )
+        ))
 }
 
 class ImportMapNotFound(message: String, cause: Throwable)

modules/integration/src/test/scala/scala/cli/integration/PackageTestDefinitions.scala

@@ -869,7 +869,16 @@ abstract class PackageTestDefinitions extends ScalaCliSuite with TestScalaVersio
   test("source JAR") {
     val dest = os.rel / "sources.jar"
     simpleInputWithScalaAndSc.fromRoot { root =>
-      os.proc(TestUtil.cli, "--power", "package", extraOptions, ".", "-o", dest, "--with-sources").call(
+      os.proc(
+        TestUtil.cli,
+        "--power",
+        "package",
+        extraOptions,
+        ".",
+        "-o",
+        dest,
+        "--with-sources"
+      ).call(
         cwd = root,
         stdin = os.Inherit,
         stdout = os.Inherit

modules/integration/src/test/scala/scala/cli/integration/RunTestsDefault.scala

@@ -102,11 +102,12 @@ class RunTestsDefault extends RunTestDefinitions
       """//> using dep tabby:tabby:0.2.3,url=https://github.com/bjornregnell/tabby/releases/download/v0.2.3/tabby_3-0.2.3.jar
         |import tabby.Grid
         |@main def main = println(Grid("a", "b", "c")(1, 2, 3))
-        |""".stripMargin).fromRoot { root =>
-      val res = os.proc(TestUtil.cli, "run", extraOptions, inputPath)
-        .call(cwd = root)
-    val out = res.out.trim()
-    expect(out.contains("a, b, c"))
+        |""".stripMargin).fromRoot {
+      root =>
+        val res = os.proc(TestUtil.cli, "run", extraOptions, inputPath)
+          .call(cwd = root)
+      val out = res.out.trim()
+      expect(out.contains("a, b, c"))
     }
   }
 

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -262,7 +262,9 @@ class SipScalaTests extends ScalaCliSuite
     }
 
   if (TestUtil.isNativeCli)
-    test(s"usage instruction should point to scala when installing by cs") { // https://github.com/VirtusLab/scala-cli/issues/1662
+    test(
+      s"usage instruction should point to scala when installing by cs"
+    ) { // https://github.com/VirtusLab/scala-cli/issues/1662
       TestInputs.empty.fromRoot {
         root => // cs installs binaries under .app-name.aux and scala-cli should drop .aux from progName
           val binary       = "scala".prepareBinary(root)

project/deps.sc

@@ -210,7 +210,7 @@ object Deps {
   def scala3Compiler(sv: String) = ivy"org.scala-lang:scala3-compiler_3:$sv"
   def scalaAsync         = ivy"org.scala-lang.modules::scala-async:1.0.1".exclude("*" -> "*")
   def scalac(sv: String) = ivy"org.scala-lang:scala-compiler:$sv"
-  def scalafmtCli        = ivy"org.scalameta:scalafmt-cli_2.13:3.8.3"
+  def scalafmtCli        = ivy"org.scalameta:scalafmt-cli_2.13:3.8.5"
   // Force using of 2.13 - is there a better way?
   def scalaJsEnvJsdomNodejs =
     ivy"org.scala-js:scalajs-env-jsdom-nodejs_2.13:1.1.0"

website/docs/reference/cli-options.md

@@ -501,7 +501,7 @@ Pass a global dialect for scalafmt. This overrides whatever value is configured
 
 Aliases: `--fmt-version`
 
-Pass scalafmt version before running it (3.8.3 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
+Pass scalafmt version before running it (3.8.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
 
 ## Global suppress warning options
 

website/docs/reference/scala-command/cli-options.md

@@ -370,7 +370,7 @@ Aliases: `--fmt-version`
 
 `IMPLEMENTATION specific` per Scala Runner specification
 
-Pass scalafmt version before running it (3.8.3 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
+Pass scalafmt version before running it (3.8.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
 
 ## Global suppress warning options
 

website/docs/reference/scala-command/runner-specification.md

@@ -3924,7 +3924,7 @@ Aliases: `--dialect`
 
 **--scalafmt-version**
 
-Pass scalafmt version before running it (3.8.3 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
+Pass scalafmt version before running it (3.8.5 by default). If passed, this overrides whatever value is configured in the .scalafmt.conf file.
 
 Aliases: `--fmt-version`