Backport "Fix parsing of conditional expressions in parentheses" to L…

…TS (#21006) Backports #19985 to the LTS branch. PR submitted by the release tooling. [skip ci]
scala · Jul 4, 2024 · 6be74d3 · 6be74d3
2 parents 29c9888 + bcbbf0a
commit 6be74d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/compiler/src/dotty/tools/dotc/parsing/Parsers.scala b/compiler/src/dotty/tools/dotc/parsing/Parsers.scala
@@ -2099,7 +2099,8 @@ object Parsers {
     def condExpr(altToken: Token): Tree =
       val t: Tree =
         if in.token == LPAREN then
-          var t: Tree = atSpan(in.offset) { Parens(inParens(exprInParens())) }
+          var t: Tree = atSpan(in.offset):
+            makeTupleOrParens(inParensWithCommas(commaSeparated(exprInParens)))
           if in.token != altToken then
             if toBeContinued(altToken) then
               t = inSepRegion(InCond) {

diff --git a/tests/pos/if-parse.scala b/tests/pos/if-parse.scala
@@ -0,0 +1,4 @@
+import scala.math.Ordering.Implicits.infixOrderingOps
+
+def test =
+  if (1, 2) < (3, 4) then 1 else 2