fix FileNameConsistent if windows

xuwei-k · Feb 4, 2025 · f233bec · f233bec
1 parent 08a84ab
commit f233bec
Show file tree

Hide file tree

Showing 10 changed files with 54 additions and 1 deletion.
diff --git a/rules/src/main/scala/fix/FileNameConsistent.scala b/rules/src/main/scala/fix/FileNameConsistent.scala
@@ -40,7 +40,7 @@ class FileNameConsistent extends SyntacticRule("FileNameConsistent") {
       case f: Input.VirtualFile =>
         ScalaSource(
           fullPath = f.path,
-          name = f.path.split('/').lastOption.getOrElse("").replace(".scala", "")
+          name = f.path.split(java.io.File.separatorChar).lastOption.getOrElse("").replace(".scala", "")
         )
     }
 

diff --git a/sbt-test/FileNameConsistent/test-1/.scalafix.conf b/sbt-test/FileNameConsistent/test-1/.scalafix.conf
@@ -0,0 +1,3 @@
+rules = [
+  FileNameConsistent
+]
diff --git a/sbt-test/FileNameConsistent/test-1/build.sbt b/sbt-test/FileNameConsistent/test-1/build.sbt
@@ -0,0 +1,15 @@
+ThisBuild / scalafixDependencies += "com.github.xuwei-k" %% "scalafix-rules" % sys.props("scalafix-rules.version")
+
+TaskKey[Unit]("check") := {
+  val actual = IO.read(file("target/warnings/warnings.json"))
+  val expect = IO.read(
+    file(
+      if (scala.util.Properties.isWin) {
+        "expect-windows.json"
+      } else {
+        "expect.json"
+      }
+    )
+  )
+  assert(actual == expect, s"$actual != $expect")
+}
diff --git a/sbt-test/FileNameConsistent/test-1/expect-windows.json b/sbt-test/FileNameConsistent/test-1/expect-windows.json
@@ -0,0 +1,12 @@
+[{
+  "message": "[FileNameConsistent] inconsistent file name and class name. names = [Y]",
+  "position": {
+    "line": 3,
+    "lineContent": "class Y",
+    "sourcePath": "${BASE}/src\main\scala\a\X.scala",
+    "startLine": 3,
+    "startColumn": 0,
+    "endLine": 3,
+    "endColumn": 7
+  }
+}]
diff --git a/sbt-test/FileNameConsistent/test-1/expect.json b/sbt-test/FileNameConsistent/test-1/expect.json
@@ -0,0 +1,12 @@
+[{
+  "message": "[FileNameConsistent] inconsistent file name and class name. names = [Y]",
+  "position": {
+    "line": 3,
+    "lineContent": "class Y",
+    "sourcePath": "${BASE}/src/main/scala/a/X.scala",
+    "startLine": 3,
+    "startColumn": 0,
+    "endLine": 3,
+    "endColumn": 7
+  }
+}]
diff --git a/sbt-test/FileNameConsistent/test-1/project/plugins.sbt b/sbt-test/FileNameConsistent/test-1/project/plugins.sbt
@@ -0,0 +1,2 @@
+addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("scalafix.version"))
+addSbtPlugin("com.github.xuwei-k" % "warning-diff-scalafix-plugin" % "0.6.0")
diff --git a/sbt-test/FileNameConsistent/test-1/src/main/scala/a/A.scala b/sbt-test/FileNameConsistent/test-1/src/main/scala/a/A.scala
@@ -0,0 +1,3 @@
+package a
+
+object A
diff --git a/sbt-test/FileNameConsistent/test-1/src/main/scala/a/X.scala b/sbt-test/FileNameConsistent/test-1/src/main/scala/a/X.scala
@@ -0,0 +1,3 @@
+package a
+
+class Y
diff --git a/sbt-test/FileNameConsistent/test-1/test b/sbt-test/FileNameConsistent/test-1/test
@@ -0,0 +1,2 @@
+> warningsAll
+> check
diff --git a/tests/src/test/scala/fix/RuleSuite.scala b/tests/src/test/scala/fix/RuleSuite.scala
@@ -7,6 +7,7 @@ import scala.util.Properties
 class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
   private[this] val excludeWindows: Set[String] = Set(
     "FlatMapCollectTest",
+    "FileNameConsistent",
     "DuplicateWildcardImportTest",
     "PartialFunctionCondOptTest",
     "RemoveUselessParamCommentsTest",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("scalafix.version"))
		addSbtPlugin("com.github.xuwei-k" % "warning-diff-scalafix-plugin" % "0.6.0")