Apply scalafmt project-wide

Author: pomadchin

.scalafmt.conf

@@ -1,28 +1,35 @@
-version = 3.8.6
+version = 3.11.1
 runner.dialect = scala213
 
-newlines.beforeMultilineDef = keep
-newlines.topLevelStatements = [before]
-newlines.beforeCurlyLambdaParams = multilineWithCaseOnly
-newlines.afterCurlyLambdaParams = squash
-newlines.implicitParamListModifierForce = [after]
-newlines.avoidForSimpleOverflow = [tooLong]
-newlines.avoidInResultType = true
-newlines.sometimesBeforeColonInMethodReturnType = false
-newlines.beforeTypeBounds = keep
+align.openParenCallSite = true
+align.openParenDefnSite = true
 
-verticalMultiline.atDefnSite = true
-verticalMultiline.arityThreshold = 10
+maxColumn = 150
+continuationIndent.defnSite = 2
 
-spaces.inImportCurlyBraces = true
+assumeStandardLibraryStripMargin = true
+danglingParentheses.preset = true
+
+rewrite.rules = [SortImports, RedundantParens, SortModifiers]
+
+newlines.source = keep
+
+spaces.inImportCurlyBraces = false
 
 includeCurlyBraceInSelectChains = false
 includeNoParensInSelectChains = false
 optIn.breakChainOnFirstMethodDot = false
 
-docstrings.style = Asterisk
+docstrings.style = keep
 docstrings.wrap = no
+docstrings.oneline = keep
+docstrings.blankFirstLine = keep
+
+literals.long = Upper
+literals.float = Upper
+literals.double = Upper
 
-literals.long=Upper
-literals.float=Upper
-literals.double=Upper
+docstrings = JavaDoc
+newlines.afterCurlyLambda = preserve
+docstrings.style = Asterisk
+docstrings.oneline = unfold

build.sbt

