ScalafmtDynamic: inline ignore check

scalameta · Nov 22, 2021 · 04c3280 · 04c3280
1 parent 4da84d3
commit 04c3280
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamic.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtDynamic.scala
@@ -190,7 +190,9 @@ final case class ScalafmtDynamic(
         } else {
           config
         }
-      if (isIgnoredFile(filename, configWithDialect)) {
+      if (
+        respectExcludeFilters && !configWithDialect.isIncludedInProject(file)
+      ) {
         reporter.excluded(file)
         code
       } else {
@@ -202,13 +204,6 @@ final case class ScalafmtDynamic(
     }
   }
 
-  private def isIgnoredFile(
-      filename: String,
-      config: ScalafmtReflectConfig
-  ): Boolean = {
-    respectExcludeFilters && !config.isIncludedInProject(filename)
-  }
-
   private def readVersion(config: Path): FormatEval[ScalafmtVersion] = {
     Try {
       ConfigFactory.parseFile(config.toFile).getString("version")
@@ -240,7 +235,7 @@ final case class ScalafmtDynamic(
         formatted => formatted
       )
     override def matchesProjectFilters(file: Path): Boolean =
-      cfg.isIncludedInProject(file.toString)
+      cfg.isIncludedInProject(file)
   }
 
 }

diff --git a/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflectConfig.scala b/scalafmt-dynamic/src/main/scala/org/scalafmt/dynamic/ScalafmtReflectConfig.scala
@@ -24,6 +24,9 @@ class ScalafmtReflectConfig private[dynamic] (val fmtReflect: ScalafmtReflect)(
 
   @inline def getVersion = fmtReflect.version
 
+  @inline def isIncludedInProject(path: Path): Boolean =
+    isIncludedInProject(path.toString)
+
   def isIncludedInProject(filename: String): Boolean =
     projectMatcherField.invokeAs[Boolean]("matches", filename.asParam)