Merge upstream

.git-blame-ignore-revs

@@ -15,3 +15,6 @@ c3b04b90d9863ca2c7b7e56bc0bda148ce392642
 
 # Scala Steward: Reformat with scalafmt 3.8.1
 cb6d4261c6253f685d50b24177064616e5d22143
+
+# Scala Steward: Reformat with scalafmt 3.9.8
+e316169276b40dbdc76142d03895233ba103f417

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.9.1
+version = 3.9.9
 
 project.layout=StandardConvention
 

build.sbt

@@ -55,7 +55,7 @@ lazy val api = crossProject(JVMPlatform, JSPlatform)
       )
     ),
     libraryDependencies ++= Seq(
-      "org.scala-lang.modules" %%% "scala-xml" % "2.3.0",
+      "org.scala-lang.modules" %%% "scala-xml" % "2.4.0",
       "org.scalatest"          %%% "scalatest" % ScalaTestVersion % Test,
     ) ++ (scalaVersion.value match {
       case v @ (Scala212 | Scala213) => Seq("org.scala-lang" % "scala-reflect" % v % "provided")
@@ -90,7 +90,7 @@ lazy val compiler = project
       }
     },
     libraryDependencies += parserCombinators(scalaVersion.value),
-    libraryDependencies += "org.scalameta" %% "parsers" % "4.13.4",
+    libraryDependencies += "org.scalameta" %% "parsers" % "4.13.9",
     run / fork                             := true,
     buildInfoKeys                          := Seq[BuildInfoKey](scalaVersion),
     buildInfoPackage                       := "play.twirl.compiler",
@@ -108,14 +108,14 @@ lazy val plugin = project
     name                                    := "sbt-typed-twirl",
     organization                            := "bondlink",
     scalaVersion                            := Scala212,
-    crossScalaVersions                      := Seq(Scala212, Scala36),
+    crossScalaVersions                      := Seq(Scala212, Scala37),
     libraryDependencies += "org.scalatest" %%% "scalatest" % ScalaTestVersion % Test,
