Merge pull request #8264 from dotty-staging/fix-#8256

Fix #8256: Disallow silent indent for template bodies

Author: odersky

community-build/community-projects/intent

@@ -31,7 +31,7 @@ def exec(projectDir: Path, binary: String, arguments: String*): Int =
   exitCode
 
 
-sealed trait CommunityProject
+sealed trait CommunityProject:
   private var published = false
 
   val project: String
@@ -77,17 +77,23 @@ sealed trait CommunityProject
       published = true
 end CommunityProject
 
-final case class MillCommunityProject(project: String, baseCommand: String,
-  dependencies: List[CommunityProject] = Nil) extends CommunityProject
+final case class MillCommunityProject(
+    project: String,
+    baseCommand: String,
+    dependencies: List[CommunityProject] = Nil) extends CommunityProject:
   override val binaryName: String = "./mill"
   override val updateCommand = s"$baseCommand.compileClasspath"
   override val testCommand = s"$baseCommand.test"
   override val publishCommand = s"$baseCommand.publishLocal"
   override val runCommandsArgs = List("-i", "-D", s"dottyVersion=$compilerVersion")
 
-final case class SbtCommunityProject(project: String, sbtTestCommand: String,
-  sbtUpdateCommand: String, extraSbtArgs: List[String] = Nil,
-  dependencies: List[CommunityProject] = Nil, sbtPublishCommand: String = null) extends CommunityProject
+final case class SbtCommunityProject(
+    project: String,
+    sbtTestCommand: String,
+    sbtUpdateCommand: String,
+    extraSbtArgs: List[String] = Nil,
+    dependencies: List[CommunityProject] = Nil,
+    sbtPublishCommand: String = null) extends CommunityProject:
   override val binaryName: String = "sbt"
   private val baseCommand = s";clean ;set updateOptions in Global ~= (_.withLatestSnapshots(false)) ;++$compilerVersion! "
   override val testCommand = s"$baseCommand$sbtTestCommand"
@@ -103,7 +109,7 @@ final case class SbtCommunityProject(project: String, sbtTestCommand: String,
       "-sbt-version", "1.3.6",
       s"--addPluginSbtFile=$sbtPluginFilePath")
 
