wip DirectoryAndPackageName

xuwei-k · Jan 9, 2024 · c07968d · c07968d
1 parent 32e43b3
commit c07968d
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 10 deletions.
diff --git a/rules/src/main/scala/fix/DirectoryAndPackageName.scala b/rules/src/main/scala/fix/DirectoryAndPackageName.scala
@@ -152,12 +152,6 @@ class DirectoryAndPackageName(config: DirectoryAndPackageNameConfig) extends Syn
     {
       for {
         path <- scalaSourceOpt
-        dirOpt = config.baseDirectory.find { dir =>
-          path.contains(dir)
-        }.map { dir =>
-          path.split(dir).last.split('/').init.mkString("/")
-        }
-        dir <- dirOpt
         if packages.nonEmpty // TODO check if empty package
         packageName = {
           val x = packages
@@ -166,20 +160,26 @@ 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
           }
         }
-        if packageName != dir
+        if config.baseDirectory.find { dir =>
+          path.contains(dir)
+        }.exists { fullDir =>
+          val splitedDir = path.split(fullDir).last.split('/').init.toList
+          packageName != splitedDir
+        } || {
+          path.split('/').init.toList.takeRight(packageName.size) != packageName
+        }
       } yield {
         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
           )

diff --git a/...st/DirectoryAndPackageName/.scalafix.conf → ...ctoryAndPackageName/test-1/.scalafix.conf b/...st/DirectoryAndPackageName/.scalafix.conf → ...ctoryAndPackageName/test-1/.scalafix.conf
diff --git a/...st/test/DirectoryAndPackageName/build.sbt → .../DirectoryAndPackageName/test-1/build.sbt b/...st/test/DirectoryAndPackageName/build.sbt → .../DirectoryAndPackageName/test-1/build.sbt
diff --git a/...rectoryAndPackageName/project/plugins.sbt → ...AndPackageName/test-1/project/plugins.sbt b/...rectoryAndPackageName/project/plugins.sbt → ...AndPackageName/test-1/project/plugins.sbt
diff --git a/...ryAndPackageName/src/main/scala/a/X.scala → ...ckageName/test-1/src/main/scala/a/X.scala b/...ryAndPackageName/src/main/scala/a/X.scala → ...ckageName/test-1/src/main/scala/a/X.scala
diff --git a/sbt-test/test/DirectoryAndPackageName/test → sbt-test/DirectoryAndPackageName/test-1/test b/sbt-test/test/DirectoryAndPackageName/test → sbt-test/DirectoryAndPackageName/test-1/test
diff --git a/sbt-test/DirectoryAndPackageName/test-2/.scalafix.conf b/sbt-test/DirectoryAndPackageName/test-2/.scalafix.conf
@@ -0,0 +1,5 @@
+rules = [
+  DirectoryAndPackageName
+]
+
+DirectoryAndPackageName.severity = error
diff --git a/sbt-test/DirectoryAndPackageName/test-2/build.sbt b/sbt-test/DirectoryAndPackageName/test-2/build.sbt
@@ -0,0 +1,3 @@
+ThisBuild / scalafixDependencies += "com.github.xuwei-k" %% "scalafix-rules" % sys.props("scalafix-rules.version")
+
+Compile / unmanagedSourceDirectories += baseDirectory.value / "my-src-dir"
diff --git a/sbt-test/DirectoryAndPackageName/test-2/my-src-dir/a/X.scala b/sbt-test/DirectoryAndPackageName/test-2/my-src-dir/a/X.scala
@@ -0,0 +1,3 @@
+package b
+
+class X
diff --git a/sbt-test/DirectoryAndPackageName/test-2/project/plugins.sbt b/sbt-test/DirectoryAndPackageName/test-2/project/plugins.sbt
@@ -0,0 +1 @@
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("scalafix.version"))
diff --git a/sbt-test/DirectoryAndPackageName/test-2/test b/sbt-test/DirectoryAndPackageName/test-2/test
@@ -0,0 +1,2 @@
+> Test/compile
+-> scalafixAll
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		ThisBuild / scalafixDependencies += "com.github.xuwei-k" %% "scalafix-rules" % sys.props("scalafix-rules.version")

		Compile / unmanagedSourceDirectories += baseDirectory.value / "my-src-dir"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("scalafix.version"))