ScalafmtRunner: always allow top-level terms

The formatter's job is not to validate code but to format it.
scalameta · Oct 31, 2022 · 8266921 · 8266921
1 parent e71daa6
commit 8266921
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 20 deletions.
diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtConfig.scala
@@ -177,7 +177,7 @@ case class ScalafmtConfig(
   )
 
   def forSbt: ScalafmtConfig =
-    copy(runner = runner.forSbt, rewrite = rewrite.forSbt)
+    copy(rewrite = rewrite.forSbt)
 
   private lazy val expandedFileOverride = Try {
     val langPrefix = "lang:"
@@ -237,7 +237,7 @@ case class ScalafmtConfig(
   private[scalafmt] lazy val docstringsWrapMaxColumn: Int =
     docstrings.wrapMaxColumn.getOrElse(maxColumn)
 
-  @inline private[scalafmt] def dialect = runner.getDialect
+  @inline private[scalafmt] def dialect = runner.getDialectForParser
 
   private[scalafmt] def getTrailingCommas = rewrite.trailingCommas.style
 

diff --git a/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtRunner.scala b/scalafmt-core/shared/src/main/scala/org/scalafmt/config/ScalafmtRunner.scala
@@ -28,17 +28,17 @@ case class ScalafmtRunner(
     fatalWarnings: Boolean = false
 ) {
   @inline private[scalafmt] def getDialect = dialect.dialect
+  private[scalafmt] lazy val getDialectForParser: Dialect =
+    getDialect.withAllowToplevelTerms(true).withAllowToplevelStatements(true)
   @inline private[scalafmt] def dialectName = {
     val name = dialect.name
     if (dialectOverride.values.isEmpty) name else s"$name [with overrides]"
   }
   @inline private[scalafmt] def getParser = parser.parse
 
-  @inline private def topLevelDialect = dialect.copy(
-    dialect = getDialect
-      .withAllowToplevelTerms(true)
-      .withToplevelSeparator("")
-  )
+  @inline
+  def withDialect(dialect: sourcecode.Text[Dialect]): ScalafmtRunner =
+    withDialect(NamedDialect(dialect))
 
   @inline
   private[scalafmt] def withDialect(dialect: NamedDialect): ScalafmtRunner =
@@ -48,11 +48,8 @@ case class ScalafmtRunner(
   private[scalafmt] def withParser(parser: ScalafmtParser): ScalafmtRunner =
     copy(parser = parser)
 
-  def forSbt: ScalafmtRunner = withDialect(topLevelDialect)
-
   private[scalafmt] def forCodeBlock: ScalafmtRunner = copy(
     debug = false,
-    dialect = topLevelDialect,
     eventCallback = null,
     parser = ScalafmtParser.Source
   )
@@ -64,7 +61,7 @@ case class ScalafmtRunner(
     if (null != eventCallback) evts.foreach(eventCallback)
 
   def parse(input: meta.inputs.Input): Parsed[_ <: Tree] =
-    getParser(input, getDialect)
+    getParser(input, getDialectForParser)
 
   @inline def isDefaultDialect = dialect.name == NamedDialect.defaultName
 
@@ -85,7 +82,7 @@ object ScalafmtRunner {
     maxStateVisits = 1000000
   )
 
-  val sbt = default.forSbt
+  val sbt = default.withDialect(meta.dialects.Sbt)
 
   implicit val encoder: ConfEncoder[ScalafmtRunner] =
     generic.deriveEncoder

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/util/ErrorTest.scala b/scalafmt-tests/src/test/scala/org/scalafmt/util/ErrorTest.scala
@@ -5,13 +5,13 @@ import org.scalafmt.Scalafmt
 import munit.FunSuite
 
 class ErrorTest extends FunSuite {
-  test("errors are caught") {
-    val nonSourceFile = Seq(
-      "class A {",
-      "val x = 1",
-      "println(1)"
-    )
-    nonSourceFile.foreach { original =>
+  private val nonSourceFile = Seq(
+    "class A {",
+    "val x + 1",
+    "println 1"
+  )
+  nonSourceFile.foreach { original =>
+    test(s"errors are caught: $original") {
       Scalafmt.format(original, HasTests.unitTest40) match {
         case _: Formatted.Success => fail("expected failure, got success")
         case _ =>

diff --git a/scalafmt-tests/src/test/scala/org/scalafmt/util/FormatAssertions.scala b/scalafmt-tests/src/test/scala/org/scalafmt/util/FormatAssertions.scala
@@ -22,7 +22,7 @@ trait FormatAssertions {
   ): Unit =
     assertFormatPreservesAst(filename, original, obtained)(
       runner.getParser,
-      runner.getDialect
+      runner.getDialectForParser
     )
 
   def assertFormatPreservesAst[T <: Tree](