fix SeparateEachFile

xuwei-k · Aug 22, 2024 · 62ee3f3 · 62ee3f3
1 parent ea1f0f9
commit 62ee3f3
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 16 deletions.
diff --git a/input/src/main/scala/fix/SeparateEachFileWarnTest3.scala b/input/src/main/scala/fix/SeparateEachFileWarnTest3.scala
@@ -0,0 +1,8 @@
+/*
+rule = SeparateEachFileWarn
+ */
+package fix
+
+sealed trait SeparateEachFileWarnTest3 extends Product
+case object SeparateEachFileWarnTest3_A extends SeparateEachFileWarnTest3
+case object SeparateEachFileWarnTest3_B extends SeparateEachFileWarnTest3
diff --git a/rules/src/main/scala/fix/SeparateEachFileRewrite.scala b/rules/src/main/scala/fix/SeparateEachFileRewrite.scala
@@ -28,6 +28,12 @@ class SeparateEachFileRewrite(config: SeparateEachFileConfig) extends SyntacticR
         case f: Input.VirtualFile =>
           new File(f.path)
       }
+      .filter { _ =>
+        doc.tree.collect {
+          case t: Stat.WithMods if t.parent.forall(_.is[Pkg]) && t.mods.exists(_.is[Mod.Sealed]) =>
+            ()
+        }.isEmpty
+      }
       .foreach { input =>
         val topLevelValues = doc.tree.collect {
           case t: (Stat.WithTemplate & Member & Stat.WithMods)

diff --git a/rules/src/main/scala/fix/SeparateEachFileWarn.scala b/rules/src/main/scala/fix/SeparateEachFileWarn.scala
@@ -12,24 +12,35 @@ class SeparateEachFileWarn(config: SeparateEachFileConfig) extends SyntacticRule
     config.conf.getOrElse("SeparateEachFileWarn")(this.config).map(newConfig => new SeparateEachFileWarn(newConfig))
 
   override def fix(implicit doc: SyntacticDocument): Patch = {
-    val topLevelValues = doc.tree.collect {
-      case t: (Stat.WithTemplate & Stat.WithMods & Member)
-          if t.parent.forall(_.is[Pkg]) && t.templ.inits.isEmpty && !t.is[Defn.Object] =>
-        t
-    }
+    if (
+      doc.tree.collect {
+        case t: Stat.WithMods if t.parent.forall(_.is[Pkg]) && t.mods.exists(_.is[Mod.Sealed]) =>
+          ()
+      }.isEmpty
+    ) {
+      val topLevelValues = doc.tree.collect {
+        case t: (Stat.WithTemplate & Stat.WithMods & Member)
+            if t.parent.forall(_.is[Pkg]) && t.templ.inits.isEmpty && !t.is[Defn.Object] =>
+          t
+      }
 
-    if ((topLevelValues.lengthCompare(config.limit) >= 0) && topLevelValues.forall(_.mods.forall(!_.is[Mod.Sealed]))) {
-      Patch.lint(
-        Diagnostic(
-          id = "",
-          message = Seq(
-            s"too many top level classes. please separate file. ${topLevelValues.size} ",
-            topLevelValues.map(_.name.value).mkString("[", ", ", "]")
-          ).mkString(""),
-          position = topLevelValues.head.pos,
-          severity = config.severity
+      if (
+        (topLevelValues.lengthCompare(config.limit) >= 0) && topLevelValues.forall(_.mods.forall(!_.is[Mod.Sealed]))
+      ) {
+        Patch.lint(
+          Diagnostic(
+            id = "",
+            message = Seq(
+              s"too many top level classes. please separate file. ${topLevelValues.size} ",
+              topLevelValues.map(_.name.value).mkString("[", ", ", "]")
+            ).mkString(""),
+            position = topLevelValues.head.pos,
+            severity = config.severity
+          )
         )
-      )
+      } else {
+        Patch.empty
+      }
     } else {
       Patch.empty
     }