From 9740af8be40823fcd62af6cbb793bb58e1aebe3a Mon Sep 17 00:00:00 2001
From: Henry Zhu <hi@henryzoo.com>
Date: Sun, 16 Aug 2015 16:11:57 -0400
Subject: [PATCH] Merge pull request babel/babel-eslint#169 from hzoo/i-168

async func and space-before-function-paren
---
 eslint/babel-eslint-parser/acorn-to-esprima.js    | 4 ++++
 eslint/babel-eslint-parser/test/non-regression.js | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/eslint/babel-eslint-parser/acorn-to-esprima.js b/eslint/babel-eslint-parser/acorn-to-esprima.js
index 3dab2d6e10..121d26c588 100644
--- a/eslint/babel-eslint-parser/acorn-to-esprima.js
+++ b/eslint/babel-eslint-parser/acorn-to-esprima.js
@@ -235,6 +235,10 @@ var astTransformVisitor = {
 
     // functions
 
+    if (this.isFunction()) {
+      if (node.async) node.generator = true;
+    }
+
     if (this.isAwaitExpression()) {
       node.type = "YieldExpression";
       node.delegate = node.all;
diff --git a/eslint/babel-eslint-parser/test/non-regression.js b/eslint/babel-eslint-parser/test/non-regression.js
index 688b08e87b..3bdd615537 100644
--- a/eslint/babel-eslint-parser/test/non-regression.js
+++ b/eslint/babel-eslint-parser/test/non-regression.js
@@ -1302,4 +1302,11 @@ describe("verify", function () {
       [ ]
     )
   });
+
+  it("async function with space-before-function-paren #168", function () {
+    verifyAndAssertMessages("it('handles updates', async function() {});",
+      { "space-before-function-paren": [1, "never"] },
+      [ ]
+    )
+  });
 });