From 6dcb601f7342a84b40f2d2ad03c4544e6c18e16d Mon Sep 17 00:00:00 2001 From: kenji yoshida <6b656e6a69@gmail.com> Date: Sat, 21 Mar 2026 15:58:49 +0900 Subject: [PATCH] Add scalafmt newlines.topLevelStatementBlankLines setting (#8949) --- .scalafmt.conf | 8 ++++++++ .../sbt/internal/librarymanagement/SemSelOperator.scala | 1 + .../src/main/scala/lmcoursier/definitions/Module.scala | 1 + main/src/main/scala/sbt/ExecuteProgress2.scala | 1 + main/src/main/scala/sbt/internal/CommandExchange.scala | 1 + .../sbt/internal/protocol/codec/JsonRPCProtocol.scala | 1 + .../src/main/scala/sbt/internal/util/Par.scala | 1 + 7 files changed, 14 insertions(+) diff --git a/.scalafmt.conf b/.scalafmt.conf index cd28122cb..74cd92451 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -37,3 +37,11 @@ fileOverride { runner.dialectOverride.allowAsForImportRename = false } } + +newlines.topLevelStatementBlankLines = [ + { + blanks { after = 1 } + maxNest = 0 + regex = "Import" + } +] diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemSelOperator.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemSelOperator.scala index d881fe9e2..942672269 100644 --- a/lm-core/src/main/scala/sbt/internal/librarymanagement/SemSelOperator.scala +++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/SemSelOperator.scala @@ -1,4 +1,5 @@ package sbt.internal.librarymanagement + sealed abstract class SemSelOperator { override def toString: String = this match { case SemSelOperator.Lte => "<=" diff --git a/lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Module.scala b/lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Module.scala index fd1c173fe..11b418ae1 100644 --- a/lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Module.scala +++ b/lm-coursier/definitions/src/main/scala/lmcoursier/definitions/Module.scala @@ -1,4 +1,5 @@ package lmcoursier.definitions + import dataclass.data @data class Module( diff --git a/main/src/main/scala/sbt/ExecuteProgress2.scala b/main/src/main/scala/sbt/ExecuteProgress2.scala index b30fe4972..fdd167e20 100644 --- a/main/src/main/scala/sbt/ExecuteProgress2.scala +++ b/main/src/main/scala/sbt/ExecuteProgress2.scala @@ -7,6 +7,7 @@ */ package sbt + import sbt.internal.util.RMap /** diff --git a/main/src/main/scala/sbt/internal/CommandExchange.scala b/main/src/main/scala/sbt/internal/CommandExchange.scala index eceeed9ab..fa14e463d 100644 --- a/main/src/main/scala/sbt/internal/CommandExchange.scala +++ b/main/src/main/scala/sbt/internal/CommandExchange.scala @@ -9,6 +9,7 @@ package sbt package internal + import java.io.{ File, IOException } import java.net.Socket import java.util.concurrent.atomic.* diff --git a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRPCProtocol.scala b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRPCProtocol.scala index ae5baedb3..3dbe4a84e 100644 --- a/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRPCProtocol.scala +++ b/protocol/src/main/scala/sbt/internal/protocol/codec/JsonRPCProtocol.scala @@ -7,6 +7,7 @@ */ package sbt.internal.protocol.codec + trait JsonRPCProtocol extends sbt.internal.util.codec.JValueFormats with sjsonnew.BasicJsonProtocol diff --git a/util-collection/src/main/scala/sbt/internal/util/Par.scala b/util-collection/src/main/scala/sbt/internal/util/Par.scala index ddbb1f92c..934c627ce 100644 --- a/util-collection/src/main/scala/sbt/internal/util/Par.scala +++ b/util-collection/src/main/scala/sbt/internal/util/Par.scala @@ -6,6 +6,7 @@ */ package sbt.internal.util + import scala.collection.parallel.CollectionConverters.* import scala.collection.parallel.ParSeq