Merge pull request #1086 from scala-steward/update/2.0.x/parsers-4.14.2

[2.0.x] parsers 4.14.2 (was 4.13.10)

Author: mkurz

build.sbt

@@ -112,7 +112,7 @@ lazy val compiler = project
       }
     },
     libraryDependencies += parserCombinators(scalaVersion.value),
-    libraryDependencies += "org.scalameta" %% "parsers" % "4.13.10",
+    libraryDependencies += "org.scalameta" %% "parsers" % "4.14.2",
     run / fork                             := true,
     buildInfoKeys                          := Seq[BuildInfoKey](scalaVersion),
     buildInfoPackage                       := "play.twirl.compiler",

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

@@ -92,7 +92,12 @@ object Helper {
       val reporter = driver.compile()
 
       if (reporter.hasErrors) {
-        val error   = reporter.allErrors.sortBy(_.pos.point).head
+        val errorsSortedAll            = reporter.allErrors.sortBy(_.pos.point)
+        val errorsSortedWithoutZeroPos =
+          errorsSortedAll.filterNot(e => mapper.mapLine(e.pos.line + 1) == 0 && mapper.mapPosition(e.pos.point) == 0)
+        // We filter out any errors that are mapped to line 0 and column 0, because since Scalameta 4.14.1 it's likely
+        // those are very general errors. However, fall back to all errors in case after filtering no errors are left.
+        val error   = (if (errorsSortedWithoutZeroPos.isEmpty) errorsSortedAll else errorsSortedWithoutZeroPos).head
         val message = error.msg
         val pos     = error.pos
         throw CompilationError(message.toString, mapper.mapLine(pos.line + 1), mapper.mapPosition(pos.point))

compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala

@@ -200,20 +200,23 @@ class CompilerSpec extends AnyWordSpec with Matchers {
     }
 
     "fail compilation for error.scala.html" in {
+      val msg    = if (BuildInfo.scalaVersion.startsWith("3.")) "Not found: world" else "not found: value world"
       val helper = newCompilerHelper
       the[CompilationError] thrownBy helper.compile[(() => Html)]("error.scala.html", "html.error") must have(
         Symbol("line")(5),
-//        Symbol("column")(12) TODO: need fix https://github.com/playframework/twirl/issues/571 to back
+        Symbol("message")(msg),
         Symbol("column")(463)
       )
     }
 
     "fail compilation for errorInTemplateArgs.scala.html" in {
       val helper = newCompilerHelper
+      val msg    =
+        if (BuildInfo.scalaVersion.startsWith("3.")) "':' expected, but ')' found" else "':' expected but ')' found."
       the[CompilationError] thrownBy helper
         .compile[(() => Html)]("errorInTemplateArgs.scala.html", "html.errorInTemplateArgs") must have(
         Symbol("line")(5),
-//        Symbol("column")(6) TODO: need fix https://github.com/playframework/twirl/issues/571 to back
+        Symbol("message")(msg),
         Symbol("column")(458)
       )
     }