chore(fmt): fix missed Scala 2 formatting updates (#986)

* chore(ci): Include cross scalafmt and scalafix checks

* chore(fmt): Fixed missed Scala 2 formatting updates

Author: Johnnei

.github/workflows/pr-checks.yml

@@ -58,7 +58,7 @@ jobs:
       - name: Run Scalafix check
         run: sbt fixCheck
       - name: Check formatting
-        run: sbt scalafmtCheckAll
+        run: sbt ++scalafmtCheckAll
       - name: Run Scapegoat
         run: |
           sbt 'set version := "99.0-SNAPSHOT"; publishLocal'

build.sbt

@@ -149,7 +149,7 @@ Test / publishArtifact := false
 ThisBuild / scalafixDependencies += "com.nequissimus" %% "sort-imports" % "0.6.1"
 addCommandAlias("fix", "all Compile / scalafix Test / scalafix; fixImports")
 addCommandAlias("fixImports", "Compile / scalafix SortImports; Test / scalafix SortImports")
-addCommandAlias("fixCheck", "Compile / scalafix --check; Test / scalafix --check; fixCheckImports")
+addCommandAlias("fixCheck", "scalafixAll --check; fixCheckImports")
 addCommandAlias(
   "fixCheckImports",
   "Compile / scalafix --check SortImports; Test / scalafix --check SortImports"

src/main/scala-2/com/sksamuel/scapegoat/FeedbackScala2.scala

@@ -1,7 +1,7 @@
 package com.sksamuel.scapegoat
 
-import scala.tools.nsc.reporters.Reporter
 import scala.reflect.internal.util.Position
+import scala.tools.nsc.reporters.Reporter
 
 class FeedbackScala2(
   reporter: Reporter,

src/main/scala-2/com/sksamuel/scapegoat/Inspections.scala

@@ -15,8 +15,8 @@ import com.sksamuel.scapegoat.inspections.nulls._
 import com.sksamuel.scapegoat.inspections.option._
 import com.sksamuel.scapegoat.inspections.string._
 import com.sksamuel.scapegoat.inspections.style._
-import com.sksamuel.scapegoat.inspections.unneccesary._
 import com.sksamuel.scapegoat.inspections.traits._
+import com.sksamuel.scapegoat.inspections.unneccesary._
 import com.sksamuel.scapegoat.inspections.unsafe._
 
 /**

src/main/scala-2/com/sksamuel/scapegoat/inspections/AnyUse.scala

@@ -28,7 +28,7 @@ class AnyUse
               case DefDef(mods, _, _, _, _, _) if mods.isSynthetic                =>
               case DefDef(mods, _, _, _, _, _) if mods.hasFlag(Flags.SetterFlags) =>
               case DefDef(mods, _, _, _, _, _) if mods.hasFlag(Flags.GetterFlags) =>
-              case ValDef(_, _, tpt, _) if tpt.tpe =:= typeOf[Any] =>
+              case ValDef(_, _, tpt, _) if tpt.tpe =:= typeOf[Any]                =>
                 context.warn(tree.pos, self, tree.toString.take(200))
               case DefDef(_, _, _, _, tpt, _) if tpt.tpe =:= typeOf[Any] =>
                 context.warn(tree.pos, self, tree.toString.take(200))

src/main/scala-2/com/sksamuel/scapegoat/inspections/MaxParameters.scala

@@ -30,8 +30,8 @@ class MaxParameters
 
           override def inspect(tree: Tree): Unit = {
             tree match {
-              case DefDef(_, name, _, _, _, _) if name == nme.CONSTRUCTOR =>
-              case DefDef(mods, _, _, _, _, _) if mods.isSynthetic        =>
+              case DefDef(_, name, _, _, _, _) if name == nme.CONSTRUCTOR        =>
+              case DefDef(mods, _, _, _, _, _) if mods.isSynthetic               =>
               case DefDef(_, _, _, vparamss, _, _) if countExceeds(vparamss, 10) =>
                 context.warn(tree.pos, self)
               case _ => continue(tree)

src/main/scala-2/com/sksamuel/scapegoat/inspections/TypeShadowing.scala

@@ -28,7 +28,7 @@ class TypeShadowing
             tparams.foreach(tparam => types.add(tparam.name.toString))
             trees.foreach {
               case dd: DefDef if dd.symbol != null && dd.symbol.isSynthetic =>
-              case dd @ DefDef(_, _, deftparams, _, _, _) =>
+              case dd @ DefDef(_, _, deftparams, _, _, _)                   =>
                 deftparams.foreach { tparam =>
                   if (types.contains(tparam.name.toString))
                     context.warn(dd.pos, self)

src/main/scala-2/com/sksamuel/scapegoat/inspections/VarClosure.scala

@@ -24,7 +24,7 @@ class VarClosure
 
           private def capturesVar(tree: Tree): Unit =
             tree match {
-              case Block(stmt, expr) => (stmt :+ expr).foreach(capturesVar)
+              case Block(stmt, expr)         => (stmt :+ expr).foreach(capturesVar)
               case Apply(Select(_, _), args) =>
                 args
                   .filter(_.symbol != null)

src/main/scala-2/com/sksamuel/scapegoat/inspections/VarUse.scala

@@ -28,7 +28,7 @@ class VarUse
               case ModuleDef(_, _, Template(parents, _, _)) if parents.exists(isActor)   =>
               case ValDef(mods, _, _, _) if mods.isSynthetic || mods.isMacro             =>
               case ValDef(_, _, tpt, _) if isXmlLiteral(tpt.tpe)                         =>
-              case ValDef(modifiers, _, _, _) if modifiers.hasFlag(Flag.MUTABLE) =>
+              case ValDef(modifiers, _, _, _) if modifiers.hasFlag(Flag.MUTABLE)         =>
                 context.warn(tree.pos, self, tree.toString.take(300))
               case _ => continue(tree)
             }

src/main/scala-2/com/sksamuel/scapegoat/inspections/collections/PredefIterableIsMutable.scala

@@ -26,7 +26,7 @@ class PredefIterableIsMutable
 
           override def inspect(tree: Tree): Unit = {
             tree match {
-              case DefDef(_, _, _, _, _, _) if tree.symbol.isAccessor =>
+              case DefDef(_, _, _, _, _, _) if tree.symbol.isAccessor           =>
               case TypeTree() if tree.tpe.erasure.toString() == "Iterable[Any]" =>
                 context.warn(tree.pos, self)
               case _ => continue(tree)