wip

xuwei-k · Dec 20, 2023 · 22cea7a · 22cea7a
1 parent 95f421c
commit 22cea7a
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 57 deletions.
diff --git a/input/src/main/scala/fix/UnnecessarySortTest.scala b/input/src/main/scala/fix/UnnecessarySortTest.scala
@@ -1,8 +1,8 @@
-package fix
-
 /*
 rule = UnnecessarySort
  */
+package fix
+
 abstract class UnnecessarySortTest {
   def seq: Seq[(Int, Int)]
 

diff --git a/output/src/main/scala/fix/UnnecessarySortTest.scala b/output/src/main/scala/fix/UnnecessarySortTest.scala
@@ -1,6 +1,5 @@
 package fix
 
-
 abstract class UnnecessarySortTest {
   def seq: Seq[(Int, Int)]
 

diff --git a/rules/src/main/scala/fix/DirectoryAndPackageName.scala b/rules/src/main/scala/fix/DirectoryAndPackageName.scala
@@ -128,12 +128,11 @@ class DirectoryAndPackageName(config: DirectoryAndPackageNameConfig) extends Syn
     {
       for {
         path <- scalaSourceOpt
-        // TODO Windows
-        if !scala.util.Properties.isWin
         dirOpt = config.baseDirectory.find { dir =>
           path.contains(dir)
         }.map { dir =>
-          path.split(dir).last.split('/').init.mkString("/")
+          val c = java.io.File.separatorChar
+          path.split(dir).last.split(c).init.mkString(String.valueOf(c))
         }
         dir <- dirOpt
         if packages.nonEmpty // TODO check if empty package

diff --git a/rules/src/main/scala/fix/FileNameConsistent.scala b/rules/src/main/scala/fix/FileNameConsistent.scala
@@ -16,64 +16,59 @@ class FileNameConsistent extends SyntacticRule("FileNameConsistent") {
   override def isLinter = true
 
   override def fix(implicit doc: SyntacticDocument): Patch = {
-    if (scala.util.Properties.isWin) {
-      // TODO https://github.com/xuwei-k/scalafix-rules/issues/34
-      Patch.empty
-    } else {
-      val defs = doc.tree.collect {
-        case x: Defn.Trait if x.isTopLevel =>
-          TemplateDef(x, x.name.value)
-        case x: Defn.Class if x.isTopLevel =>
-          TemplateDef(x, x.name.value)
-        case x: Defn.Object if x.isTopLevel =>
-          TemplateDef(x, x.name.value)
-      }
-      val packageObjects = doc.tree.collect { case x: Pkg.Object =>
+    val defs = doc.tree.collect {
+      case x: Defn.Trait if x.isTopLevel =>
         TemplateDef(x, x.name.value)
-      }
-      val scalaSourceOpt = PartialFunction.condOpt(doc.input) {
-        case f: Input.File =>
-          ScalaSource(
-            fullPath = f.path.toString,
-            name = f.path.toFile.getName.replace(".scala", "")
-          )
-        case f: Input.VirtualFile =>
-          ScalaSource(
-            fullPath = f.path,
-            name = f.path.split('/').lastOption.getOrElse("").replace(".scala", "")
-          )
-      }
+      case x: Defn.Class if x.isTopLevel =>
+        TemplateDef(x, x.name.value)
+      case x: Defn.Object if x.isTopLevel =>
+        TemplateDef(x, x.name.value)
+    }
+    val packageObjects = doc.tree.collect { case x: Pkg.Object =>
+      TemplateDef(x, x.name.value)
+    }
+    val scalaSourceOpt = PartialFunction.condOpt(doc.input) {
+      case f: Input.File =>
+        ScalaSource(
+          fullPath = f.path.toString,
+          name = f.path.toFile.getName.replace(".scala", "")
+        )
+      case f: Input.VirtualFile =>
+        ScalaSource(
+          fullPath = f.path,
+          name = f.path.split(java.io.File.separatorChar).lastOption.getOrElse("").replace(".scala", "")
+        )
+    }
 
-      val names = defs.map(_.name).distinct
-      scalaSourceOpt match {
-        case Some(src) =>
-          if ((src.name == "package") && (packageObjects.size == 1) && names.isEmpty) {
+    val names = defs.map(_.name).distinct
+    scalaSourceOpt match {
+      case Some(src) =>
+        if ((src.name == "package") && (packageObjects.size == 1) && names.isEmpty) {
+          // correct
+          // - file name is "package.scala"
+          // - and only package object
+          Patch.empty
+        } else if ((names.size == 1) || (packageObjects.size == 1)) {
+          if (names.contains(src.name)) {
             // correct
-            // - file name is "package.scala"
-            // - and only package object
             Patch.empty
-          } else if ((names.size == 1) || (packageObjects.size == 1)) {
-            if (names.contains(src.name)) {
-              // correct
-              Patch.empty
-            } else {
-              Patch.lint(
-                FileNameConsistentWaring(
-                  names = names,
-                  path = src.fullPath,
-                  position = defs.headOption.getOrElse(packageObjects.head).tree.pos
-                )
-              )
-            }
           } else {
-            // if there are some toplevel trait, class, object
-            // TODO
-            Patch.empty
+            Patch.lint(
+              FileNameConsistentWaring(
+                names = names,
+                path = src.fullPath,
+                position = defs.headOption.getOrElse(packageObjects.head).tree.pos
+              )
+            )
           }
-        case _ =>
-          // another input type
+        } else {
+          // if there are some toplevel trait, class, object
+          // TODO
           Patch.empty
-      }
+        }
+      case _ =>
+        // another input type
+        Patch.empty
     }
   }
 }