@@ -204,9 +204,9 @@ lazy val docs = project
   .dependsOn(dataset, cats, ml)
 
 def sparkDependencies(
-    sparkVersion: String,
-    scope: Configuration = Provided
-  ) = Seq(
+  sparkVersion: String,
+  scope: Configuration = Provided
+) = Seq(
   libraryDependencies ++= Seq(
     "org.apache.spark" %% "spark-core" % sparkVersion % scope,
     "org.apache.spark" %% "spark-sql" % sparkVersion % scope
@@ -357,11 +357,9 @@ lazy val framelessSettings = Seq(
   /**
    * The old Scala XML is pulled from Scala 2.12.x.
    *
-   * [error] (update) found version conflict(s) in library dependencies; some are suspected to be binary incompatible:
-   * [error]
-   * [error] 	* org.scala-lang.modules:scala-xml_2.12:2.3.0 (early-semver) is selected over 1.0.6
-   * [error] 	    +- org.scoverage:scalac-scoverage-reporter_2.12:2.0.7 (depends on 2.4.0)
-   * [error] 	    +- org.scala-lang:scala-compiler:2.12.16              (depends on 1.0.6)
+   * [error] (update) found version conflict(s) in library dependencies; some are suspected to be binary incompatible: [error] [error] *
+   * org.scala-lang.modules:scala-xml_2.12:2.3.0 (early-semver) is selected over 1.0.6 [error] +- org.scoverage:scalac-scoverage-reporter_2.12:2.0.7
+   * (depends on 2.4.0) [error] +- org.scala-lang:scala-compiler:2.12.16 (depends on 1.0.6)
    */
   libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
 ) ++ consoleSettings
@@ -378,10 +376,11 @@ lazy val spark40Settings = Seq[Setting[_]](
 lazy val spark34Settings = Seq[Setting[_]](
   tlVersionIntroduced := Map("2.12" -> "0.14.1", "2.13" -> "0.14.1"),
   mimaPreviousArtifacts := Set(
-    organization.value %% moduleName.value
-      .split("-")
-      .dropRight(1)
-      .mkString("-") % "0.14.1"
+    organization.value %%
+      moduleName.value
+        .split("-")
+        .dropRight(1)
+        .mkString("-") % "0.14.1"
   )
 )
 

cats/src/main/scala/frameless/cats/FramelessSyntax.scala

@@ -13,8 +13,8 @@ trait FramelessSyntax extends frameless.FramelessSyntax {
     def withLocalProperty(key: String, value: String): F[A] =
       for {
         session <- ask
-        _       <- delay(session.sparkContext.setLocalProperty(key, value))
-        a       <- fa
+        _ <- delay(session.sparkContext.setLocalProperty(key, value))
+        a <- fa
       } yield a
 
     def withGroupId(groupId: String): F[A] = withLocalProperty("spark.jobGroup.id", groupId)

cats/src/main/scala/frameless/cats/implicits.scala

@@ -66,9 +66,9 @@ object outer {
       def combine(lhs: RDD[(K, V)], rhs: RDD[(K, V)]): RDD[(K, V)] =
         lhs.fullOuterJoin(rhs).mapValues {
           case (Some(x), Some(y)) => x |+| y
-          case (None, Some(y)) => y
-          case (Some(x), None) => x
-          case (None, None) => m.empty
+          case (None, Some(y))    => y
+          case (Some(x), None)    => x
+          case (None, None)       => m.empty
         }
     }
 }

cats/src/test/scala/frameless/cats/test.scala

@@ -21,7 +21,7 @@ import org.scalatest.matchers.should.Matchers
 import org.scalatest.propspec.AnyPropSpec
 
 trait SparkTests {
-  val appID: String = new java.util.Date().toString + math.floor(math.random() * 10E4).toLong.toString
+  val appID: String = new java.util.Date().toString + math.floor(math.random() * 10e4).toLong.toString
 
   val conf: SparkConf = new SparkConf()
     .setMaster("local[*]")
@@ -68,7 +68,7 @@ class Test extends AnyPropSpec with Matchers with ScalaCheckPropertyChecks with
     PropertyCheckConfiguration(minSize = PosInt(10))
 
   property("spark is working") {
-    sc.parallelize(Seq(1, 2, 3)).collect() shouldBe Array(1,2,3)
+    sc.parallelize(Seq(1, 2, 3)).collect() shouldBe Array(1, 2, 3)
   }
 
   property("inner pairwise monoid") {
@@ -120,10 +120,10 @@ class Test extends AnyPropSpec with Matchers with ScalaCheckPropertyChecks with
 
   property("pair rdd numeric commutative semigroup example") {
     import frameless.cats.implicits._
-    val seq = Seq( ("a",2), ("b",3), ("d",6), ("b",2), ("d",1) )
+    val seq = Seq(("a", 2), ("b", 3), ("d", 6), ("b", 2), ("d", 1))
     val rdd = seq.toRdd
-    rdd.cminByKey.collect().toSeq should contain theSameElementsAs Seq( ("a",2), ("b",2), ("d",1) )
-    rdd.cmaxByKey.collect().toSeq should contain theSameElementsAs Seq( ("a",2), ("b",3), ("d",6) )
-    rdd.csumByKey.collect().toSeq should contain theSameElementsAs Seq( ("a",2), ("b",5), ("d",7) )
+    rdd.cminByKey.collect().toSeq should contain theSameElementsAs Seq(("a", 2), ("b", 2), ("d", 1))
+    rdd.cmaxByKey.collect().toSeq should contain theSameElementsAs Seq(("a", 2), ("b", 3), ("d", 6))
+    rdd.csumByKey.collect().toSeq should contain theSameElementsAs Seq(("a", 2), ("b", 5), ("d", 7))
   }
 }

core/src/main/scala/frameless/CatalystAverageable.scala

@@ -3,14 +3,13 @@ package frameless
 import scala.annotation.implicitNotFound
 
 /**
-  * When averaging Spark doesn't change these types:
-  * - BigDecimal -> BigDecimal
-  * - Double     -> Double
-  * But it changes these types :
-  * - Int        -> Double
-  * - Short      -> Double
-  * - Long       -> Double
-  */
+ * When averaging Spark doesn't change these types:
+ *   - BigDecimal -> BigDecimal
+ *   - Double -> Double But it changes these types :
+ *   - Int -> Double
+ *   - Short -> Double
+ *   - Long -> Double
+ */
 @implicitNotFound("Cannot compute average of type ${In}.")
 trait CatalystAverageable[In, Out]
 
@@ -19,8 +18,8 @@ object CatalystAverageable {
   private[this] def of[In, Out]: CatalystAverageable[In, Out] = theInstance.asInstanceOf[CatalystAverageable[In, Out]]
 
   implicit val framelessAverageableBigDecimal: CatalystAverageable[BigDecimal, BigDecimal] = of[BigDecimal, BigDecimal]
-  implicit val framelessAverageableDouble:     CatalystAverageable[Double, Double]         = of[Double, Double]
-  implicit val framelessAverageableLong:       CatalystAverageable[Long, Double]           = of[Long, Double]
-  implicit val framelessAverageableInt:        CatalystAverageable[Int, Double]            = of[Int, Double]
-  implicit val framelessAverageableShort:      CatalystAverageable[Short, Double]          = of[Short, Double]
+  implicit val framelessAverageableDouble: CatalystAverageable[Double, Double] = of[Double, Double]
+  implicit val framelessAverageableLong: CatalystAverageable[Long, Double] = of[Long, Double]
+  implicit val framelessAverageableInt: CatalystAverageable[Int, Double] = of[Int, Double]
+  implicit val framelessAverageableShort: CatalystAverageable[Short, Double] = of[Short, Double]
 }

core/src/main/scala/frameless/CatalystBitShift.scala

@@ -2,8 +2,9 @@ package frameless
 
 import scala.annotation.implicitNotFound
 
-/** Spark does not return always Int on shift
-  */
+/**
+ * Spark does not return always Int on shift
+ */
 
 @implicitNotFound("Cannot do bit shift operations on columns of type ${In}.")
 trait CatalystBitShift[In, Out]
@@ -12,9 +13,9 @@ object CatalystBitShift {
   private[this] val theInstance = new CatalystBitShift[Any, Any] {}
   private[this] def of[In, Out]: CatalystBitShift[In, Out] = theInstance.asInstanceOf[CatalystBitShift[In, Out]]
 
-  implicit val framelessBitShiftBigDecimal: CatalystBitShift[BigDecimal, Int]     = of[BigDecimal, Int]
-  implicit val framelessBitShiftDouble    : CatalystBitShift[Byte, Int]           = of[Byte, Int]
-  implicit val framelessBitShiftInt       : CatalystBitShift[Short, Int]          = of[Short, Int]
-  implicit val framelessBitShiftLong      : CatalystBitShift[Int, Int]            = of[Int, Int]
-  implicit val framelessBitShiftShort     : CatalystBitShift[Long, Long]          = of[Long, Long]
+  implicit val framelessBitShiftBigDecimal: CatalystBitShift[BigDecimal, Int] = of[BigDecimal, Int]
+  implicit val framelessBitShiftDouble: CatalystBitShift[Byte, Int] = of[Byte, Int]
+  implicit val framelessBitShiftInt: CatalystBitShift[Short, Int] = of[Short, Int]
+  implicit val framelessBitShiftLong: CatalystBitShift[Int, Int] = of[Int, Int]
+  implicit val framelessBitShiftShort: CatalystBitShift[Long, Long] = of[Long, Long]
 }

core/src/main/scala/frameless/CatalystBitwise.scala

@@ -3,8 +3,7 @@ package frameless
 import scala.annotation.implicitNotFound
 
 /**
- * Types that can be bitwise ORed, ANDed, or XORed by Catalyst.
- * Note that Catalyst requires that when performing bitwise operations between columns
+ * Types that can be bitwise ORed, ANDed, or XORed by Catalyst. Note that Catalyst requires that when performing bitwise operations between columns
  * the two types must be the same so in some cases casting is necessary.
  */
 @implicitNotFound("Cannot do bitwise operations on columns of type ${A}.")

core/src/main/scala/frameless/CatalystCast.scala

@@ -8,25 +8,25 @@ object CatalystCast {
 
   implicit def framelessCastToString[T]: CatalystCast[T, String] = of[T, String]
 
-  implicit def framelessNumericToLong   [A: CatalystNumeric]: CatalystCast[A, Long]       = of[A, Long]
-  implicit def framelessNumericToInt    [A: CatalystNumeric]: CatalystCast[A, Int]        = of[A, Int]
-  implicit def framelessNumericToShort  [A: CatalystNumeric]: CatalystCast[A, Short]      = of[A, Short]
-  implicit def framelessNumericToByte   [A: CatalystNumeric]: CatalystCast[A, Byte]       = of[A, Byte]
+  implicit def framelessNumericToLong[A: CatalystNumeric]: CatalystCast[A, Long] = of[A, Long]
+  implicit def framelessNumericToInt[A: CatalystNumeric]: CatalystCast[A, Int] = of[A, Int]
+  implicit def framelessNumericToShort[A: CatalystNumeric]: CatalystCast[A, Short] = of[A, Short]
+  implicit def framelessNumericToByte[A: CatalystNumeric]: CatalystCast[A, Byte] = of[A, Byte]
   implicit def framelessNumericToDecimal[A: CatalystNumeric]: CatalystCast[A, BigDecimal] = of[A, BigDecimal]
-  implicit def framelessNumericToDouble [A: CatalystNumeric]: CatalystCast[A, Double]     = of[A, Double]
+  implicit def framelessNumericToDouble[A: CatalystNumeric]: CatalystCast[A, Double] = of[A, Double]
 
   implicit def framelessBooleanToNumeric[A: CatalystNumeric]: CatalystCast[Boolean, A] = of[Boolean, A]
 
   // doesn't make any sense to include:
   // - sqlDateToBoolean: always None
   // - sqlTimestampToBoolean: compares us to 0
-  implicit val framelessStringToBoolean    : CatalystCast[String, Option[Boolean]] = of[String, Option[Boolean]]
-  implicit val framelessLongToBoolean      : CatalystCast[Long, Boolean]           = of[Long, Boolean]
-  implicit val framelessIntToBoolean       : CatalystCast[Int, Boolean]            = of[Int, Boolean]
-  implicit val framelessShortToBoolean     : CatalystCast[Short, Boolean]          = of[Short, Boolean]
-  implicit val framelessByteToBoolean      : CatalystCast[Byte, Boolean]           = of[Byte, Boolean]
-  implicit val framelessBigDecimalToBoolean: CatalystCast[BigDecimal, Boolean]     = of[BigDecimal, Boolean]
-  implicit val framelessDoubleToBoolean    : CatalystCast[Double, Boolean]         = of[Double, Boolean]
+  implicit val framelessStringToBoolean: CatalystCast[String, Option[Boolean]] = of[String, Option[Boolean]]
+  implicit val framelessLongToBoolean: CatalystCast[Long, Boolean] = of[Long, Boolean]
+  implicit val framelessIntToBoolean: CatalystCast[Int, Boolean] = of[Int, Boolean]
+  implicit val framelessShortToBoolean: CatalystCast[Short, Boolean] = of[Short, Boolean]
+  implicit val framelessByteToBoolean: CatalystCast[Byte, Boolean] = of[Byte, Boolean]
+  implicit val framelessBigDecimalToBoolean: CatalystCast[BigDecimal, Boolean] = of[BigDecimal, Boolean]
+  implicit val framelessDoubleToBoolean: CatalystCast[Double, Boolean] = of[Double, Boolean]
 
   // TODO
 
@@ -38,9 +38,8 @@ object CatalystCast {
   // implicit object stringToLong extends CatalystCast[String, Option[Long]]
   // implicit object stringToSqlDate extends CatalystCast[String, Option[SQLDate]]
 
-
   // needs verification:
-  //implicit object sqlTimestampToSqlDate extends CatalystCast[SQLTimestamp, SQLDate]
+  // implicit object sqlTimestampToSqlDate extends CatalystCast[SQLTimestamp, SQLDate]
 
   // needs verification:
   // implicit object sqlTimestampToDecimal extends CatalystCast[SQLTimestamp, BigDecimal]

core/src/main/scala/frameless/CatalystCollection.scala

@@ -9,8 +9,8 @@ object CatalystCollection {
   private[this] val theInstance = new CatalystCollection[Any] {}
   private[this] def of[A[_]]: CatalystCollection[A] = theInstance.asInstanceOf[CatalystCollection[A]]
 
-  implicit val arrayObject : CatalystCollection[Array]  = of[Array]
-  implicit val seqObject   : CatalystCollection[Seq]    = of[Seq]
-  implicit val listObject  : CatalystCollection[List]   = of[List]
+  implicit val arrayObject: CatalystCollection[Array] = of[Array]
+  implicit val seqObject: CatalystCollection[Seq] = of[Seq]
+  implicit val listObject: CatalystCollection[List] = of[List]
   implicit val vectorObject: CatalystCollection[Vector] = of[Vector]
 }