Merge pull request playframework#581 from scala-steward/update/scalaf…

…mt-core-2.7.5

Update scalafmt-core to 2.7.5

.scalafmt.conf

@@ -9,6 +9,4 @@ rewrite.rules = [ AvoidInfix, ExpandImportSelectors, RedundantParens, SortModifi
 rewrite.sortModifiers.order = [ "private", "protected", "final", "sealed", "abstract", "implicit", "override", "lazy" ]
 spaces.inImportCurlyBraces = true   # more idiomatic to include whitepsace in import x.{ yyy }
 trailingCommas = preserve
-# `edition` introduced in https://github.com/scalameta/scalafmt/pull/1431
-edition = 2019-10
-version = 2.5.3
+version = 2.7.5

docs/manual/working/scalaGuide/main/sql/slick/code/DI.scala

@@ -16,8 +16,8 @@ import slick.jdbc.JdbcProfile
 import UsersSchema._
 
 //#di-database-config
-class Application @Inject() (protected val dbConfigProvider: DatabaseConfigProvider, cc: ControllerComponents)(
-    implicit ec: ExecutionContext
+class Application @Inject() (protected val dbConfigProvider: DatabaseConfigProvider, cc: ControllerComponents)(implicit
+    ec: ExecutionContext
 ) extends AbstractController(cc)
     with HasDatabaseConfigProvider[JdbcProfile] {
   //#di-database-config

docs/manual/working/scalaGuide/main/sql/slick/code/Example.scala

@@ -15,8 +15,8 @@ import scala.concurrent.ExecutionContext
 import scala.concurrent.Future
 import scalaguide.slick.UsersSchema._
 
-class Application1 @Inject() (protected val dbConfigProvider: DatabaseConfigProvider, cc: ControllerComponents)(
-    implicit ec: ExecutionContext
+class Application1 @Inject() (protected val dbConfigProvider: DatabaseConfigProvider, cc: ControllerComponents)(implicit
+    ec: ExecutionContext
 ) extends AbstractController(cc)
     with HasDatabaseConfigProvider[JdbcProfile] {
 

project/Dependencies.scala

@@ -31,5 +31,5 @@ object Library {
   val playSpecs2         = "com.typesafe.play"  %% "play-specs2"          % Version.play
   val slick              = "com.typesafe.slick" %% "slick"                % Version.slick
   val slickHikariCP      = "com.typesafe.slick" %% "slick-hikaricp"       % Version.slick
-  val h2                 = "com.h2database"     % "h2"                    % Version.h2
+  val h2                 = "com.h2database"      % "h2"                   % Version.h2
 }

src/core/src/main/scala/play/api/db/slick/DatabaseConfigProvider.scala

@@ -193,8 +193,8 @@ trait HasDatabaseConfig[P <: BasicProfile] {
  */
 trait HasDatabaseConfigProvider[P <: BasicProfile] extends HasDatabaseConfig[P] {
 
-  /** The provider of a Slick `DatabaseConfig` instance.*/
+  /** The provider of a Slick `DatabaseConfig` instance. */
   protected val dbConfigProvider: DatabaseConfigProvider
-  protected final override lazy val dbConfig
-      : DatabaseConfig[P] = dbConfigProvider.get[P] // field is lazy to avoid early initializer problems.
+  protected final override lazy val dbConfig: DatabaseConfig[P] =
+    dbConfigProvider.get[P] // field is lazy to avoid early initializer problems.
 }

src/core/src/main/scala/play/api/db/slick/SlickApi.scala

@@ -77,8 +77,8 @@ object DefaultSlickApi {
     private val logger = Logger(classOf[DefaultSlickApi])
   }
   // This class is useful for delaying the creation of `DatabaseConfig` instances.
-  private class DatabaseConfigFactory(name: String, config: Config, lifecycle: ApplicationLifecycle)(
-      implicit executionContext: ExecutionContext
+  private class DatabaseConfigFactory(name: String, config: Config, lifecycle: ApplicationLifecycle)(implicit
+      executionContext: ExecutionContext
   ) {
     import DatabaseConfigFactory.logger
 

src/core/src/main/scala/play/api/db/slick/SlickModule.scala

@@ -22,10 +22,10 @@ import scala.concurrent.ExecutionContext
 
 object SlickModule {
 
-  /** path in the **reference.conf** to obtain the path under which databases are configured.*/
+  /** path in the **reference.conf** to obtain the path under which databases are configured. */
   final val DbKeyConfig = "play.slick.db.config"
 
-  /** path in the **reference.conf** to obtain the name of the default database.*/
+  /** path in the **reference.conf** to obtain the name of the default database. */
   final val DefaultDbName = "play.slick.db.default"
 }
 
@@ -36,7 +36,9 @@ final class SlickModule extends Module {
     val dbKey   = config.getString(SlickModule.DbKeyConfig)
     val default = config.getString(SlickModule.DefaultDbName)
     val dbs     = configuration.getOptional[Configuration](dbKey).getOrElse(Configuration.empty).subKeys
-    Seq(bind[SlickApi].to[DefaultSlickApi].in[Singleton]) ++ namedDatabaseConfigBindings(dbs) ++ defaultDatabaseConfigBinding(
+    Seq(bind[SlickApi].to[DefaultSlickApi].in[Singleton]) ++ namedDatabaseConfigBindings(
+      dbs
+    ) ++ defaultDatabaseConfigBinding(
       default,
       dbs
     )

src/core/src/test/scala/play/api/db/slick/SlickApiSpec.scala

@@ -48,7 +48,7 @@ class SlickApiSpec extends Specification {
   "SlickApi.dbConfigs" should {
     "return all DatabaseConfig instances for a valid configuration" in {
       import SUTWithGoodConfig._
-      api.dbConfigs[BasicProfile] must have size (4)
+      api.dbConfigs[BasicProfile] must have size 4
     }
     "throw if a database name doesn't exist in the config" in {
       import SUTWithBadConfig._

src/evolutions/src/main/scala/play/api/db/slick/evolutions/internal/DBApiAdapter.scala

@@ -21,8 +21,8 @@ import scala.util.control.ControlThrowable
 private[evolutions] class DBApiAdapter @Inject() (slickApi: SlickApi) extends DBApi {
   private lazy val databasesByName: Map[DbName, PlayDatabase] = slickApi
     .dbConfigs[JdbcProfile]()
-    .map {
-      case (name, dbConfig) => (name, new DBApiAdapter.DatabaseAdapter(name, dbConfig))
+    .map { case (name, dbConfig) =>
+      (name, new DBApiAdapter.DatabaseAdapter(name, dbConfig))
     }
     .toMap