github
diff --git a/‎lib/rules/async-currenttarget.js
Copy file name to clipboardExpand all lines: lib/rules/async-currenttarget.js
+11-4Lines changed: 11 additions & 4 deletions b/‎lib/rules/async-currenttarget.js
Copy file name to clipboardExpand all lines: lib/rules/async-currenttarget.js
+11-4Lines changed: 11 additions & 4 deletions
diff --git a/‎lib/rules/async-preventdefault.js
Copy file name to clipboardExpand all lines: lib/rules/async-preventdefault.js
+11-4Lines changed: 11 additions & 4 deletions b/‎lib/rules/async-preventdefault.js
Copy file name to clipboardExpand all lines: lib/rules/async-preventdefault.js
+11-4Lines changed: 11 additions & 4 deletions
diff --git a/‎tests/async-currenttarget.js
Copy file name to clipboardExpand all lines: tests/async-currenttarget.js
+14Lines changed: 14 additions & 0 deletions b/‎tests/async-currenttarget.js
Copy file name to clipboardExpand all lines: tests/async-currenttarget.js
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎tests/async-preventdefault.js
Copy file name to clipboardExpand all lines: tests/async-preventdefault.js
+10Lines changed: 10 additions & 0 deletions b/‎tests/async-preventdefault.js
Copy file name to clipboardExpand all lines: tests/async-preventdefault.js
+10Lines changed: 10 additions & 0 deletions
@@ -13,13 +13,20 @@ module.exports = {
 
     return {
       AwaitExpression() {
-        scopeDidWait.add(context.getScope(), true)
+        scopeDidWait.add(context.getScope())
       },
       MemberExpression(node) {
         if (node.property && node.property.name === 'currentTarget') {
-          const scope = context.getScope()
-          if (scope.block.async && scopeDidWait.has(scope)) {
-            context.report({node, message: 'event.currentTarget inside an async function is error prone'})
+          let scope = context.getScope()
+          while (scope) {
+            if (scopeDidWait.has(scope)) {
+              context.report({
+                node,
+                message: "event.currentTarget inside an async function is error prone",
+              })
+              break
+            }
+            scope = scope.upper
           }
         }
       },
 
@@ -13,13 +13,20 @@ module.exports = {
 
     return {
       AwaitExpression() {
-        scopeDidWait.add(context.getScope(), true)
+        scopeDidWait.add(context.getScope())
       },
       CallExpression(node) {
         if (node.callee.property && node.callee.property.name === 'preventDefault') {
-          const scope = context.getScope()
-          if (scope.block.async && scopeDidWait.has(scope)) {
-            context.report({node, message: 'event.preventDefault() inside an async function is error prone'})
+          let scope = context.getScope()
+          while (scope) {
+            if (scopeDidWait.has(scope)) {
+              context.report({
+                node,
+                message: "event.preventDefault() inside an async function is error prone",
+              })
+              break
+            }
+            scope = scope.upper
           }
         }
       },
 
@@ -12,6 +12,10 @@ ruleTester.run('async-currenttarget', rule, {
       code: 'document.addEventListener(async function(event) { event.currentTarget; await delay() })',
       parserOptions: {ecmaVersion: 2017},
     },
+    {
+      code: 'document.addEventListener(async function(event) { const currentTarget = event.currentTarget; await delay(); foo(() => currentTarget) })',
+      parserOptions: {ecmaVersion: 2017},
+    },
   ],
   invalid: [
     {
@@ -24,5 +28,15 @@ ruleTester.run('async-currenttarget', rule, {
         },
       ],
     },
+    {
+      code: 'document.addEventListener(async function(event) { await delay(); foo(() => e.currentTarget) })',
+      parserOptions: {ecmaVersion: 2017},
+      errors: [
+        {
+          message: 'event.currentTarget inside an async function is error prone',
+          type: 'MemberExpression',
+        },
+      ],
+    },
   ],
 })
@@ -27,5 +27,15 @@ ruleTester.run('async-preventdefault', rule, {
         },
       ],
     },
+    {
+      code: 'document.addEventListener(async function(event) { await delay(); foo(() => event.preventDefault()) })',
+      parserOptions: {ecmaVersion: 2017},
+      errors: [
+        {
+          message: 'event.preventDefault() inside an async function is error prone',
+          type: 'CallExpression',
+        },
+      ],
+    },
   ],
 })