Skip to content

Commit

Permalink
autoformat
Browse files Browse the repository at this point in the history
  • Loading branch information
lihaoyi committed Aug 28, 2024
1 parent 71ee84b commit ea1ba1b
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 9 deletions.
5 changes: 3 additions & 2 deletions itest/src/custom-rule/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ import mill.scalalib._
import os._

object project extends ScalaModule with ScalafixModule {
def scalaVersion = "2.13.12"
def semanticDbEnablePluginScalacOptions = super.semanticDbEnablePluginScalacOptions() ++ Seq("-P:semanticdb:synthetics:on")
def scalaVersion = "2.13.12"
def semanticDbEnablePluginScalacOptions =
super.semanticDbEnablePluginScalacOptions() ++ Seq("-P:semanticdb:synthetics:on")
def scalafixIvyDeps = Agg(ivy"org.scala-lang.modules::scala-collection-migrations:2.11.0")
}

Expand Down
3 changes: 1 addition & 2 deletions itest/src/custom-rule/project/src/Fix.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ object Tuple2ZippedSrc213 {
def zipped(xs: List[Int], ys: List[Int]): Unit = {
(xs, ys).zipped
(xs, ys).zipped
((xs, ys) zipped)
((xs, ys).zipped)
(xs, ys).zipped((xs, ys).zipped)
(xs, ys).zipped
/* a */
( /* b */ xs /* c */, /* d */ ys /* e */ ) /* f */ . /* g */ zipped /* h */
Expand Down
4 changes: 2 additions & 2 deletions itest/src/fix/build.sc
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import mill.scalalib._
import os._

object project extends ScalaModule with ScalafixModule {
def scalaVersion = "2.13.12"
def scalaVersion = "2.13.12"
def scalafixScalaBinaryVersion = mill.scalalib.api.ZincWorkerUtil.scalaBinaryVersion(scalaVersion())
def scalacOptions = Seq("-Ywarn-unused")
def scalacOptions = Seq("-Ywarn-unused")
}

def verify() =
Expand Down
18 changes: 15 additions & 3 deletions mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import scala.compat.java8.OptionConverters.*
import scala.jdk.CollectionConverters.*

trait ScalafixModule extends ScalaModule {
def scalafixConfig: T[Option[os.Path]] = T(None)
def scalafixConfig: T[Option[os.Path]] = T(None)
def scalafixIvyDeps: T[Agg[Dep]] = Agg.empty[Dep]
def scalafixScalaBinaryVersion: T[String] = "2.12"

Expand Down Expand Up @@ -49,8 +49,20 @@ object ScalafixModule {
scalafixIvyDeps: Agg[Dep],
scalafixConfig: Option[os.Path],
args: String*
): Result[Unit] = fixAction(log, repositories, sources, classpath, scalaVersion, scalaBinaryVersion, scalacOptions, scalafixIvyDeps, scalafixConfig, args, os.pwd)

): Result[Unit] = fixAction(
log,
repositories,
sources,
classpath,
scalaVersion,
scalaBinaryVersion,
scalacOptions,
scalafixIvyDeps,
scalafixConfig,
args,
os.pwd
)

def fixAction(
log: Logger,
repositories: Seq[Repository],
Expand Down

0 comments on commit ea1ba1b

Please sign in to comment.