fmt

Author: pawelsadlo

os/src/Path.scala

@@ -26,12 +26,14 @@ object PathChunk extends PathChunkMacros {
     val splitted = strNoTrailingSeps.split('/')
     splitted ++ Array.fill(trailingSeparatorsCount)("")
   }
-  private def reduceUps(in:Array[String]): List[String] = in.foldLeft(List.empty[String]){case (acc,x) => 
-	   acc match{
-	     case h :: t if h == ".." => x :: acc
-	     case h :: t if x == ".." => t
-	     case _ => x :: acc}
-	 }.reverse
+  private def reduceUps(in: Array[String]): List[String] =
+    in.foldLeft(List.empty[String]) { case (acc, x) =>
+      acc match {
+        case h :: t if h == ".." => x :: acc
+        case h :: t if x == ".." => t
+        case _ => x :: acc
+      }
+    }.reverse
   private[os] def segmentsFromStringLiteralValidation(literal: String): Array[String] = {
     val stringSegments = segmentsFromString(literal)
     val validSegmnts = reduceUps(validLiteralSegments(stringSegments))

os/test/src/PathTests.scala

@@ -30,20 +30,44 @@ object PathTests extends TestSuite {
 
       test("Compile errors") {
 
-        compileError("""root / "src/../foo"""").check("", nonCanonicalLiteral("src/../foo","foo"))
-        compileError("""root / "hello/../world"""").check("", nonCanonicalLiteral("hello/../world","world"))
-        compileError("""root / "src/../foo/bar"""").check("", nonCanonicalLiteral("src/../foo/bar","foo/bar"))
-        compileError("""root / "src/../foo/bar/.."""").check("", nonCanonicalLiteral("src/../foo/bar/..","foo"))
-        compileError("""root / "src/../foo/../bar/."""").check("", nonCanonicalLiteral("src/../foo/../bar/.","bar"))
-        compileError("""root / "src/foo/./.."""").check("", nonCanonicalLiteral("src/foo/./..","src"))
-        compileError("""root / "src/foo//./.."""").check("", nonCanonicalLiteral("src/foo//./..","src"))
+        compileError("""root / "src/../foo"""").check("", nonCanonicalLiteral("src/../foo", "foo"))
+        compileError("""root / "hello/../world"""").check(
+          "",
+          nonCanonicalLiteral("hello/../world", "world")
+        )
+        compileError("""root / "src/../foo/bar"""").check(
+          "",
+          nonCanonicalLiteral("src/../foo/bar", "foo/bar")
+        )
+        compileError("""root / "src/../foo/bar/.."""").check(
+          "",
+          nonCanonicalLiteral("src/../foo/bar/..", "foo")
+        )
+        compileError("""root / "src/../foo/../bar/."""").check(
+          "",
+          nonCanonicalLiteral("src/../foo/../bar/.", "bar")
+        )
+        compileError("""root / "src/foo/./.."""").check(
+          "",
+          nonCanonicalLiteral("src/foo/./..", "src")
+        )
+        compileError("""root / "src/foo//./.."""").check(
+          "",
+          nonCanonicalLiteral("src/foo//./..", "src")
+        )
 
         compileError("""root / "src/.."""").check("", removeLiteralErr("src/.."))
         compileError("""root / "src/../foo/.."""").check("", removeLiteralErr("src/../foo/.."))
         compileError("""root / "src/foo/../.."""").check("", removeLiteralErr("src/foo/../.."))
         compileError("""root / "src/foo/./../.."""").check("", removeLiteralErr("src/foo/./../.."))
-        compileError("""root / "src/./foo/./../.."""").check("", removeLiteralErr("src/./foo/./../.."))
-        compileError("""root / "src///foo/./../.."""").check("", removeLiteralErr("src///foo/./../.."))
+        compileError("""root / "src/./foo/./../.."""").check(
+          "",
+          removeLiteralErr("src/./foo/./../..")
+        )
+        compileError("""root / "src///foo/./../.."""").check(
+          "",
+          removeLiteralErr("src///foo/./../..")
+        )
 
         compileError("""root / "/" """).check("", removeLiteralErr("/"))
         compileError("""root / "/ " """).check("", nonCanonicalLiteral("/ ", " "))
@@ -54,7 +78,10 @@ object PathTests extends TestSuite {
         compileError("""root / "foo//" """).check("", nonCanonicalLiteral("foo//", "foo"))
 
         compileError("""root / "foo/bar/" """).check("", nonCanonicalLiteral("foo/bar/", "foo/bar"))
-        compileError("""root / "foo/bar//" """).check("", nonCanonicalLiteral("foo/bar//", "foo/bar"))
+        compileError("""root / "foo/bar//" """).check(
+          "",
+          nonCanonicalLiteral("foo/bar//", "foo/bar")
+        )
 
         compileError("""root / "/foo" """).check("", nonCanonicalLiteral("/foo", "foo"))
         compileError("""root / "//foo" """).check("", nonCanonicalLiteral("//foo", "foo"))