Allow rewritings under constructs that could not be rewritten

Author: odersky

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

@@ -581,11 +581,6 @@ object Parsers {
      */
     var possibleColonOffset: Int = -1
 
-    /** A list of pending patches, to be issued if we can rewrite all enclosing braces to
-     *  indentation regions.
-     */
-    var pendingPatches: List[() => Unit] = Nil
-
     def testChar(idx: Int, p: Char => Boolean): Boolean = {
       val txt = source.content
       idx < txt.length && p(txt(idx))
@@ -703,7 +698,6 @@ object Parsers {
       val colonRequired = possibleColonOffset == in.lastOffset
       val (startOpening, endOpening) = startingElimRegion(colonRequired)
       val isOutermost = in.currentRegion.isOutermost
-      val savedPending = pendingPatches
       def allBraces(r: Region): Boolean = r match {
         case r: InBraces => allBraces(r.enclosing)
         case _ => r.isOutermost
@@ -725,17 +719,9 @@ object Parsers {
           else if (testChar(startOpening - 1, Chars.isOperatorPart(_))) " :"
           else ":"
         val (startClosing, endClosing) = closingElimRegion()
-        val applyPatch = () => {
-          patch(source, Span(startOpening, endOpening), openingPatchStr)
-          patch(source, Span(startClosing, endClosing), "")
-        }
-        pendingPatches = applyPatch :: pendingPatches
-        if (isOutermost) {
-          pendingPatches.reverse.foreach(_())
-          pendingPatches = Nil
-        }
+        patch(source, Span(startOpening, endOpening), openingPatchStr)
+        patch(source, Span(startClosing, endClosing), "")
       }
-      else pendingPatches = savedPending // can't rewrite, cancel all nested patches.
       t
     }
 
@@ -3367,9 +3353,8 @@ object Parsers {
         case _ => false
       }
 
-      def givenArgs(t: Tree): Tree = {
+      def givenArgs(t: Tree): Tree =
         if (in.token == GIVEN) givenArgs(applyGiven(t, prefixExpr)) else t
-      }
 
       if (in.token == LPAREN)
         inParens {