Enable top level statement blank lines scalafmt rule, which adds a blank line after imports (#11180)

CHANGELOG_BEGIN
CHANGELOG_END
This commit is contained in:
nicu-da 2021-10-10 23:16:48 -07:00 committed by GitHub
parent 7e2edbdfaf
commit 9b2a8c7eb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 0 deletions

View File

@ -8,3 +8,6 @@ runner.fatalWarnings = true
trailingCommas = multiple
# Disable scala doc wrapping (behavior changed in v3.0.0).
docstrings.wrap = no
newlines.topLevelStatementBlankLines = [
{ blanks { after = 1 }, regex = "^Import" }
]

View File

@ -25,6 +25,7 @@ class CommandPreprocessorSpec
import com.daml.lf.testing.parser.Implicits._
import com.daml.lf.transaction.test.TransactionBuilder.Implicits.{defaultPackageId => _, _}
private implicit val defaultPackageId = defaultParserParameters.defaultPackageId
private[this] val pkg =

View File

@ -27,6 +27,7 @@ class ValueTranslatorSpec
import Preprocessor.ArrayList
import com.daml.lf.testing.parser.Implicits._
import com.daml.lf.transaction.test.TransactionBuilder.Implicits.{defaultPackageId => _, _}
private[this] implicit val defaultPackageId: Ref.PackageId =
defaultParserParameters.defaultPackageId

View File

@ -391,6 +391,7 @@ private[lf] object Pretty {
import com.daml.lf.language.Ast._
import com.daml.lf.speedy.SExpr._
def prettyAlt(index: Int)(alt: SCaseAlt): Doc = {
val (pat, newIndex) = alt.pattern match {
case SCPNil => (text("nil"), index)

View File

@ -25,6 +25,7 @@ class SpeedyTest extends AnyWordSpec with Matchers {
import SpeedyTest._
import defaultParserParameters.{defaultPackageId => pkgId}
def qualify(name: String) = Identifier(pkgId, QualifiedName.assertFromString(name))
val pkgs = typeAndCompile(p"")

View File

@ -84,6 +84,7 @@ object TypedValueGenerators {
import Value._, ValueGenerators.Implicits._, data.Utf8.ImplicitOrder._
import scalaz.std.anyVal._
val text = noCid(PT.Text, ValueText) { case ValueText(t) => t }
val int64 = noCid(PT.Int64, ValueInt64) { case ValueInt64(i) => i }
val unit = noCid(PT.Unit, (_: Unit) => ValueUnit) { case ValueUnit => () }

View File

@ -44,6 +44,7 @@ object UsedTypeParams {
import VarianceConstraint.BaseResolution
import Variance._
private[this] type TVar = Ref.Name
final class ResolvedVariance private (private val prior: Map[Identifier, ImmArraySeq[Variance]]) {

View File

@ -85,6 +85,7 @@ class ContractDaoTest
object ContractDaoTest {
import org.scalacheck.Arbitrary, Arbitrary.arbitrary
import ContractDao.Lagginess
implicit def `arb Lagginess`[TpId: Arbitrary, Off: Arbitrary]: Arbitrary[Lagginess[TpId, Off]] =
Arbitrary(arbitrary[(Set[TpId], Set[TpId], Off)].map((Lagginess[TpId, Off] _).tupled))
}

View File

@ -37,6 +37,7 @@ import scala.util.{Failure, Success, Try}
class Server(config: Config) extends StrictLogging {
import com.daml.auth.middleware.api.JsonProtocol._
import com.daml.auth.oauth2.api.JsonProtocol._
implicit private val unmarshal: Unmarshaller[String, Uri] = Unmarshaller.strict(Uri(_))
private def toRedirectUri(uri: Uri) =