Don't recognize newlines as statement separators in if-then, while-do

Author: odersky

compiler/src/dotty/tools/dotc/parsing/Parsers.scala

@@ -574,7 +574,7 @@ object Parsers {
     }
 
     /** Drop (...) or { ... }, replacing the closing element with `endStr` */
-    def dropParensOrBraces(start: Offset, endStr: String) = {
+    def dropParensOrBraces(start: Offset, endStr: String): Unit = {
       patch(source, Span(start, start + 1), "")
       val filler = if (in.lastOffset == in.offset) " " else ""
       val closingStartsLine = testChar(skipBlanks(in.lastOffset - 2, -1), Chars.LF)
@@ -1356,7 +1356,7 @@ object Parsers {
           dropParensOrBraces(t.span.start, s" ${tokenString(altToken)}")
         t
       } else {
-        val t = expr()
+        val t = inSepRegion(LPAREN, RPAREN)(expr())
         accept(altToken)
         if (in.revertCleanRewrite) revertToParens(t)
         t
@@ -1992,7 +1992,9 @@ object Parsers {
 
           /*if (in.token == INDENT) inBracesOrIndented(enumerators())
           else*/ {
-            val ts = enumerators()
+            val ts = // If we use indent syntax, the distinction below should no longer be necessary
+              if (in.isAfterLineEnd()) enumerators()
+              else inSepRegion(LPAREN, RPAREN)(enumerators())
             if (in.revertCleanRewrite && ts.nonEmpty) {
               patch(source, ts.head.span.startPos, "(")
               patch(source, ts.last.span.endPos, ")")