1 files changed, 14 insertions, 10 deletions
diff --git a/src/main/scala/scala/async/AsyncAnalysis.scala b/src/main/scala/scala/async/AsyncAnalysis.scala
index 8bb5bcd..f62d7a1 100644
--- a/src/main/scala/scala/async/AsyncAnalysis.scala
+++ b/src/main/scala/scala/async/AsyncAnalysis.scala
@@ -67,6 +67,10 @@ private[async] final case class AsyncAnalysis[C <: Context](c: C) {
       reportUnsupportedAwait(function, "nested function")
     }
 
+    override def patMatFunction(tree: Match) {
+      reportUnsupportedAwait(tree, "nested function")
+    }
+
     override def traverse(tree: Tree) {
       def containsAwait = tree exists isAwait
       tree match {
@@ -107,19 +111,19 @@ private[async] final case class AsyncAnalysis[C <: Context](c: C) {
 
     override def nestedMethod(defDef: DefDef) {
       nestedMethodsToLift += defDef
-      defDef.rhs foreach {
-        case rt: RefTree =>
-          valDefChunkId.get(rt.symbol) match {
-            case Some((vd, defChunkId)) =>
-              valDefsToLift += vd // lift all vals referred to by nested methods.
-            case _                      =>
-          }
-        case _           =>
-      }
+      markReferencedVals(defDef)
     }
 
     override def function(function: Function) {
-      function foreach {
+      markReferencedVals(function)
+    }
+
+    override def patMatFunction(tree: Match) {
+      markReferencedVals(tree)
+    }
+
+    private def markReferencedVals(tree: Tree) {
+      tree foreach {
         case rt: RefTree =>
           valDefChunkId.get(rt.symbol) match {
             case Some((vd, defChunkId)) =>