From bf9b4347366cc61e00944ac22cf061bff4b17a19 Mon Sep 17 00:00:00 2001 From: Sven SAULEAU Date: Tue, 7 Mar 2017 21:19:06 +0100 Subject: [PATCH] refactor: search parent instead of using state --- .../src/vanilla.js | 15 +++++++-------- .../super-reference-before-in-lambda-2/actual.js | 7 +++++++ .../options.json | 3 +++ 3 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js create mode 100644 packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json diff --git a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js index e877902385..ce480f5516 100644 --- a/packages/babel-plugin-transform-es2015-classes/src/vanilla.js +++ b/packages/babel-plugin-transform-es2015-classes/src/vanilla.js @@ -23,18 +23,17 @@ const noMethodVisitor = { }; const verifyConstructorVisitor = visitors.merge([noMethodVisitor, { - Super(path, state) { + Super(path) { if ( this.isDerived && !this.hasBareSuper && - !path.parentPath.isCallExpression({ callee: path.node }) && - !state.inArrowFunctionExpression + !path.parentPath.isCallExpression({ callee: path.node }) ) { - throw path.buildCodeFrameError("'super.*' is not allowed before super()"); - } - }, + const hasArrowFunctionParent = path.findParent((p) => p.isArrowFunctionExpression()); - ArrowFunctionExpression(path, state) { - state.inArrowFunctionExpression = true; + if (!hasArrowFunctionParent) { + throw path.buildCodeFrameError("'super.*' is not allowed before super()"); + } + } }, CallExpression: { diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js new file mode 100644 index 0000000000..1d570b180f --- /dev/null +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/actual.js @@ -0,0 +1,7 @@ +class Foo extends Bar { + constructor() { + const t = () => super.test() + super.foo(); + super(); + } +} diff --git a/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json new file mode 100644 index 0000000000..fbca946296 --- /dev/null +++ b/packages/babel-plugin-transform-es2015-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json @@ -0,0 +1,3 @@ +{ + "throws": "'super.*' is not allowed before super()" +}