scalafmt

scalacenter · Mar 24, 2022 · ba79d88 · ba79d88
1 parent 7136719
commit ba79d88
Show file tree

Hide file tree

Showing 11 changed files with 46 additions and 34 deletions.
diff --git a/backend/src/main/scala/bloop/reporter/Reporter.scala b/backend/src/main/scala/bloop/reporter/Reporter.scala
@@ -98,8 +98,8 @@ abstract class Reporter(
     }
   }
 
-  protected val phasesAtFile: TrieMap[File,String] = TrieMap.empty[File, String]
-  protected val filesToPhaseStack: TrieMap[File,List[String]] = TrieMap.empty[File, List[String]]
+  protected val phasesAtFile: TrieMap[File, String] = TrieMap.empty[File, String]
+  protected val filesToPhaseStack: TrieMap[File, List[String]] = TrieMap.empty[File, List[String]]
 
   // Adapted from https://github.com/scala/scala/blob/2.12.x/src/compiler/scala/tools/nsc/reporters/AbstractReporter.scala#L68-L88
   private def deduplicate(problem: xsbti.Problem): Boolean = {

diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/BloopAnalysisCallback.scala
@@ -131,7 +131,11 @@ final class BloopAnalysisCallback(
     }
   }
 
-  def classDependency(onClassName: String, sourceClassName: String, context: DependencyContext): Unit = {
+  def classDependency(
+      onClassName: String,
+      sourceClassName: String,
+      context: DependencyContext
+  ): Unit = {
     if (onClassName != sourceClassName)
       add(intSrcDeps, sourceClassName, InternalDependency.of(sourceClassName, onClassName, context))
   }

diff --git a/backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala b/backend/src/main/scala/sbt/internal/inc/bloop/internal/ConcurrentAnalysisCallback.scala
@@ -139,7 +139,11 @@ final class ConcurrentAnalysisCallback(
     }
   }
 
-  def classDependency(onClassName: String, sourceClassName: String, context: DependencyContext): Unit = {
+  def classDependency(
+      onClassName: String,
+      sourceClassName: String,
+      context: DependencyContext
+  ): Unit = {
     if (onClassName != sourceClassName)
       add(intSrcDeps, sourceClassName, InternalDependency.of(sourceClassName, onClassName, context))
   }

diff --git a/bloopgun/src/main/scala/bloop/bloopgun/Defaults.scala b/bloopgun/src/main/scala/bloop/bloopgun/Defaults.scala
@@ -1,7 +1,5 @@
 package bloop.bloopgun
 
-
-
 object Defaults {
   val Version = "0.9.3"
   val Host = "127.0.0.1"

diff --git a/config/src/main/scala/bloop/config/Config.scala b/config/src/main/scala/bloop/config/Config.scala
@@ -44,7 +44,8 @@ object Config {
       )
     )
 
-    val DefaultFrameworks: List[TestFramework] = List(JUnit, ScalaTest, ScalaCheck, Specs2, utest, munit)
+    val DefaultFrameworks: List[TestFramework] =
+      List(JUnit, ScalaTest, ScalaCheck, Specs2, utest, munit)
   }
 
   case class TestArgument(args: List[String], framework: Option[TestFramework])

