Fix parenthesis parsing for args block (#233)

playframework · Jul 11, 2019 · 8adb6af · 8adb6af
1 parent 8b0dce7
commit 8adb6af
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/compiler/src/test/resources/blockWithNestedTuple.scala.html b/compiler/src/test/resources/blockWithNestedTuple.scala.html
@@ -0,0 +1,5 @@
+@(args: Seq[(String, String)])
+
+@args.zipWithIndex.map { case ((k, v), index) =>
+    @k => @v
+}
diff --git a/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala b/compiler/src/test/scala/play/twirl/compiler/test/CompilerSpec.scala
@@ -241,6 +241,16 @@ class CompilerSpec extends WordSpec with MustMatchers {
     hello.static(args).toString.trim must be("the-key => the-value")
   }
 
+  "compile successfully (block with nested tuples)" in {
+    val helper = newCompilerHelper
+    val hello = helper.compile[(Seq[(String, String)] => Html)]("blockWithNestedTuple.scala.html", "html.blockWithNestedTuple")
+
+    val args = Seq[(String, String)](
+      "the-key" -> "the-value"
+    )
+    hello.static(args).toString.trim must be("the-key => the-value")
+  }
+
 }
 
 object Helper {

diff --git a/parser/src/main/scala/play/twirl/parser/TwirlParser.scala b/parser/src/main/scala/play/twirl/parser/TwirlParser.scala
@@ -496,9 +496,8 @@ class TwirlParser(val shouldParseInclusiveDot: Boolean) {
 
       val startsWithParenthesis = result.trim.startsWith("(") || result.trim.stripPrefix("case").trim.startsWith("(")
       val endsWithParenthesis = result.stripSuffix("=>").trim.endsWith(")")
-      val exactOneOpenParenthesis = result.count(_ == '(') == 1
 
-      noContainsOpenParenthesis || (startsWithParenthesis && endsWithParenthesis && exactOneOpenParenthesis)
+      noContainsOpenParenthesis || (startsWithParenthesis && endsWithParenthesis)
     }
 
     val p = input.offset()