From d4ad271c6181217b9ee0bf21bbb5a87a91ea9059 Mon Sep 17 00:00:00 2001 From: Mark Banner Date: Mon, 16 Oct 2017 15:08:26 +0100 Subject: [PATCH] Bug 1230373 - Fix an issue with eslint-plugin-mozilla not detecting the global scope properly when arrow functions are used. r=mossop MozReview-Commit-ID: IOCM8Fjl0xQ --HG-- extra : rebase_source : 63face219569f50bdfb00bcd7384f334ec6113c2 --- devtools/server/tests/mochitest/inspector_getImageData.html | 2 +- tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/devtools/server/tests/mochitest/inspector_getImageData.html b/devtools/server/tests/mochitest/inspector_getImageData.html index 02d2b4d28f29..eb81e83c58cc 100644 --- a/devtools/server/tests/mochitest/inspector_getImageData.html +++ b/devtools/server/tests/mochitest/inspector_getImageData.html @@ -10,7 +10,7 @@ "use strict"; window.onload = () => { - var canvas = document.querySelector("canvas"), ctx = canvas.getContext("2d"); + let canvas = document.querySelector("canvas"), ctx = canvas.getContext("2d"); canvas.width = 1000; canvas.height = 2000; ctx.fillStyle = "red"; diff --git a/tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js b/tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js index 6b0c65d2c53e..88c510aba6c9 100644 --- a/tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js +++ b/tools/lint/eslint/eslint-plugin-mozilla/lib/helpers.js @@ -388,7 +388,8 @@ module.exports = { getIsGlobalScope(ancestors) { for (let parent of ancestors) { if (parent.type == "FunctionExpression" || - parent.type == "FunctionDeclaration") { + parent.type == "FunctionDeclaration" || + parent.type == "ArrowFunctionExpression") { return false; } }