Move fix to typedBlock, eliminating special casing in typedApply

Author: felixmulder

src/dotty/tools/dotc/typer/Applications.scala

@@ -573,20 +573,6 @@ trait Applications extends Compatibility { self: Typer with Dynamic =>
               else
                 new ApplyToUntyped(tree, fun1, funRef, proto, pt)(argCtx(tree))
             convertNewGenericArray(ConstFold(app.result))
-          case mt: MethodType =>
-            /**
-             *  Fixes i1503:
-             *  {{{
-             *  (new Function0[Unit] {
-             *    def apply() = println("hello")
-             *  })()
-             *  }}}
-             *
-             *  Will get a weird shape that results in a MethodType being
-             *  inferred instead of a TermRef, to solve this we'll try to type
-             *  it as an Apply with a Select.
-             */
-            typedApply(untpd.Apply(untpd.Select(tree.fun, nme.apply), tree.args), pt)
           case _ =>
             handleUnexpectedFunType(tree, fun1)
         }

src/dotty/tools/dotc/typer/Typer.scala

@@ -533,7 +533,23 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
   def typedBlock(tree: untpd.Block, pt: Type)(implicit ctx: Context) = track("typedBlock") {
     val exprCtx = index(tree.stats)
     val stats1 = typedStats(tree.stats, ctx.owner)
-    val expr1 = typedExpr(tree.expr, pt)(exprCtx)
+
+    /** i1503:
+     *  {{{
+     *  (new Function0[Unit] {
+     *    def apply(): Unit = ...
+     *  })()
+     *  }}}
+     *
+     *  The code gets desugared into a block that is applied. In the case
+     *  above, the block ends with a `Select(_ apply)` in expression position
+     *  and fails compilation. To remedy this, if a block ends in a
+     *  `Select(_,apply)` we simply move the apply outside the block.
+     */
+    val expr1 = typedExpr(tree.expr, pt)(exprCtx) match {
+      case Select(x, nme.apply) => x
+      case x => x
+    }
     ensureNoLocalRefs(
         assignType(cpy.Block(tree)(stats1, expr1), stats1, expr1), pt, localSyms(stats1))
   }