FormatWriter: FormatLocations.iterate to foreach

scalameta · Aug 11, 2023 · e1de2a9 · e1de2a9
1 parent 0fecc3f
commit e1de2a9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/internal/FormatWriter.scala
@@ -31,7 +31,7 @@ class FormatWriter(formatOps: FormatOps) {
     val locations = getFormatLocations(state)
     styleMap.init.runner.event(FormatEvent.Written(locations))
 
-    locations.iterate.foreach { entry =>
+    locations.foreach { entry =>
       val location = entry.curr
       implicit val style: ScalafmtConfig = location.style
       val formatToken = location.formatToken
@@ -424,9 +424,9 @@ class FormatWriter(formatOps: FormatOps) {
 
     val tokenAligns: Map[Int, Int] = alignmentTokens
 
-    def iterate: Iterator[Entry] = {
+    def foreach(f: Entry => Unit): Unit = {
       val iterator = Iterator.range(0, locations.length).map(new Entry(_))
-      iterator.filter(_.curr.isNotRemoved)
+      iterator.filter(_.curr.isNotRemoved).foreach(f)
     }
 
     private def getAlign(tok: FormatToken, alignOffset: Int = 0): Int =

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala b/scalafmt-tests/src/test/scala/org/scalafmt/util/HasTests.scala
@@ -199,7 +199,7 @@ trait HasTests extends FormatAssertions {
 
   def getFormatOutput(debug: Debug): Array[FormatOutput] = {
     val builder = mutable.ArrayBuilder.make[FormatOutput]
-    debug.locations.iterate.foreach { entry =>
+    debug.locations.foreach { entry =>
       val token = entry.curr.formatToken
       builder += FormatOutput(
         token.left.syntax + entry.getWhitespace(0),