-object projects
+object projects:
   lazy val utest = MillCommunityProject(
     project = "utest",
     baseCommand = s"utest.jvm[$compilerVersion]",
@@ -265,7 +271,7 @@ object projects
 end projects
 
 @Category(Array(classOf[TestCategory]))
-class CommunityBuildTest {
+class CommunityBuildTest:
   given CommunityBuildTest = this
 
   /** Build the given project with the published local compiler and sbt plugin.
@@ -335,7 +341,7 @@ class CommunityBuildTest {
   @Test def xmlInterpolator = projects.xmlInterpolator.run()
   @Test def effpi = projects.effpi.run()
   @Test def sconfig = projects.sconfig.run()
-}
+end CommunityBuildTest
 
 class TestCategory
 class UpdateCategory

community-build/test/scala/dotty/communitybuild/CommunityBuildTest.scala

@@ -160,9 +160,6 @@ object Config {
   /** Assume -indent by default */
   final val defaultIndent = true
 
-  /** Assume indentation is significant after a class, object, ... signature */
-  final val silentTemplateIndent = true
-
   /** If set, prints a trace of all symbol completions */
   final val showCompletions = false
 

compiler/src/dotty/tools/dotc/config/Config.scala

@@ -26,7 +26,6 @@ import Decorators._
 import scala.internal.Chars
 import scala.annotation.{tailrec, switch}
 import rewrites.Rewrites.{patch, overlapsPatch}
-import config.Config.silentTemplateIndent
 
 object Parsers {
 
@@ -1319,7 +1318,6 @@ object Parsers {
         if in.token != LBRACE && in.token != INDENT then
           syntaxError(i"indented definitions or `{` expected")
       else
-        if silentTemplateIndent && !isNew then in.observeIndented()
         newLineOptWhenFollowedBy(LBRACE)
 
     def endMarkerScope[T](pid: Tree)(op: => T): T = pid match {

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -197,7 +197,7 @@ object Inliner {
 
   object Intrinsics {
     import dotty.tools.dotc.reporting.diagnostic.messages.Error
-    private enum ErrorKind
+    private enum ErrorKind:
       case Parser, Typer
 
     private def compileForErrors(tree: Tree, stopAfterParser: Boolean)(using ctx: Context): List[(ErrorKind, Error)] =

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -16,13 +16,13 @@ import config.Printers.nullables
 import ast.{tpd, untpd}
 
 /** Operations for implementing a flow analysis for nullability */
-object Nullables with
+object Nullables:
   import ast.tpd._
 
   /** A set of val or var references that are known to be not null, plus a set of
    *  variable references that are not known (anymore) to be not null
    */
-  case class NotNullInfo(asserted: Set[TermRef], retracted: Set[TermRef])
+  case class NotNullInfo(asserted: Set[TermRef], retracted: Set[TermRef]):
     assert((asserted & retracted).isEmpty)
 
     def isEmpty = this eq NotNullInfo.empty
@@ -43,18 +43,18 @@ object Nullables with
     def alt(that: NotNullInfo): NotNullInfo =
       NotNullInfo(this.asserted.intersect(that.asserted), this.retracted.union(that.retracted))
 
-  object NotNullInfo with
+  object NotNullInfo:
     val empty = new NotNullInfo(Set(), Set())
     def apply(asserted: Set[TermRef], retracted: Set[TermRef]): NotNullInfo =
       if asserted.isEmpty && retracted.isEmpty then empty
       else new NotNullInfo(asserted, retracted)
   end NotNullInfo
 
   /** A pair of not-null sets, depending on whether a condition is `true` or `false` */
-  case class NotNullConditional(ifTrue: Set[TermRef], ifFalse: Set[TermRef]) with
+  case class NotNullConditional(ifTrue: Set[TermRef], ifFalse: Set[TermRef]):
     def isEmpty = this eq NotNullConditional.empty
 
-  object NotNullConditional with
+  object NotNullConditional:
     val empty = new NotNullConditional(Set(), Set())
     def apply(ifTrue: Set[TermRef], ifFalse: Set[TermRef]): NotNullConditional =
       if ifTrue.isEmpty && ifFalse.isEmpty then empty
@@ -72,7 +72,7 @@ object Nullables with
   private[typer] val NNInfo = Property.StickyKey[NotNullInfo]
 
   /** An extractor for null comparisons */
-  object CompareNull with
+  object CompareNull:
 
     /** Matches one of
      *
@@ -97,7 +97,7 @@ object Nullables with
   end CompareNull
 
   /** An extractor for null-trackable references */
-  object TrackedRef
+  object TrackedRef:
     def unapply(tree: Tree)(using Context): Option[TermRef] = tree.typeOpt match
       case ref: TermRef if isTracked(ref) => Some(ref)
       case _ => None
@@ -160,7 +160,7 @@ object Nullables with
     // TODO: Add constant pattern if the constant type is not nullable
     case _ => false
 
-  extension notNullInfoOps on (infos: List[NotNullInfo]) with
+  extension notNullInfoOps on (infos: List[NotNullInfo]):
 
     /** Do the current not-null infos imply that `ref` is not null?
      *  Not-null infos are as a history where earlier assertions and retractions replace
@@ -191,7 +191,7 @@ object Nullables with
       infos.extendWith(NotNullInfo(Set(), mutables))
   // end notNullInfoOps
 
-  extension refOps on (ref: TermRef) with
+  extension refOps on (ref: TermRef):
 
     /** Is the use of a mutable variable out of order
      *
@@ -245,7 +245,7 @@ object Nullables with
       && refOwner.isTerm
       && recur(curCtx.owner)
 
-  extension treeOps on (tree: Tree) with
+  extension treeOps on (tree: Tree):
 
     /* The `tree` with added nullability attachment */
     def withNotNullInfo(info: NotNullInfo): tree.type =
@@ -335,7 +335,7 @@ object Nullables with
           tree.computeNullable()
       }.traverse(tree)
 
-  extension assignOps on (tree: Assign) with
+  extension assignOps on (tree: Assign):
     def computeAssignNullable()(using Context): tree.type = tree.lhs match
       case TrackedRef(ref) =>
         val rhstp = tree.rhs.typeOpt

compiler/src/dotty/tools/dotc/typer/Nullables.scala

@@ -4,7 +4,7 @@ import reflect.ClassTag
 /** An immutable array. An `IArray[T]` has the same representation as an `Array[T]`,
  *  but it cannot be updated. Unlike regular arrays, immutable arrays are covariant.
  */
-object opaques
+object opaques:
   opaque type IArray[+T] = Array[_ <: T]
 
   /** Defines extension methods for immutable arrays */

library/src/scala/IArray.scala

@@ -8,14 +8,12 @@ import scala.annotation.implicitNotFound
  *  @tparam G a tupled function type (function of arity 1 receiving a tuple as argument)
  */
 @implicitNotFound("${F} cannot be tupled as ${G}")
-sealed trait TupledFunction[F, G] {
+sealed trait TupledFunction[F, G]:
   def tupled(f: F): G
   def untupled(g: G): F
-}
 
-private[scala] object TupledFunction
+private[scala] object TupledFunction:
   def apply[F, G](tupledImpl: F => G, untupledImpl: G => F): TupledFunction[F, G] =
-    new TupledFunction[F, G] {
+    new TupledFunction[F, G]:
       def tupled(f: F): G = tupledImpl(f)
       def untupled(g: G): F = untupledImpl(g)
-    }

library/src/scala/TupledFunction.scala

@@ -2,6 +2,6 @@ package scala.compiletime.testing
 
 /** An error can be either a parse-time or a typecheck-time */
 sealed trait ErrorKind  // TODO make this enum, so far not doable because ScalaJS compilation fails on it
-object ErrorKind
+object ErrorKind:
   case object Parser extends ErrorKind
   case object Typer extends ErrorKind

library/src/scala/compiletime/testing/ErrorKind.scala

@@ -1560,30 +1560,28 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
 
   given (using ctx: Context) as IsInstanceOf[SimpleSelector] = internal.isInstanceOfSimpleSelector
 
-  object SimpleSelector
+  object SimpleSelector:
     def unapply(x: SimpleSelector)(using ctx: Context): Option[Id] = Some(x.selection)
 
-  extension renameSelectorOps on (self: RenameSelector) {
+  extension renameSelectorOps on (self: RenameSelector):
     def from(using ctx: Context): Id =
       internal.RenameSelector_from(self)
 
     def to(using ctx: Context): Id =
       internal.RenameSelector_to(self)
-  }
 
   given (using ctx: Context) as IsInstanceOf[RenameSelector] = internal.isInstanceOfRenameSelector
 
-  object RenameSelector
+  object RenameSelector:
     def unapply(x: RenameSelector)(using ctx: Context): Option[(Id, Id)] = Some((x.from, x.to))
 
-  extension omitSelectorOps on (self: OmitSelector) {
+  extension omitSelectorOps on (self: OmitSelector):
     def omitted(using ctx: Context): Id =
       internal.SimpleSelector_omitted(self)
-  }
 
   given (using ctx: Context) as IsInstanceOf[OmitSelector] = internal.isInstanceOfOmitSelector
 
-  object OmitSelector
+  object OmitSelector:
     def unapply(x: OmitSelector)(using ctx: Context): Option[Id] = Some(x.omitted)
 
 
@@ -1980,7 +1978,7 @@ class Reflection(private[scala] val internal: CompilerInterface) { self =>
 
   given (using ctx: Context) as IsInstanceOf[NoPrefix] = internal.isInstanceOfNoPrefix
 
-  object NoPrefix
+  object NoPrefix:
     def unapply(x: NoPrefix)(using ctx: Context): Boolean = true