update scalafmt settings

.scalafmt.conf

@@ -1,6 +1,6 @@
 version = 3.8.3
 
-runner.dialect = scala213
+runner.dialect = scala213source3
 project.layout = standardConvention
 project.git = true
 
@@ -18,3 +18,5 @@ indentOperator.preset = spray
 
 rewrite.rules = [RedundantBraces, RedundantParens, SortImports, SortModifiers, PreferCurlyFors]
 rewrite.redundantBraces.maxLines = 5
+rewrite.scala3.convertToNewSyntax = true
+rewrite.scala3.newSyntax.control = false

examples/src/main/scala/org/parboiled2/examples/ABCParser.scala

@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object ABCParser extends App {
   repl()

examples/src/main/scala/org/parboiled2/examples/Calculator1.scala

@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object Calculator1 extends App {
   repl()

examples/src/main/scala/org/parboiled2/examples/Calculator2.scala

@@ -19,7 +19,7 @@ package org.parboiled2.examples
 import scala.annotation.tailrec
 import scala.util.{Failure, Success}
 import scala.io.StdIn
-import org.parboiled2._
+import org.parboiled2.*
 
 object Calculator2 extends App {
   repl()
@@ -65,7 +65,7 @@ object Calculator2 extends App {
   * for them, to be evaluated in a separate phase, after parsing is completed.
   */
 class Calculator2(val input: ParserInput) extends Parser {
-  import Calculator2._
+  import Calculator2.*
 
   def InputLine = rule(Expression ~ EOI)
 

examples/src/main/scala/org/parboiled2/examples/CsvParser.scala

@@ -17,7 +17,7 @@
 package org.parboiled2.examples
 
 import scala.collection.immutable
-import org.parboiled2._
+import org.parboiled2.*
 
 object CsvParser {
 
@@ -43,7 +43,7 @@ object CsvParser {
   */
 class CsvParser(val input: ParserInput, headerPresent: Boolean, fieldDelimiter: Char)
     extends Parser with StringBuilding {
-  import CsvParser._
+  import CsvParser.*
 
   val TEXTDATA = `TEXTDATA-BASE` -- fieldDelimiter
 

examples/src/main/scala/org/parboiled2/examples/JsonParser.scala

@@ -17,22 +17,22 @@
 package org.parboiled2.examples
 
 import scala.annotation.switch
-import org.parboiled2._
-import spray.json.{ParserInput => _, _}
+import org.parboiled2.*
+import spray.json.{ParserInput as _, *}
 
 /** This is a feature-complete JSON parser implementation that almost directly
   * models the JSON grammar presented at http://www.json.org as a parboiled2 PEG parser.
   */
 class JsonParser(val input: ParserInput) extends Parser with StringBuilding {
   import CharPredicate.{Digit, Digit19, HexDigit}
-  import JsonParser._
+  import JsonParser.*
 
   // the root rule
   def Json = rule(WhiteSpace ~ Value ~ EOI)
 
   def JsonObject: Rule1[JsObject] =
     rule {
-      ws('{') ~ zeroOrMore(Pair).separatedBy(ws(',')) ~ ws('}') ~> ((fields: Seq[JsField]) => JsObject(fields: _*))
+      ws('{') ~ zeroOrMore(Pair).separatedBy(ws(',')) ~ ws('}') ~> ((fields: Seq[JsField]) => JsObject(fields*))
     }
 
   def Pair = rule(JsonStringUnwrapped ~ ws(':') ~ Value ~> ((_, _)))
@@ -62,7 +62,7 @@ class JsonParser(val input: ParserInput) extends Parser with StringBuilding {
 
   def JsonNumber = rule(capture(Integer ~ optional(Frac) ~ optional(Exp)) ~> (JsNumber(_)) ~ WhiteSpace)
 
-  def JsonArray = rule(ws('[') ~ zeroOrMore(Value).separatedBy(ws(',')) ~ ws(']') ~> (JsArray(_: _*)))
+  def JsonArray = rule(ws('[') ~ zeroOrMore(Value).separatedBy(ws(',')) ~ ws(']') ~> (JsArray(_*)))
 
   def Characters = rule(zeroOrMore(NormalChar | '\\' ~ EscapedChar))
 

examples/src/test/scala/org/parboiled2/examples/CsvParserSpec.scala

@@ -17,7 +17,7 @@
 package org.parboiled2.examples
 
 import org.parboiled2.examples.CsvParser.{CsvFile, Record}
-import utest._
+import utest.*
 
 object CsvParserSpec extends TestSuite {
 

examples/src/test/scala/org/parboiled2/examples/JsonParserSpec.scala

@@ -17,9 +17,9 @@
 package org.parboiled2.examples
 
 import scala.util.{Failure, Success}
-import utest._
-import spray.json.{JsonParser => _, _}
-import org.parboiled2._
+import utest.*
+import spray.json.{JsonParser as _, *}
+import org.parboiled2.*
 
 object JsonParserSpec extends TestSuite {
 

parboiled-core/src/main/scala-3/org/parboiled2/ParserMacros.scala

@@ -44,8 +44,8 @@ private[parboiled2] trait RuleRunnable {
 }
 
 object ParserMacros {
-  import scala.quoted._
-  import scala.compiletime._
+  import scala.quoted.*
+  import scala.compiletime.*
 
   // TODO: the `R` type parameter is a workaround for https://github.com/lampepfl/dotty/issues/13376
   // Discussion at https://github.com/sirthias/parboiled2/pull/274#issuecomment-904926294

parboiled-core/src/main/scala-3/org/parboiled2/support/HListable.scala

@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 trait HListable[T] {
   type Out <: HList

parboiled-core/src/main/scala-3/org/parboiled2/support/OpTreeContext.scala

@@ -16,10 +16,10 @@
 
 package org.parboiled2.support
 
-import org.parboiled2._
+import org.parboiled2.*
 import org.parboiled2.support.hlist.HList
 
-import scala.quoted._
+import scala.quoted.*
 import scala.annotation.tailrec
 
 class OpTreeContext(parser: Expr[Parser])(using Quotes) {
@@ -502,7 +502,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
   }
   private case class DropAction(tpe: Type[?]) extends OpTree {
     def render(wrapped: Boolean): Expr[Boolean] = {
-      import support.hlist._
+      import support.hlist.*
       val body =
         tpe match {
           case '[Unit] => '{}
@@ -578,7 +578,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
               try $parser.__registerMismatch()
               catch {
                 case org.parboiled2.Parser.StartTracingException =>
-                  import org.parboiled2.RuleTrace._
+                  import org.parboiled2.RuleTrace.*
                   $parser.__bubbleUp(
                     NonTerminal(org.parboiled2.RuleTrace.StringMatch($stringTree), -${ Expr(ix) }) :: Nil,
                     org.parboiled2.RuleTrace.CharMatch($ch)
@@ -645,7 +645,7 @@ class OpTreeContext(parser: Expr[Parser])(using Quotes) {
               try $parser.__registerMismatch()
               catch {
                 case org.parboiled2.Parser.StartTracingException =>
-                  import org.parboiled2.RuleTrace._
+                  import org.parboiled2.RuleTrace.*
                   $parser.__bubbleUp(
                     NonTerminal(org.parboiled2.RuleTrace.IgnoreCaseString($stringTree), -${ Expr(ix) }) :: Nil,
                     org.parboiled2.RuleTrace.IgnoreCaseChar($ch)

parboiled-core/src/main/scala-3/org/parboiled2/support/TailSwitch.scala

@@ -16,7 +16,7 @@
 
 package org.parboiled2.support
 
-import hlist._
+import hlist.*
 
 import scala.annotation.implicitNotFound
 

parboiled-core/src/main/scala/org/parboiled2/CharPredicate.scala

@@ -20,7 +20,7 @@ import scala.annotation.tailrec
 import scala.collection.immutable.NumericRange
 
 sealed abstract class CharPredicate {
-  import CharPredicate._
+  import CharPredicate.*
   def apply(char: Char): Boolean
 
   /** Determines wether this CharPredicate is an instance of the high-performance,
@@ -251,7 +251,7 @@ object CharPredicate {
   }
 
   class ArrayBased private[CharPredicate] (private val chars: Array[Char]) extends CharPredicate {
-    import java.util.Arrays._
+    import java.util.Arrays.*
     sort(chars)
 
     // TODO: switch to faster binary search algorithm with an adaptive pivot, e.g. http://ochafik.com/blog/?p=106

parboiled-core/src/main/scala/org/parboiled2/CharUtils.scala

@@ -16,7 +16,7 @@
 
 package org.parboiled2
 
-import java.lang.{StringBuilder => JStringBuilder}
+import java.lang.StringBuilder as JStringBuilder
 import scala.annotation.tailrec
 
 object CharUtils {

parboiled-core/src/main/scala/org/parboiled2/ErrorFormatter.scala

@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.tailrec
-import java.lang.{StringBuilder => JStringBuilder}
+import java.lang.StringBuilder as JStringBuilder
 
 /** Abstraction for error formatting logic.
   * Instantiate with a custom configuration or override with custom logic.
@@ -53,7 +53,7 @@ class ErrorFormatter(
     */
   def format(sb: JStringBuilder, error: ParseError, input: ParserInput): JStringBuilder = {
     formatProblem(sb, error, input)
-    import error._
+    import error.*
     if (showExpected) formatExpected(sb, error)
     if (showPosition) sb.append(" (line ").append(position.line).append(", column ").append(position.column).append(')')
     if (showLine) formatErrorLine(sb.append(':').append('\n'), error, input)
@@ -87,7 +87,7 @@ class ErrorFormatter(
     // reaches further than the PEL. In these cases we want to show the complete inner match as "mismatched",
     // not just the piece up to the PEL. This is what this method corrects for.
     error.effectiveTraces.foldLeft(error.principalPosition.index - error.position.index + 1) { (len, trace) =>
-      import RuleTrace._
+      import RuleTrace.*
       trace.terminal match {
         case NotPredicate(_, x) =>
           math.max(trace.prefix.collectFirst { case NonTerminal(Atomic, off) => off + x } getOrElse x, len)
@@ -146,7 +146,7 @@ class ErrorFormatter(
     * the given error's position in the line with a caret.
     */
   def formatErrorLine(sb: JStringBuilder, error: ParseError, input: ParserInput): JStringBuilder = {
-    import error.position._
+    import error.position.*
     val (expandedCol, expandedLine) = expandErrorLineTabs(input getLine line, column)
     sb.append(expandedLine).append('\n')
     for (i <- 1 until expandedCol) sb.append(' ')
@@ -174,11 +174,11 @@ class ErrorFormatter(
   /** Formats a [[Vector]] of [[RuleTrace]] instances into a String.
     */
   def formatTraces(error: ParseError): String = {
-    import error._
+    import error.*
     traces
       .map(formatTrace(_, position.index))
       .mkString(
-        s"${traces.size} rule${(if (traces.size != 1) "s" else "")}" +
+        s"${traces.size} rule${if (traces.size != 1) "s" else ""}" +
           " mismatched at error location:\n  ",
         "\n  ",
         "\n"
@@ -188,7 +188,7 @@ class ErrorFormatter(
   /** Formats a [[RuleTrace]] into a String.
     */
   def formatTrace(trace: RuleTrace, errorIndex: Int): String = {
-    import RuleTrace._
+    import RuleTrace.*
     val sb                                            = new JStringBuilder
     val doSep: String => JStringBuilder               = sb.append
     val dontSep: String => JStringBuilder             = _ => sb
@@ -225,7 +225,7 @@ class ErrorFormatter(
       nonTerminal: RuleTrace.NonTerminal,
       showFrameStartOffset: Boolean = showFrameStartOffset
   ): String = {
-    import RuleTrace._
+    import RuleTrace.*
     import CharUtils.escape
     val keyString = nonTerminal.key match {
       case Action              => "<action>"
@@ -252,7 +252,7 @@ class ErrorFormatter(
   }
 
   def formatTerminal(terminal: RuleTrace.Terminal): String = {
-    import RuleTrace._
+    import RuleTrace.*
     import CharUtils.escape
     terminal match {
       case ANY                                       => "ANY"

parboiled-core/src/main/scala/org/parboiled2/ParseError.scala

@@ -57,7 +57,7 @@ object Position {
 }
 
 case class RuleTrace(prefix: List[RuleTrace.NonTerminal], terminal: RuleTrace.Terminal) {
-  import RuleTrace._
+  import RuleTrace.*
 
   /** Returns a RuleTrace starting with the first [[RuleTrace.Atomic]] element or the first sub-trace whose
     * offset from the reported error index is zero (e.g. the [[RuleTrace.Terminal]]).

parboiled-core/src/main/scala/org/parboiled2/Parser.scala

@@ -21,12 +21,12 @@ import scala.collection.immutable.VectorBuilder
 import scala.collection.mutable
 import scala.util.{Failure, Success, Try}
 import scala.util.control.{NoStackTrace, NonFatal}
-import org.parboiled2.support.hlist._
-import org.parboiled2.support._
+import org.parboiled2.support.hlist.*
+import org.parboiled2.support.*
 
 abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int = 1024)
     extends RuleDSL with ParserMacroMethods {
-  import Parser._
+  import Parser.*
 
   require(maxValueStackSize <= 65536, "`maxValueStackSize` > 2^16 is not supported") // due to current snapshot design
 
@@ -354,7 +354,7 @@ abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int =
         try __registerMismatch()
         catch {
           case Parser.StartTracingException =>
-            import RuleTrace._
+            import RuleTrace.*
             __bubbleUp(NonTerminal(StringMatch(string), -ix) :: Nil, CharMatch(string charAt ix))
         }
     else true
@@ -381,7 +381,7 @@ abstract class Parser(initialValueStackSize: Int = 16, maxValueStackSize: Int =
         try __registerMismatch()
         catch {
           case Parser.StartTracingException =>
-            import RuleTrace._
+            import RuleTrace.*
             __bubbleUp(NonTerminal(IgnoreCaseString(string), -ix) :: Nil, IgnoreCaseChar(string charAt ix))
         }
     else true

parboiled-core/src/main/scala/org/parboiled2/Rule.scala

@@ -19,7 +19,7 @@ package org.parboiled2
 import scala.annotation.unchecked.uncheckedVariance
 import scala.annotation.compileTimeOnly
 import scala.collection.immutable
-import org.parboiled2.support._
+import org.parboiled2.support.*
 import org.parboiled2.support.hlist.HList
 
 sealed trait RuleX

parboiled-core/src/main/scala/org/parboiled2/RuleDSLActions.scala

@@ -18,8 +18,8 @@ package org.parboiled2
 
 import scala.annotation.compileTimeOnly
 import org.parboiled2.support.hlist.ops.hlist.Prepend
-import org.parboiled2.support._
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.*
+import org.parboiled2.support.hlist.*
 
 trait RuleDSLActions {
 

parboiled-core/src/main/scala/org/parboiled2/RuleDSLBasics.scala

@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.compileTimeOnly
-import org.parboiled2.support._
+import org.parboiled2.support.*
 import org.parboiled2.support.hlist.HList
 
 trait RuleDSLBasics {

parboiled-core/src/main/scala/org/parboiled2/RuleDSLCombinators.scala

@@ -18,8 +18,8 @@ package org.parboiled2
 
 import scala.annotation.compileTimeOnly
 import scala.collection.immutable
-import org.parboiled2.support._
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.*
+import org.parboiled2.support.hlist.*
 
 trait RuleDSLCombinators {
 

parboiled-core/src/main/scala/org/parboiled2/ValueStack.scala

@@ -17,7 +17,7 @@
 package org.parboiled2
 
 import scala.annotation.tailrec
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 
 /** A mutable untyped stack of values.
   * In most cases you won't have to access its API directly since parboiled2's DSL

parboiled-core/src/main/scala/org/parboiled2/package.scala

@@ -16,7 +16,7 @@
 
 package org
 
-import org.parboiled2.support.hlist._
+import org.parboiled2.support.hlist.*
 import java.nio.charset.Charset
 
 package object parboiled2 {