wip DirectoryAndPackageName

xuwei-k · Jan 9, 2024 · 2b4d4e8 · 2b4d4e8
1 parent 32e43b3
commit 2b4d4e8
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/rules/src/main/scala/fix/DirectoryAndPackageName.scala b/rules/src/main/scala/fix/DirectoryAndPackageName.scala
@@ -155,7 +155,7 @@ class DirectoryAndPackageName(config: DirectoryAndPackageNameConfig) extends Syn
         dirOpt = config.baseDirectory.find { dir =>
           path.contains(dir)
         }.map { dir =>
-          path.split(dir).last.split('/').init.mkString("/")
+          path.split(dir).last.split('/').init.toList
         }
         dir <- dirOpt
         if packages.nonEmpty // TODO check if empty package
@@ -166,10 +166,9 @@ class DirectoryAndPackageName(config: DirectoryAndPackageNameConfig) extends Syn
               if (keywords(p)) { p.replace("`", "") }
               else p
             )
-            .mkString("/")
           packageObjectOpt match {
             case Some(value) =>
-              x + "/" + value.name.value
+              x :+ value.name.value
             case None =>
               x
           }
@@ -179,7 +178,7 @@ class DirectoryAndPackageName(config: DirectoryAndPackageNameConfig) extends Syn
         Patch.lint(
           Diagnostic(
             id = "",
-            message = s"inconsistent package and directory\n${path}\n${packageName}",
+            message = s"inconsistent package and directory\n${path}\n${packageName.mkString("/")}",
             position = packages.last.pos,
             severity = config.severity
           )