Rewrite to indent 2

compiler/src/dotty/tools/backend/jvm/CodeGen.scala

@@ -103,7 +103,7 @@ class CodeGen(val int: DottyBackendInterface, val primitives: DottyPrimitives)(
     GeneratedDefs(generatedClasses.toList, generatedTasty.toList)
 
   // Creates a callback that will be evaluated in PostProcessor after creating a file
-  private def onFileCreated(cls: ClassNode, claszSymbol: Symbol, sourceFile: interfaces.SourceFile): AbstractFile => Unit = clsFile =>
+  private def onFileCreated(cls: ClassNode, claszSymbol: Symbol, sourceFile: interfaces.SourceFile): AbstractFile => Unit = clsFile => {
     val (fullClassName, isLocal) = atPhase(sbtExtractDependenciesPhase):
       (ExtractDependencies.classNameAsString(claszSymbol), claszSymbol.isLocal)
 
@@ -116,6 +116,7 @@ class CodeGen(val int: DottyBackendInterface, val primitives: DottyPrimitives)(
       val cb = ctx.sbtCallback
       if (isLocal) cb.generatedLocalClass(jSourceFile, clsFile.file)
       else cb.generatedNonLocalClass(jSourceFile, clsFile.file, className, fullClassName)
+  }
 
   /** Convert a `dotty.tools.io.AbstractFile` into a
    *  `dotty.tools.dotc.interfaces.AbstractFile`.

compiler/src/dotty/tools/dotc/classpath/AggregateClassPath.scala

@@ -127,8 +127,10 @@ case class AggregateClassPath(aggregates: Seq[ClassPath]) extends ClassPath:
       cp <- aggregates
       entry <- getEntries(cp) if !seenNames.contains(entry.name)
     }
+    {
       entriesBuffer += entry
       seenNames += entry.name
+    }
     entriesBuffer.toIndexedSeq
 
 object AggregateClassPath:

compiler/src/dotty/tools/dotc/core/Comments.scala

@@ -10,7 +10,7 @@ import util.{SourceFile, ReadOnlyMap}
 import util.Spans._
 import util.CommentParsing._
 import util.Property.Key
-import parsing.Parsers.Parser
+import parsing.Parsers
 import reporting.ProperDefinitionNotFound
 
 object Comments:
@@ -118,7 +118,7 @@ object Comments:
   object UseCase:
     def apply(code: String, codePos: Span)(using Context): UseCase =
       val tree =
-        val tree = new Parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
+        val tree = Parsers.parser(SourceFile.virtual("<usecase>", code)).localDef(codePos.start)
         tree match
           case tree: untpd.DefDef =>
             val newName = ctx.compilationUnit.freshNames.newName(tree.name, NameKinds.DocArtifactName)

compiler/src/dotty/tools/dotc/inlines/Inlines.scala

@@ -12,7 +12,7 @@ import SymDenotations.SymDenotation
 import config.Printers.inlining
 import ErrorReporting.errorTree
 import dotty.tools.dotc.util.{SourceFile, SourcePosition, SrcPos}
-import parsing.Parsers.Parser
+import parsing.Parsers
 import transform.{PostTyper, Inlining, CrossVersionChecks}
 import staging.StagingLevel
 
@@ -323,7 +323,7 @@ object Inlines:
         case ConstantType(Constant(code: String)) =>
           val source2 = SourceFile.virtual("tasty-reflect", code)
           inContext(ctx.fresh.setNewTyperState().setTyper(new Typer(ctx.nestingLevel + 1)).setSource(source2)):
-            val tree2 = new Parser(source2).block()
+            val tree2 = Parsers.parser(source2).block()
             if ctx.reporter.allErrors.nonEmpty then
               ctx.reporter.allErrors.map((ErrorKind.Parser, _))
             else

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

@@ -27,7 +27,7 @@ class Parser extends Phase:
     unit.untpdTree =
       if (unit.isJava) new JavaParsers.JavaParser(unit.source).parse()
       else
-        val p = new Parsers.Parser(unit.source)
+        val p = Parsers.parser(unit.source)
         //  p.in.debugTokenStream = true
         val tree = p.parse()
         if (p.firstXmlPos.exists && !firstXmlPos.exists)