diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2015-10-09 16:41:30 +1000 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2015-10-09 16:41:30 +1000 |
commit | 656748c2c3c094c19d28a59c466d67437b7d6f6c (patch) | |
tree | d3bc4adb923e1b47765d0b929942559f078a869c /src/main/scala/scala/async/internal/ExprBuilder.scala | |
parent | 7263aaad02a75978a0a48f90bf171c66cda4328c (diff) | |
parent | 01b36eae1da662763d969a9c312832a4e7ea1f84 (diff) | |
download | scala-async-656748c2c3c094c19d28a59c466d67437b7d6f6c.tar.gz scala-async-656748c2c3c094c19d28a59c466d67437b7d6f6c.tar.bz2 scala-async-656748c2c3c094c19d28a59c466d67437b7d6f6c.zip |
Merge pull request #143 from retronym/ticket/prescompiler-nested-asyncv0.9.6-RC2
Avoid spurious "illegal await" error in IDE with nesting
Diffstat (limited to 'src/main/scala/scala/async/internal/ExprBuilder.scala')
-rw-r--r-- | src/main/scala/scala/async/internal/ExprBuilder.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/main/scala/scala/async/internal/ExprBuilder.scala b/src/main/scala/scala/async/internal/ExprBuilder.scala index 16b9207..ce2345d 100644 --- a/src/main/scala/scala/async/internal/ExprBuilder.scala +++ b/src/main/scala/scala/async/internal/ExprBuilder.scala @@ -237,10 +237,8 @@ trait ExprBuilder { var stateBuilder = new AsyncStateBuilder(startState, symLookup) var currState = startState - def checkForUnsupportedAwait(tree: Tree) = if (tree exists { - case Apply(fun, _) if isAwait(fun) => true - case _ => false - }) c.abort(tree.pos, "await must not be used in this position") + def checkForUnsupportedAwait(tree: Tree) = if (containsAwait(tree)) + c.abort(tree.pos, "await must not be used in this position") def nestedBlockBuilder(nestedTree: Tree, startState: Int, endState: Int) = { val (nestedStats, nestedExpr) = statsAndExpr(nestedTree) |