Cleanups

Author: odersky

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

@@ -2816,9 +2816,11 @@ object Parsers {
         setLastStatOffset()
         if (in.token == IMPORT)
           stats ++= importClause()
+        else if (in.token == GIVEN)
+          stats += implicitClosure(in.offset, Location.InBlock, modifiers(closureMods))
         else if (isExprIntro)
           stats += expr(Location.InBlock)
-        else if (isDefIntro(localModifierTokens) || in.token == GIVEN) // !!!!
+        else if (isDefIntro(localModifierTokens))
           if (in.token == IMPLICIT || in.token == ERASED || in.token == GIVEN) {
             val start = in.offset
             var imods = modifiers(closureMods)

compiler/src/dotty/tools/dotc/printing/RefinedPrinter.scala

@@ -141,7 +141,8 @@ class RefinedPrinter(_ctx: Context) extends PlainPrinter(_ctx) {
         argStr ~ " => " ~ argText(args.last)
       }
 
-    def toTextDependentFunction(appType: MethodType): Text = // !!!!
+    def toTextDependentFunction(appType: MethodType): Text =
+      (keywordText("erased ") provided appType.isErasedMethod) ~
       (keywordText("given ") provided appType.isImplicitMethod) ~
       "(" ~ paramsText(appType) ~ ") => " ~ toText(appType.resultType)