diff --git a/frontend/src/main/scala/bloop/testing/LoggingEventHandler.scala b/frontend/src/main/scala/bloop/testing/LoggingEventHandler.scala
@@ -30,7 +30,7 @@ class LoggingEventHandler(logger: Logger) extends BloopTestSuiteEventHandler {
   protected var suitesDuration = 0L
   protected var suitesPassed = 0
   protected var suitesAborted = 0
-  protected val testsFailedBySuite: mutable.SortedMap[SuiteName,Map[TestName,FailureMessage]] =
+  protected val testsFailedBySuite: mutable.SortedMap[SuiteName, Map[TestName, FailureMessage]] =
     mutable.SortedMap.empty[SuiteName, Map[TestName, FailureMessage]]
   protected var suitesTotal = 0
 

diff --git a/frontend/src/test/scala/bloop/ForkerSpec.scala b/frontend/src/test/scala/bloop/ForkerSpec.scala
@@ -47,8 +47,10 @@ class ForkerSpec {
          |}""".stripMargin
   }
 
-  val dependencies: Map[String,Set[String]] = Map.empty[String, Set[String]]
-  val runnableProject: Map[String,Map[String,String]] = Map(TestUtil.RootProject -> Map("A.scala" -> ArtificialSources.`A.scala`))
+  val dependencies: Map[String, Set[String]] = Map.empty[String, Set[String]]
+  val runnableProject: Map[String, Map[String, String]] = Map(
+    TestUtil.RootProject -> Map("A.scala" -> ArtificialSources.`A.scala`)
+  )
 
   private def run(
       cwd: AbsolutePath,

diff --git a/frontend/src/test/scala/bloop/RunSpec.scala b/frontend/src/test/scala/bloop/RunSpec.scala
@@ -43,28 +43,28 @@ class RunSpec extends BloopHelpers {
 
   private object ArtificialSources {
     val RunnableClass0: String = s"""package $packageName
-                            |object $mainClassName0 {
-                            |  def main(args: Array[String]): Unit = {
-                            |    println(s"$mainClassName0: $${args.mkString(", ")}")
-                            |  }
-                            |}""".stripMargin
+                                    |object $mainClassName0 {
+                                    |  def main(args: Array[String]): Unit = {
+                                    |    println(s"$mainClassName0: $${args.mkString(", ")}")
+                                    |  }
+                                    |}""".stripMargin
     val RunnableClass1: String = s"""package $packageName
-                            |object $mainClassName1 {
-                            |  def main(args: Array[String]): Unit = {
-                            |    println(s"$mainClassName1: $${args.mkString(", ")}")
-                            |  }
-                            |}""".stripMargin
+                                    |object $mainClassName1 {
+                                    |  def main(args: Array[String]): Unit = {
+                                    |    println(s"$mainClassName1: $${args.mkString(", ")}")
+                                    |  }
+                                    |}""".stripMargin
     val NotRunnable: String = s"""package $packageName
-                         |object NotRunnable {
-                         |  def foo(): Int = 42
-                         |}""".stripMargin
+                                 |object NotRunnable {
+                                 |  def foo(): Int = 42
+                                 |}""".stripMargin
     val InheritedRunnable: String = s"""package $packageName
-                               |class BaseRunnable {
-                               |  def main(args: Array[String]): Unit = {
-                               |    println(s"$mainClassName2: $${args.mkString(", ")}")
-                               |  }
-                               |}
-                               |object $mainClassName2 extends BaseRunnable""".stripMargin
+                                       |class BaseRunnable {
+                                       |  def main(args: Array[String]): Unit = {
+                                       |    println(s"$mainClassName2: $${args.mkString(", ")}")
+                                       |  }
+                                       |}
+                                       |object $mainClassName2 extends BaseRunnable""".stripMargin
   }
 
   @Test

diff --git a/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/ScalaNativeKeys.scala b/integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/ScalaNativeKeys.scala
@@ -9,10 +9,13 @@ object ScalaNativeKeys {
   import sbt.{settingKey, taskKey}
   val nativeClang: TaskKey[File] = taskKey[File]("Location of the clang compiler.")
   val nativeClangPP: TaskKey[File] = taskKey[File]("Location of the clang++ compiler.")
-  val nativeLinkStubs: SettingKey[Boolean] = settingKey[Boolean]("Whether to link `@stub` methods, or ignore them.")
+  val nativeLinkStubs: SettingKey[Boolean] =
+    settingKey[Boolean]("Whether to link `@stub` methods, or ignore them.")
   val nativeLink: TaskKey[File] = taskKey[File]("Generates native binary without running it.")
-  val nativeMode: SettingKey[String] = settingKey[String]("Compilation mode, either \"debug\" or \"release\".")
-  val nativeGC: SettingKey[String] = settingKey[String]("GC choice, either \"none\", \"boehm\" or \"immix\".")
+  val nativeMode: SettingKey[String] =
+    settingKey[String]("Compilation mode, either \"debug\" or \"release\".")
+  val nativeGC: SettingKey[String] =
+    settingKey[String]("GC choice, either \"none\", \"boehm\" or \"immix\".")
 
   val nativeCompileOptions: TaskKey[Seq[String]] =
     taskKey[Seq[String]]("Additional options are passed to clang during compilation.")

diff --git a/launcher-test/src/test/scala/bloop/launcher/LauncherBaseSuite.scala b/launcher-test/src/test/scala/bloop/launcher/LauncherBaseSuite.scala
@@ -35,7 +35,7 @@ abstract class LauncherBaseSuite(
 ) extends BaseSuite {
   val defaultConfig: ServerConfig = ServerConfig(port = Some(bloopServerPort))
 
-  val oldEnv: ju.Map[String,String] = System.getenv()
+  val oldEnv: ju.Map[String, String] = System.getenv()
   val oldCwd: AbsolutePath = AbsolutePath(System.getProperty("user.dir"))
   val oldHomeDir: AbsolutePath = AbsolutePath(System.getProperty("user.home"))
   val oldIvyHome: Option[String] = Option(System.getProperty("ivy.home"))

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1 +1 @@
-addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.34")