.scalafmt.conf

@@ -1,4 +1,4 @@
-version = "3.5.3"
+version = "3.5.9"
 project.git=true
 align.preset=none
 assumeStandardLibraryStripMargin = true

CONTRIBUTING.md

@@ -20,4 +20,4 @@ main branch.  You can read more about it at http://scalafmt.org
 
 ## TL;DR
 
-If you are unsure about anything, don't hesitate to ask in the [gitter channel](https://gitter.im/scalacenter/scalafix).
+If you are unsure about anything, don't hesitate to ask in the [Discord channel](https://discord.gg/8AHaqGx3Qj).

build.sbt

@@ -41,11 +41,11 @@ commands += Command.command("ci-windows") { s =>
 resolvers += Resolver.sonatypeRepo("public")
 libraryDependencies ++= Dependencies.all
 libraryDependencies ++= List(
-  "com.lihaoyi" %% "fansi" % "0.3.1" % Test,
-  "org.scalatest" %% "scalatest" % "3.2.12" % Test
+  "com.lihaoyi" %% "fansi" % "0.4.0" % Test,
+  "org.scalatest" %% "scalatest" % "3.2.13" % Test
 )
 
-scalaVersion := "2.12.15"
+scalaVersion := "2.12.16"
 
 // keep this as low as possible to avoid running into binary incompatibility such as https://github.com/sbt/sbt/issues/5049
 pluginCrossBuild / sbtVersion := "1.3.1"

project/Dependencies.scala

@@ -2,11 +2,11 @@ import sbt._
 
 object Dependencies {
   val x = List(1) // scalafix:ok
-  def scalafixVersion: String = "0.10.1"
+  def scalafixVersion: String = "0.10.2"
 
   val all = List(
-    "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.0.202109080827-r",
+    "org.eclipse.jgit" % "org.eclipse.jgit" % "5.13.1.202206130422-r",
     "ch.epfl.scala" % "scalafix-interfaces" % scalafixVersion,
-    "io.get-coursier" % "interface" % "1.0.7"
+    "io.get-coursier" % "interface" % "1.0.8"
   )
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.6.2
+sbt.version=1.7.1

src/main/scala/scalafix/internal/sbt/ScalafixInterface.scala

@@ -8,7 +8,6 @@ import scalafix.interfaces.{Scalafix => ScalafixAPI, _}
 import scalafix.sbt.InvalidArgument
 
 import scala.collection.JavaConverters._
-import scala.util.control.NonFatal
 import java.io.PrintStream
 
 sealed trait Arg extends (ScalafixArguments => ScalafixArguments)
@@ -88,7 +87,9 @@ class ScalafixInterface private (
   def withArgs(args: Arg*): ScalafixInterface = {
     val newScalafixArguments = args.foldLeft(scalafixArguments) { (acc, arg) =>
       try arg(acc)
-      catch { case NonFatal(e) => throw new InvalidArgument(e.getMessage) }
+      catch {
+        case e: ScalafixException => throw new InvalidArgument(e.getMessage)
+      }
     }
     new ScalafixInterface(newScalafixArguments, this.args ++ args)
   }
@@ -101,7 +102,9 @@ class ScalafixInterface private (
 
   def rulesThatWillRun(): Seq[ScalafixRule] =
     try scalafixArguments.rulesThatWillRun().asScala
-    catch { case NonFatal(e) => throw new InvalidArgument(e.getMessage) }
+    catch {
+      case e: ScalafixException => throw new InvalidArgument(e.getMessage)
+    }
 
   def validate(): Option[ScalafixException] =
     Option(scalafixArguments.validate().orElse(null))

src/sbt-test/sbt-scalafix/basic/build.sbt

@@ -5,7 +5,7 @@ inThisBuild(
       "org.scalameta" %% "testkit" % "4.3.10" % Test,
       "org.scalameta" %% "munit" % "0.7.9" % Test,
       "org.scalacheck" %% "scalacheck" % "1.13.5" % Test,
-      "org.scalatest" %% "scalatest" % "3.2.12" % Test
+      "org.scalatest" %% "scalatest" % "3.2.13" % Test
     ),
     scalafixDependencies := List(
       // Custom rule published to Maven Central https://github.com/scalacenter/example-scalafix-rule

src/sbt-test/sbt-scalafix/custom-config/.test.scalafix.conf

@@ -0,0 +1,5 @@
+rules = [
+  DisableSyntax
+]
+
+DisableSyntax.noSemicolons = true

src/sbt-test/sbt-scalafix/custom-config/build.sbt

@@ -3,4 +3,6 @@ val V = _root_.scalafix.sbt.BuildInfo
 scalaVersion := V.scala212
 addCompilerPlugin(scalafixSemanticdb)
 scalacOptions ++= Seq("-Yrangepos", "-Ywarn-unused")
-scalafixConfig := Some(file(".scalafixxx.conf"))
+
+Compile / scalafixConfig := Some(file(".compile.scalafix.conf"))
+Test / scalafixConfig := Some(file(".test.scalafix.conf"))

src/sbt-test/sbt-scalafix/custom-config/src/test/scala/example/Example.scala

@@ -0,0 +1,8 @@
+package example
+
+import java.util.Map
+import scala.concurrent.Future
+
+object Example {
+  implicit val str = null.asInstanceOf[Map.Entry[Int, String]]
+}

src/sbt-test/sbt-scalafix/custom-config/test

@@ -1 +1,4 @@
-> scalafix
+-> Compile / scalafix --check
+> Test / scalafix --check
+> Compile / scalafix
+> Compile / scalafix --check

src/sbt-test/sbt-scalafix/inconfig/build.sbt

@@ -5,7 +5,7 @@ inThisBuild(
       "org.scalameta" %% "testkit" % "4.3.10" % Test,
       "org.scalameta" %% "munit" % "0.7.9" % Test,
       "org.scalacheck" %% "scalacheck" % "1.13.5" % Test,
-      "org.scalatest" %% "scalatest" % "3.2.12" % Test
+      "org.scalatest" %% "scalatest" % "3.2.13" % Test
     ),
     scalafixDependencies := List(
       // Custom rule published to Maven Central https://github.com/scalacenter/example-scalafix-rule