PathMatcher: move to sysops, for sbt-scalafmt

Author: kitbellew

scalafmt-cli/shared/src/main/scala/org/scalafmt/cli/ScalafmtCoreRunner.scala

@@ -23,7 +23,7 @@ object ScalafmtCoreRunner extends ScalafmtRunner {
         ProjectFiles.FileMatcher(scalafmtConf.project, options.customExcludes),
       )
     catch {
-      case e: ScalafmtConfigException =>
+      case e @ (_: ScalafmtConfigException | _: sysops.ScalafmtSysException) =>
         options.common.err.println(e.getMessage)
         ExitCode.UnexpectedError.future
     }

scalafmt-cli/shared/src/test/scala/org/scalafmt/cli/CliTest.scala

@@ -808,8 +808,7 @@ class CliTest extends AbstractCliTest with CliTestBehavior {
       assertOut = out =>
         assertContains(
           out,
-          """|Illegal regex in configuration: .*foo(
-             |reason: Unclosed group near index 6
+          """|Invalid config: Invalid path patcher regex: /.*foo(/; Unclosed group near index 6
              |.*foo(
              |""".stripMargin,
         ),

scalafmt-core/jvm-native/src/main/scala/org/scalafmt/config/PlatformPathMatcher.scala

@@ -1,8 +1,6 @@
 package org.scalafmt.config
 
-import org.scalafmt.sysops.AbsoluteFile
-import org.scalafmt.sysops.FileOps
-import org.scalafmt.sysops.OsSpecific._
+import org.scalafmt.sysops._
 
 import scala.meta.Dialect
 import scala.meta.dialects
@@ -60,7 +58,7 @@ object ProjectFiles {
     }
 
     private def create(seq: Seq[String], f: String => PathMatcher) = seq
-      .map(inPathMatcherForm).distinct.map(f)
+      .map(OsSpecific.inPathMatcherForm).distinct.map(f)
     private def nio(seq: Seq[String]) = create(seq, PlatformPathMatcher.apply)
     private def regex(seq: Seq[String]) = create(seq, PathMatcher.Regex.apply)
 

scalafmt-core/shared/src/main/scala/org/scalafmt/config/PathMatcher.scala

@@ -2,8 +2,7 @@ package org.scalafmt.config
 
 import org.scalafmt.Versions
 import org.scalafmt.rewrite._
-import org.scalafmt.sysops.AbsoluteFile
-import org.scalafmt.sysops.OsSpecific._
+import org.scalafmt.sysops._
 import org.scalafmt.util._
 
 import scala.meta._
@@ -202,7 +201,7 @@ case class ScalafmtConfig(
     val langResult = patStyles.collect { case (Left(lang), cfg) => lang -> cfg }
     val pmResult = patStyles.collect { case (Right(pat), cfg) =>
       val pattern =
-        if (pat(0) == '.') "glob:**" + pat else inPathMatcherForm(pat)
+        if (pat(0) == '.') "glob:**" + pat else OsSpecific.inPathMatcherForm(pat)
       PlatformPathMatcher(pattern) -> cfg
     }
     (langResult, pmResult)

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ProjectFiles.scala

@@ -277,11 +277,9 @@ class DynamicSuite extends FunSuite {
           |]
           |""".stripMargin,
     )
-    val err = f.assertThrows[ScalafmtDynamicError.ConfigParseError]().getMessage
     assertNoDiff(
-      err.takeRight(120),
-      """|Invalid config: Illegal regex in configuration: .*foo(
-         |reason: Unclosed group near index 6
+      f.assertThrows[ScalafmtDynamicError.ConfigParseError]().getMessage,
+      """|Invalid config: Invalid path patcher regex: /.*foo(/; Unclosed group near index 6
          |.*foo(
          |""".stripMargin,
     )
@@ -297,10 +295,7 @@ class DynamicSuite extends FunSuite {
           |""".stripMargin,
     )
     val err = f.assertThrows[ScalafmtDynamicError.ConfigParseError]().getMessage
-    assertNoDiff(
-      err.takeRight(120),
-      "Invalid config: Illegal pattern in configuration: foo.scala",
-    )
+    assertNoDiff(err, "Invalid config: Invalid path matcher pattern: foo.scala")
   }
 
   check("config-cache") { f =>

scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala

@@ -1,11 +1,9 @@
-package org.scalafmt.config
-
-import org.scalafmt.sysops.OsSpecific
+package org.scalafmt.sysops
 
 object PlatformPathMatcher {
   private def fail(pattern: String, msg: String): Nothing =
-    throw new ScalafmtConfigException(
-      s"Illegal pattern in configuration: $pattern; $msg",
+    throw new ScalafmtSysException(
+      s"Invalid path matcher pattern: $pattern; $msg",
     )
   def apply(pattern: String): PathMatcher = {
     val colon = pattern.indexOf(':')

scalafmt-dynamic/jvm/src/test/scala/org/scalafmt/dynamic/DynamicSuite.scala

@@ -0,0 +1,19 @@
+package org.scalafmt.sysops
+
+import java.nio.file
+
+object PlatformPathMatcher {
+  val fs: file.FileSystem = file.FileSystems.getDefault
+
+  def apply(pattern: String): PathMatcher = {
+    try fs.getPathMatcher(pattern)
+    catch {
+      case e: IllegalArgumentException =>
+        val sb = new StringBuilder()
+        sb.append("Invalid path matcher pattern: ").append(pattern)
+        val err = e.getMessage
+        if (null != err && err.nonEmpty) sb.append("; ").append(err)
+        throw new ScalafmtSysException(sb.toString())
+    }
+  }.matches
+}

scalafmt-core/js/src/main/scala/org/scalafmt/config/PlatformPathMatcher.scala renamed to scalafmt-sysops/js/src/main/scala/org/scalafmt/sysops/PlatformPathMatcher.scala

@@ -0,0 +1,27 @@
+package org.scalafmt.sysops
+
+import java.nio.file.Path
+import java.util.regex.Pattern
+
+trait PathMatcher {
+  def matches(path: Path): Boolean
+}
+
+object PathMatcher {
+
+  class Regex(pattern: Pattern) extends PathMatcher {
+    def matches(path: Path): Boolean = pattern.matcher(path.toString).find()
+  }
+
+  object Regex {
+    def apply(regex: String): Regex =
+      try new Regex(Pattern.compile(regex))
+      catch {
+        case e: Throwable =>
+          val msg = s"Invalid path patcher regex: /$regex/; ${e.getMessage}"
+          throw new ScalafmtSysException(msg)
+      }
+
+  }
+
+}