Deal with Windows paths

scalameta · Sep 10, 2024 · 0ef1d84 · 0ef1d84
1 parent c9b63ce
commit 0ef1d84
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/munit/shared/src/main/scala/munit/internal/console/Lines.scala b/munit/shared/src/main/scala/munit/internal/console/Lines.scala
@@ -19,11 +19,17 @@ class Lines extends Serializable {
 
   def findPath(cwd: String, path: String, max: Int): Path = {
     val p = Paths.get(cwd).resolve(path)
+    def getParentPath(somePath: String, sep: String): String = {
+      val somePath1 =
+        if (somePath.endsWith(sep)) somePath.dropRight(sep.length)
+        else somePath
+      somePath1.split(sep).dropRight(1).mkString(sep)
+    }
     if (Files.exists(p)) p
     else if (max < 1) sys.error(s"$path was not found")
     else if (cwd.contains("\\"))
-      findPath(cwd.split("\\").dropRight(1).mkString("\\"), path, max - 1)
-    else findPath(cwd.split("/").dropRight(1).mkString("/"), path, max - 1)
+      findPath(getParentPath(cwd, "\\"), path, max - 1)
+    else findPath(getParentPath(cwd, "/"), path, max - 1)
   }
 
   def formatLine(location: Location, message: String, clues: Clues): String = {

diff --git a/tests/shared/src/test/scala/munit/LinesSuite.scala b/tests/shared/src/test/scala/munit/LinesSuite.scala
@@ -39,6 +39,7 @@ class LinesSuite extends FunSuite {
     test(options) {
       val obtained = munitLines
         .formatLine(location, message)
+        .replace(raw"""tests\shared\src\test\scala\munit\""", "tests/shared/src/test/scala/munit/") // for Windows
       assertNoDiff(obtained, expected)
     }
   }