Process only sources instead of allSources to exclude generatedSources

joan38 · Jun 11, 2021 · 3ed3cae · 3ed3cae
1 parent 7342e32
commit 3ed3cae
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala b/mill-scalafix/src/com/goyeau/mill/scalafix/ScalafixModule.scala
@@ -1,15 +1,15 @@
 package com.goyeau.mill.scalafix
 
+import com.goyeau.mill.scalafix.ScalafixModule.{filesToFix, fixAction}
 import coursier.Repository
 import mill.{Agg, T}
-import mill.api.{Logger, Loose, Result}
+import mill.api.{Logger, Loose, PathRef, Result}
 import mill.scalalib.{Dep, DepSyntax, ScalaModule}
 import mill.define.{Command, Target}
 import mill.scalalib.api.Util.isScala3
 import os._
 import scalafix.interfaces.Scalafix
 import scalafix.interfaces.ScalafixError._
-
 import scala.compat.java8.OptionConverters._
 import scala.jdk.CollectionConverters._
 
@@ -29,10 +29,10 @@ trait ScalafixModule extends ScalaModule {
     */
   def fix(args: String*): Command[Unit] =
     T.command {
-      ScalafixModule.fixAction(
+      fixAction(
         T.ctx().log,
         repositoriesTask(),
-        allSourceFiles().map(_.path),
+        filesToFix(sources()).map(_.path),
         localClasspath().map(_.path),
         scalaVersion(),
         scalafixScalaBinaryVersion(),
@@ -96,4 +96,12 @@ object ScalafixModule {
         Result.Failure(errorMessages.mkString("\n"))
       }
     } else Result.Success(())
+
+  def filesToFix(sources: Seq[PathRef]): Seq[PathRef] =
+    for {
+      pathRef <- sources if os.exists(pathRef.path)
+      file <-
+        if (os.isDir(pathRef.path)) os.walk(pathRef.path).filter(file => os.isFile(file) && (file.ext == "scala"))
+        else Seq(pathRef.path)
+    } yield PathRef(file)
 }