Scala 2.13.6 & -Xsource:3 support

project/Dependencies.scala

@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
   val x = List(1) // scalafix:ok
-  def scalafixVersion: String = "0.9.27+78-f41dec8f-SNAPSHOT"
+  def scalafixVersion: String = "0.9.27+84-22626c72-SNAPSHOT"
 
   val all = List(
     "org.eclipse.jgit" % "org.eclipse.jgit" % "5.11.1.202105131744-r",

src/main/scala/scalafix/sbt/ScalafixPlugin.scala

@@ -380,6 +380,7 @@ object ScalafixPlugin extends AutoPlugin {
             Arg.Config(scalafixConf),
             Arg.Rules(shell.rules),
             Arg.ScalaVersion(scalaVersion.value),
+            Arg.ScalacOptions(scalacOptions.in(config, compile).value),
             Arg.ParsedArgs(shell.extra)
           )
         val rulesThatWillRun = mainInterface.rulesThatWillRun()
@@ -427,17 +428,16 @@ object ScalafixPlugin extends AutoPlugin {
       val dependencies = allDependencies.in(config).value
       val files = filesToFix(shellArgs, config).value
       val scalacOpts = scalacOptions.in(config, compile).value
-      val withScalaInterface = mainArgs.withArgs(Arg.ScalacOptions(scalacOpts))
       val errors = new SemanticRuleValidator(
         new SemanticdbNotFound(ruleNames, scalaVersion.value)
-      ).findErrors(files, dependencies, scalacOpts, withScalaInterface)
+      ).findErrors(files, dependencies, scalacOpts, mainArgs)
       if (errors.isEmpty) {
         val task = Def.task {
           // don't use fullClasspath as it results in a cyclic dependency via compile when scalafixOnCompile := true
           val classpath =
             dependencyClasspath.in(config).value.map(_.data.toPath) :+
               classDirectory.in(config).value.toPath
-          val semanticInterface = withScalaInterface.withArgs(
+          val semanticInterface = mainArgs.withArgs(
             Arg.Paths(files),
             Arg.Classpath(classpath)
           )

src/sbt-test/sbt-1.5/testkit/build.sbt

@@ -19,13 +19,14 @@ lazy val rules = projectMatrix
 
 lazy val input = projectMatrix
   .defaultAxes(VirtualAxis.jvm)
+  .jvmPlatform(scalaVersions = Seq(scala3Version))
   .jvmPlatform(
-    scalaVersions = rulesCrossVersions,
+    scalaVersions = Seq(V.scala213),
     settings = Seq(
-      scalacOptions += "-P:semanticdb:synthetics:on"
+      scalacOptions += "-Xsource:3"
     )
   )
-  .jvmPlatform(scalaVersions = Seq(scala3Version))
+  .jvmPlatform(scalaVersions = Seq(V.scala212, V.scala211))
 
 lazy val output = projectMatrix
   .defaultAxes(VirtualAxis.jvm)

src/sbt-test/sbt-1.5/testkit/input/src/main/scala-2.13/fix/Source3.scala

@@ -0,0 +1,6 @@
+/*
+rules = [ SemanticRule ]
+ */
+package fix
+
+open class Source3

src/sbt-test/sbt-1.5/testkit/output/src/main/scala-2.13/fix/Source3.scala

@@ -0,0 +1,3 @@
+package fix
+
+open class Source3

src/sbt-test/sbt-1.5/testkit/test

@@ -1,3 +1,3 @@
 -> tests/test
-> testsTarget3/test:run --save-expect
+> testsTarget2_13/test:run --save-expect
 > tests/test

src/sbt-test/sbt-scalafix/cross-build/213.scalafix.conf

@@ -0,0 +1,3 @@
+rules = [
+  LeakingImplicitClassVal # check that scalacOptions are passed for syntactic rules
+]

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

@@ -18,7 +18,8 @@ lazy val root = project
     javaProject,
     scala211,
     scala210,
-    scala212
+    scala212,
+    scala213
   )
 
 lazy val scala210 = project.settings(
@@ -42,6 +43,15 @@ lazy val scala212 = project
   )
   .settings(scalafixConfigSettings(IntegrationTest): _*)
 
+lazy val scala213 = project.settings(
+  scalaVersion := Versions.scala213,
+  scalacOptions += "-Xsource:3",
+  scalafixSettings,
+  // NoAutoTupling is not supported
+  scalacOptions -= "-Ywarn-adapted-args",
+  scalafixConfig := Some(file("213.scalafix.conf"))
+)
+
 lazy val javaProject = project.settings(
   scalaVersion := Versions.scala212,
   scalafixSettings

src/sbt-test/sbt-scalafix/cross-build/scala213/src/main/scala/Source3.scala

@@ -0,0 +1,7 @@
+open class Source3
+
+object Source3 {
+  implicit class XtensionVal(val str: String) extends AnyVal {
+    def doubled: String = str + str
+  }
+}

src/test/scala/scalafix/internal/sbt/SbtCompletionsSuite.scala

@@ -99,7 +99,7 @@ class SbtCompletionsSuite extends AnyFunSuite {
         |DisableSyntax
         |  Reports an error for disabled features such as var or XML literals.
         |ExplicitResultTypes
-        |  Inserts type annotations for inferred public members. Only compatible with Scala 2.11.12, 2.12.11, 2.12.12, 2.12.13, 2.13.3, 2.13.4, 2.13.5.
+        |  Inserts type annotations for inferred public members. Only compatible with Scala 2.11.12, 2.12.11, 2.12.12, 2.12.13, 2.13.4, 2.13.5, 2.13.6.
         |LeakingImplicitClassVal
         |  Adds 'private' to val parameters of implicit value classes
         |NoAutoTupling