Imports: implement contiguousGroups logic

scalameta · Sep 2, 2021 · 88b5711 · 88b5711
1 parent 02fa738
commit 88b5711
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/Imports.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/rewrite/Imports.scala
@@ -485,6 +485,8 @@ object Imports extends RewriteFactory {
     ): Unit =
       if (settings.groups.isEmpty && settings.sort.eq(Sort.none))
         processEachLine(stats)
+      else if (settings.contiguousGroups eq ContiguousGroups.only)
+        processEachGroup(stats)
       else
         processAllGroups(stats)
 
@@ -504,6 +506,13 @@ object Imports extends RewriteFactory {
         processTokenRanges(importString, getTokenRange(group))
       }
 
+    private def processEachGroup(stats: Seq[Seq[ImportExportStat]]): Unit =
+      stats.foreach { group =>
+        val tokenRange = getTokenRange(group)
+        val importString = processImports(group)
+        processTokenRanges(importString, tokenRange)
+      }
+
     private def processAllGroups(stats: Seq[Seq[ImportExportStat]]): Unit = {
       val tokenRanges = stats.map(getTokenRange)
       val importString = processImports(stats.flatten)

diff --git a/scalafmt-tests/src/test/resources/rewrite/Imports.source b/scalafmt-tests/src/test/resources/rewrite/Imports.source
@@ -687,10 +687,10 @@ object Main {
 object Main {
   // c1
   import Foo._ // c2
-  // c4
-  import bar.ec // c5
   // c3
   val bar: Bar = getBar
+  // c4
+  import bar.ec // c5
 
   def getBar: Foo.Bar = ???
 }