-    pluginCrossBuild / sbtVersion := {
+    pluginCrossBuild / sbtVersion           := {
       scalaBinaryVersion.value match {
         case "2.12" =>
           sbtVersion.value
         case _ =>
-          "2.0.0-M4"
+          "2.0.0-RC6"
       }
     },
     Compile / resourceGenerators += generateVersionFile.taskValue,

compiler/src/main/scala/play/twirl/compiler/TwirlCompiler.scala

@@ -7,6 +7,7 @@ package play.twirl.compiler
 import java.io.File
 import scala.annotation.tailrec
 import scala.io.Codec
+import scala.meta.classifiers._
 import play.twirl.parser.TwirlIO
 import play.twirl.parser.TwirlParser
 import scala.util.parsing.input.Position
@@ -90,7 +91,7 @@ sealed trait AbstractGeneratedSource {
 
   def mapPosition(generatedPosition: Int): Int = {
     matrix.indexWhere(p => p._1 > generatedPosition) match {
-      case 0 => 0
+      case 0          => 0
       case i if i > 0 => {
         val pos = matrix(i - 1)
         pos._2 + (generatedPosition - pos._1)
@@ -104,7 +105,7 @@ sealed trait AbstractGeneratedSource {
 
   def mapLine(generatedLine: Int): Int = {
     lines.indexWhere(p => p._1 > generatedLine) match {
-      case 0 => 0
+      case 0          => 0
       case i if i > 0 => {
         val line = lines(i - 1)
         line._2 + (generatedLine - line._1)
@@ -153,7 +154,7 @@ case class GeneratedSource(file: File, codec: Codec = TwirlIO.defaultCodec) exte
 }
 
 case class GeneratedSourceVirtual(path: String) extends AbstractGeneratedSource {
-  var _content = ""
+  var _content                             = ""
   def setContent(newContent: String): Unit = {
     this._content = newContent
   }
@@ -163,11 +164,13 @@ case class GeneratedSourceVirtual(path: String) extends AbstractGeneratedSource
 object TwirlCompiler {
 
   // For constants that depend on Scala 2 or 3 mode.
-  private[compiler] class ScalaCompat(emitScala3Sources: Boolean) {
+  private[compiler] class ScalaCompat(val emitScala3Sources: Boolean) {
     val varargSplicesSyntax: String =
       if (emitScala3Sources) "*" else ": _*"
     def valueOrEmptyIfScala3Exceeding22Params(params: Int, value: => String): String =
       if (emitScala3Sources && params > 22) "" else value
+    val usingSyntax: String =
+      if (emitScala3Sources) "using " else ""
   }
 
   private[compiler] object ScalaCompat {
@@ -236,7 +239,7 @@ object TwirlCompiler {
       codec: Codec,
       inclusiveDot: Boolean
   ): Option[File] = {
-    val resultType = formatterType + ".Appendable"
+    val resultType                      = formatterType + ".Appendable"
     val (templateName, generatedSource) =
       generatedFile(source, codec, sourceDirectory, generatedDirectory, inclusiveDot)
     if (generatedSource.needRecompilation(additionalImports)) {
@@ -297,7 +300,7 @@ object TwirlCompiler {
   ): GeneratedSourceVirtual = {
 
     val (templateName, generatedSource) = generatedFileVirtual(source, sourceDirectory, inclusiveDot)
-    val generated = parseAndGenerateCode(
+    val generated                       = parseAndGenerateCode(
       templateName,
       content.getBytes(codec.charSet),
       codec,
@@ -462,7 +465,7 @@ object TwirlCompiler {
   // We need to double escape slashes, since it's a regex replacement
   private val escapedTripleQuote       = "\\\"" * 3
   private val doubleEscapedTripleQuote = "\\\\\"" * 3
-  private val tripleQuoteReplacement =
+  private val tripleQuoteReplacement   =
     escapedTripleQuote + " + \\\"" + doubleEscapedTripleQuote + "\\\" + " + escapedTripleQuote
   private def quoteAndEscape(text: String): collection.Seq[String] = {
     Seq(tripleQuote, text.replaceAll(tripleQuote, tripleQuoteReplacement), tripleQuote)
@@ -691,7 +694,7 @@ package """ :+ packageName :+ """
 
       val params: List[List[Term.Param]] =
         try {
-          val dialect = Dialect.current
+          val dialect = Dialect.current.withAllowGivenUsing(true)
           val input   = Input.String(s"object FT { def signature$signature }")
           val obj     = implicitly[Parse[Stat]].apply(input, dialect).get.asInstanceOf[Defn.Object]
           val templ   = obj.templ
@@ -715,6 +718,27 @@ package """ :+ packageName :+ """
         )
         .mkString(" => ") + " => " + returnType + ")"
 
+      val hasContextParameters =
+        params.flatten.exists(_.mods.exists(modifier => modifier.is[Mod.Implicit] || modifier.is[Mod.Using]))
+
+      val applyArgs = {
+        params.map { group =>
+          val groupStr = "(" + group
+            .map { p =>
+              p.name.toString + Option(p.decltpe.get.toString)
+                .filter(_.endsWith("*"))
+                .map(_ => s".toIndexedSeq${sc.varargSplicesSyntax}")
+                .getOrElse("")
+            }
+            .mkString(",") + ")"
+
+          // prepend "using" for Scala 3 context parameters on the last param
+          if (sc.emitScala3Sources && hasContextParameters && group == params.last)
+            groupStr.replace("(", s"(${sc.usingSyntax}")
+          else groupStr
+        }.mkString
+      }
+
       val renderCall = "def render%s: %s = apply%s".format(
         "(" + params.flatten
           .map {
@@ -723,18 +747,13 @@ package """ :+ packageName :+ """
           }
           .mkString(",") + ")",
         returnType,
-        params
-          .map(group =>
-            "(" + group
-              .map { p =>
-                p.name.toString + Option(p.decltpe.get.toString)
-                  .filter(_.endsWith("*"))
-                  .map(_ => s".toIndexedSeq${sc.varargSplicesSyntax}")
-                  .getOrElse("")
-              }
-              .mkString(",") + ")"
-          )
-          .mkString
+        applyArgs
+      )
+
+      val f = "def f:%s = %s => apply%s".format(
+        functionType,
+        params.map(group => "(" + group.map(_.name.toString).mkString(",") + ")").mkString(" => "),
+        applyArgs
       )
 
       val templateType = sc.valueOrEmptyIfScala3Exceeding22Params(
@@ -751,23 +770,6 @@ package """ :+ packageName :+ """
         )
       )
 
-      val f = "def f:%s = %s => apply%s".format(
-        functionType,
-        params.map(group => "(" + group.map(_.name.toString).mkString(",") + ")").mkString(" => "),
-        params
-          .map(group =>
-            "(" + group
-              .map { p =>
-                p.name.toString + Option(p.decltpe.get.toString)
-                  .filter(_.endsWith("*"))
-                  .map(_ => s".toIndexedSeq${sc.varargSplicesSyntax}")
-                  .getOrElse("")
-              }
-              .mkString(",") + ")"
-          )
-          .mkString
-      )
-
       (renderCall, f, templateType)
     }
 
@@ -810,7 +812,7 @@ object Source {
       lines: ListBuffer[(Int, Int)]
   ): Unit = {
     parts.foreach {
-      case s: String => source.append(s)
+      case s: String                                     => source.append(s)
       case Source(code, pos @ OffsetPosition(_, offset)) => {
         source.append("/*" + pos + "*/")
         positions += (source.length                -> offset)

compiler/src/test/resources/using.scala.html

@@ -0,0 +1,6 @@
+@*******************************************************************************************************************************************************************
+ * Copyright (C) from 2025 BondLink, 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com> *
+ *******************************************************************************************************************************************************************@
+
+@(x: String)(using y: String)
+@x @y

compiler/src/test/scala-2/play/twirl/compiler/test/Helper.scala

@@ -82,7 +82,7 @@ object Helper {
       def inject(constructorArgs: Any*): T = {
         classloader.loadClass(className).getConstructors match {
           case Array(single) => getF(single.newInstance(constructorArgs.asInstanceOf[Seq[AnyRef]]: _*))
-          case other =>
+          case other         =>
             throw new IllegalStateException(className + " does not declare exactly one constructor: " + other)
         }
       }
@@ -93,8 +93,8 @@ object Helper {
         className: String,
         additionalImports: Seq[String] = Nil
     ): CompiledTemplate[T] = {
-      val scalaVersion = play.twirl.compiler.BuildInfo.scalaVersion
-      val templateFile = new File(sourceDir, templateName)
+      val scalaVersion    = play.twirl.compiler.BuildInfo.scalaVersion
+      val templateFile    = new File(sourceDir, templateName)
       val Some(generated) = twirlCompiler.compile(
         templateFile,
         sourceDir,

compiler/src/test/scala-3/play/twirl/compiler/test/Helper.scala

@@ -49,7 +49,7 @@ object Helper {
       def inject(constructorArgs: Any*): T = {
         classloader.loadClass(className).getConstructors match {
           case Array(single) => getF(single.newInstance(constructorArgs.asInstanceOf[Seq[AnyRef]]*))
-          case other =>
+          case other         =>
             throw new IllegalStateException(className + " does not declare exactly one constructor: " + other)
         }
       }
@@ -60,8 +60,8 @@ object Helper {
         className: String,
         additionalImports: Seq[String] = Nil
     ): CompiledTemplate[T] = {
-      val scalaVersion = play.twirl.compiler.BuildInfo.scalaVersion
-      val templateFile = new File(sourceDir, templateName)
+      val scalaVersion               = play.twirl.compiler.BuildInfo.scalaVersion
+      val templateFile               = new File(sourceDir, templateName)
       val generatedOpt: Option[File] = twirlCompiler.compile(
         templateFile,
         sourceDir,
@@ -104,7 +104,7 @@ object Helper {
 
     class TestDriver(outDir: Path, compilerArgs: Array[String], path: Path) extends Driver {
       def compile(): Reporter = {
-        val setupOpt = setup(compilerArgs :+ path.toAbsolutePath.toString, initCtx.fresh)
+        val setupOpt             = setup(compilerArgs :+ path.toAbsolutePath.toString, initCtx.fresh)
         val (toCompile, rootCtx) = setupOpt.getOrElse {
           throw new Exception("Failed to initialize compiler")
         }