Fix scalafmt

VirtusLab · Aug 3, 2022 · de44e09 · de44e09
1 parent 6311689
commit de44e09
Show file tree

Hide file tree

Showing 15 changed files with 57 additions and 43 deletions.
diff --git a/modules/build/src/main/scala/scala/build/ConsoleBloopBuildClient.scala b/modules/build/src/main/scala/scala/build/ConsoleBloopBuildClient.scala
@@ -163,7 +163,7 @@ object ConsoleBloopBuildClient {
   def printFileDiagnostic(
     logger: Logger,
     path: Either[String, os.Path],
-    diag: bsp4j.Diagnostic,
+    diag: bsp4j.Diagnostic
   ): Unit = {
     val isWarningOrErrorOrHint = diag.getSeverity == bsp4j.DiagnosticSeverity.ERROR ||
       diag.getSeverity == bsp4j.DiagnosticSeverity.WARNING ||

diff --git a/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala b/modules/build/src/test/scala/scala/build/tests/DirectiveTests.scala
@@ -16,7 +16,7 @@ class DirectiveTests extends munit.FunSuite {
   def bloopConfigOpt = Some(BloopServer.bloopConfig)
 
   val extraRepoTmpDir = os.temp.dir(prefix = "scala-cli-tests-extra-repo-")
-  val directories = Directories.under(extraRepoTmpDir)
+  val directories     = Directories.under(extraRepoTmpDir)
 
   override def afterAll(): Unit = {
     TestInputs.tryRemoveAll(extraRepoTmpDir)
@@ -38,21 +38,21 @@ class DirectiveTests extends munit.FunSuite {
     )
     testInputs.withBuild(baseOptions, buildThreads, bloopConfigOpt) {
       (_, _, maybeBuild) =>
-        val build       = maybeBuild.orThrow
-        val dep         = build.options.classPathOptions.extraDependencies.toSeq.headOption
+        val build = maybeBuild.orThrow
+        val dep   = build.options.classPathOptions.extraDependencies.toSeq.headOption
         assert(dep.nonEmpty)
 
         val position = dep.get.positions.headOption
         assert(position.nonEmpty)
 
         val (startPos, endPos) = position.get match {
           case Position.File(_, startPos, endPos) => (startPos, endPos)
-          case _ => sys.error("cannot happen")
+          case _                                  => sys.error("cannot happen")
         }
 
-        expect(startPos == (0,15))
-        expect(endPos == (0,40))
+        expect(startPos == (0, 15))
+        expect(endPos == (0, 40))
     }
   }
 
-}
+}
diff --git a/modules/cli/src/main/scala/scala/cli/commands/Bsp.scala b/modules/cli/src/main/scala/scala/cli/commands/Bsp.scala
@@ -72,8 +72,10 @@ object Bsp extends ScalaCommand[BspOptions] {
     CurrentParams.workspaceOpt = Some(inputs.workspace)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     BspThreads.withThreads { threads =>
       val bsp = scala.build.bsp.Bsp.create(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Compile.scala b/modules/cli/src/main/scala/scala/cli/commands/Compile.scala
@@ -82,8 +82,10 @@ object Compile extends ScalaCommand[CompileOptions] {
     val compilerMaker = options.shared.compilerMaker(threads)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     if (options.watch.watchMode) {
       val watcher = Build.watch(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Doc.scala b/modules/cli/src/main/scala/scala/cli/commands/Doc.scala
@@ -36,8 +36,10 @@ object Doc extends ScalaCommand[DocOptions] {
 
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     val builds =
       Build.build(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Metabrowse.scala b/modules/cli/src/main/scala/scala/cli/commands/Metabrowse.scala
@@ -59,8 +59,10 @@ object Metabrowse extends ScalaCommand[MetabrowseOptions] {
     val compilerMaker = options.shared.compilerMaker(threads)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     val builds =
       Build.build(

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Package.scala b/modules/cli/src/main/scala/scala/cli/commands/Package.scala
@@ -66,8 +66,10 @@ object Package extends ScalaCommand[PackageOptions] {
     val cross = options.compileCross.cross.getOrElse(false)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     if (options.watch.watchMode) {
       var expectedModifyEpochSecondOpt = Option.empty[Long]

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Repl.scala b/modules/cli/src/main/scala/scala/cli/commands/Repl.scala
@@ -103,8 +103,10 @@ object Repl extends ScalaCommand[ReplOptions] {
     val cross = options.compileCross.cross.getOrElse(false)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     if (inputs.isEmpty) {
       val artifacts = initialBuildOptions.artifacts(logger, Scope.Main).orExit(logger)

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Run.scala b/modules/cli/src/main/scala/scala/cli/commands/Run.scala
@@ -140,8 +140,10 @@ object Run extends ScalaCommand[RunOptions] {
 
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     if (options.watch.watchMode) {
       var processOpt = Option.empty[(Process, CompletableFuture[_])]

diff --git a/modules/cli/src/main/scala/scala/cli/commands/Test.scala b/modules/cli/src/main/scala/scala/cli/commands/Test.scala
@@ -68,8 +68,10 @@ object Test extends ScalaCommand[TestOptions] {
     val cross = options.compileCross.cross.getOrElse(false)
     val configDb = ConfigDb.open(options.shared.directories.directories)
       .orExit(logger)
-    val actionableDiagnostics = 
-      options.shared.logging.verbosityOptions.actions.orElse(configDb.get(Keys.actions).getOrElse(None))
+    val actionableDiagnostics =
+      options.shared.logging.verbosityOptions.actions.orElse(
+        configDb.get(Keys.actions).getOrElse(None)
+      )
 
     def maybeTest(builds: Builds, allowExit: Boolean): Unit = {
       val optionsKeys = builds.map.keys.toVector.map(_.optionsKey).distinct

diff --git a/modules/cli/src/main/scala/scala/cli/internal/CliLogger.scala b/modules/cli/src/main/scala/scala/cli/internal/CliLogger.scala
@@ -84,7 +84,7 @@ class CliLogger(
 
         for {
           filePath <- f.path
-          info  <- relatedInformation
+          info     <- relatedInformation
         } {
           val location = new Location(filePath.toNIO.toUri.toASCIIString, range)
           val related  = new b.DiagnosticRelatedInformation(location, info.message)

diff --git a/modules/core/src/main/scala/scala/build/errors/Diagnostic.scala b/modules/core/src/main/scala/scala/build/errors/Diagnostic.scala
@@ -3,7 +3,6 @@ package scala.build.errors
 import scala.build.Position
 import scala.build.errors.Diagnostic.RelatedInformation
 
-
 trait Diagnostic {
   def message: String
   def severity: Severity

diff --git a/modules/core/src/main/scala/scala/build/errors/Severity.scala b/modules/core/src/main/scala/scala/build/errors/Severity.scala
@@ -1,19 +1,19 @@
 package scala.build.errors
 
 import ch.epfl.scala.bsp4j as b
-import ch.epfl.scala.bsp4j.DiagnosticSeverity
+
 sealed abstract class Severity extends Product with Serializable {
   def toBsp4j: b.DiagnosticSeverity
 }
 
 object Severity {
   case object Error extends Severity {
-    override def toBsp4j: DiagnosticSeverity = b.DiagnosticSeverity.ERROR
+    override def toBsp4j: b.DiagnosticSeverity = b.DiagnosticSeverity.ERROR
   }
   case object Warning extends Severity {
-    override def toBsp4j: DiagnosticSeverity = b.DiagnosticSeverity.WARNING
+    override def toBsp4j: b.DiagnosticSeverity = b.DiagnosticSeverity.WARNING
   }
   case object Hint extends Severity {
-    override def toBsp4j: DiagnosticSeverity = b.DiagnosticSeverity.HINT
+    override def toBsp4j: b.DiagnosticSeverity = b.DiagnosticSeverity.HINT
   }
 }
diff --git a/modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala b/modules/integration/src/test/scala/scala/cli/integration/BspTestDefinitions.scala
@@ -1143,15 +1143,13 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
   test("bsp should report actionable diagnostic when enabled") {
     val fileName = "Hello.scala"
     val inputs = TestInputs(
-      Seq(
-        os.rel / fileName ->
-          s"""//> using lib "com.lihaoyi::os-lib:0.7.8"
-             |
-             |object Hello extends App {
-             |  println("Hello")
-             |}
-             |""".stripMargin
-      )
+      os.rel / fileName ->
+        s"""//> using lib "com.lihaoyi::os-lib:0.7.8"
+           |
+           |object Hello extends App {
+           |  println("Hello")
+           |}
+           |""".stripMargin
     )
     withBsp(inputs, Seq(".", "--actions")) {
       (root, localClient, remoteServer) =>
@@ -1169,7 +1167,7 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
           expect(visibleDiagnostics.length == 1)
 
           val updateActionableDiagnostic = visibleDiagnostics.head
-          
+
           checkDiagnostic(
             diagnostic = updateActionableDiagnostic,
             expectedMessage = "com.lihaoyi::os-lib:0.7.8 is outdated",
@@ -1184,7 +1182,9 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
 
           val relatedInformation = updateActionableDiagnostic.getRelatedInformation()
           expect(relatedInformation.getMessage.contains("com.lihaoyi::os-lib:"))
-          expect(relatedInformation.getLocation().getUri() == (root /fileName).toNIO.toUri.toASCIIString)
+          expect(
+            relatedInformation.getLocation().getUri() == (root / fileName).toNIO.toUri.toASCIIString
+          )
         }
     }
   }
@@ -1245,7 +1245,7 @@ abstract class BspTestDefinitions(val scalaVersionOpt: Option[String])
       expect(diagnostic.getMessage == expectedMessage)
     else
       expect(diagnostic.getMessage.contains(expectedMessage))
-    for(es <- expectedSource)
+    for (es <- expectedSource)
       expect(diagnostic.getSource == es)
   }
 

diff --git a/modules/options/src/main/scala/scala/build/actionable/ActionableDiagnostic.scala b/modules/options/src/main/scala/scala/build/actionable/ActionableDiagnostic.scala
@@ -6,7 +6,6 @@ import scala.build.Position
 import scala.build.errors.{Diagnostic, Severity}
 import scala.build.errors.Diagnostic.RelatedInformation
 
-
 abstract class ActionableDiagnostic extends Diagnostic {
 
   /** Provide the message of actionable diagnostic