Skip to content

Commit

Permalink
fix FileNameConsistent if windows
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Feb 4, 2025
1 parent 08a84ab commit 35f885e
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 1 deletion.
2 changes: 1 addition & 1 deletion rules/src/main/scala/fix/FileNameConsistent.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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", "")
)
}

Expand Down
3 changes: 3 additions & 0 deletions sbt-test/FileNameConsistent/test-1/.scalafix.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
rules = [
FileNameConsistent
]
28 changes: 28 additions & 0 deletions sbt-test/FileNameConsistent/test-1/build.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import argonaut._

ThisBuild / scalafixDependencies += "com.github.xuwei-k" %% "scalafix-rules" % sys.props("scalafix-rules.version")

TaskKey[Unit]("check") := {
val actual = JsonParser.parse(IO.read(file("target/warnings/warnings.json"))).fold(sys.error(_), identity)
val expect = Json.array(
Json.obj(
"message" -> Json.jString("[FileNameConsistent] inconsistent file name and class name. names = [Y]"),
"position" -> Json.obj(
"line" -> Json.jNumber(3),
"lineContent" -> Json.jString("class Y"),
"sourcePath" -> Json.jString(
if (scala.util.Properties.isWin) {
"${BASE}/src\\main\\scala\\a\\X.scala"
} else {
"${BASE}/src/main/scala/a/X.scala"
}
),
"startLine" -> Json.jNumber(3),
"startColumn" -> Json.jNumber(0),
"endLine" -> Json.jNumber(3),
"endColumn" -> Json.jNumber(7)
)
)
)
assert(actual == expect, s"$actual != $expect")
}
3 changes: 3 additions & 0 deletions sbt-test/FileNameConsistent/test-1/project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % sys.props("scalafix.version"))
addSbtPlugin("com.github.xuwei-k" % "warning-diff-scalafix-plugin" % "0.6.0")
libraryDependencies += "io.github.argonaut-io" %% "argonaut" % "6.3.11"
3 changes: 3 additions & 0 deletions sbt-test/FileNameConsistent/test-1/src/main/scala/a/A.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package a

object A
3 changes: 3 additions & 0 deletions sbt-test/FileNameConsistent/test-1/src/main/scala/a/X.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package a

class Y
2 changes: 2 additions & 0 deletions sbt-test/FileNameConsistent/test-1/test
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
> warningsAll
> check
3 changes: 3 additions & 0 deletions tests/src/test/scala/fix/RuleSuite.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ import scala.util.Properties
class RuleSuite extends AbstractSemanticRuleSuite with AnyFunSuiteLike {
private[this] val excludeWindows: Set[String] = Set(
"FlatMapCollectTest",
"FileNameConsistentTest",
"FileNameConsistentTest2",
"package",
"DuplicateWildcardImportTest",
"PartialFunctionCondOptTest",
"RemoveUselessParamCommentsTest",
Expand Down

0 comments on commit 35f885e

Please sign in to comment.