feat(typescript-estree): check for illegal decorators on function dec…

…larations (#6590)
typescript-eslint · Mar 13, 2023 · 1b39cfd · 1b39cfd
1 parent 530185b
commit 1b39cfd
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 27 deletions.
diff --git a/...ures/errorRecovery/fixtures/_error_/decorator-on-function/snapshots/1-TSESTree-Error.shot b/...ures/errorRecovery/fixtures/_error_/decorator-on-function/snapshots/1-TSESTree-Error.shot
@@ -1,3 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AST Fixtures legacy-fixtures errorRecovery _error_ decorator-on-function TSESTree - Error 1`] = `"NO ERROR"`;
+exports[`AST Fixtures legacy-fixtures errorRecovery _error_ decorator-on-function TSESTree - Error 1`] = `
+"TSError
+  1 | // TODO: This fixture might be too large, and if so should be split up.
+  2 |
+> 3 | @dec
+    | ^^^^ Decorators are not valid here.
+  4 | function b(){}
+  5 |"
+`;
diff --git a/...res/errorRecovery/fixtures/_error_/decorator-on-function/snapshots/3-Alignment-Error.shot b/...res/errorRecovery/fixtures/_error_/decorator-on-function/snapshots/3-Alignment-Error.shot
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AST Fixtures legacy-fixtures errorRecovery _error_ decorator-on-function Error Alignment 1`] = `"Babel errored but TSESTree didn't"`;
+exports[`AST Fixtures legacy-fixtures errorRecovery _error_ decorator-on-function Error Alignment 1`] = `"Both errored"`;
diff --git a/packages/ast-spec/tests/fixtures-with-differences-errors.shot b/packages/ast-spec/tests/fixtures-with-differences-errors.shot
@@ -38,7 +38,6 @@ Object {
     "legacy-fixtures/basics/fixtures/_error_/interface-with-construct-signature-with-parameter-accessibility/fixture.ts",
     "legacy-fixtures/basics/fixtures/_error_/new-target-in-arrow-function-body/fixture.ts",
     "legacy-fixtures/basics/fixtures/_error_/var-with-definite-assignment/fixture.ts",
-    "legacy-fixtures/errorRecovery/fixtures/_error_/decorator-on-function/fixture.ts",
     "legacy-fixtures/errorRecovery/fixtures/_error_/empty-type-arguments-in-call-expression/fixture.ts",
     "legacy-fixtures/errorRecovery/fixtures/_error_/empty-type-arguments-in-new-expression/fixture.ts",
     "legacy-fixtures/errorRecovery/fixtures/_error_/empty-type-arguments/fixture.ts",

diff --git a/packages/eslint-plugin/src/rules/no-empty-function.ts b/packages/eslint-plugin/src/rules/no-empty-function.ts
@@ -166,13 +166,6 @@ export default util.createRule<Options, MessageIds>({
 
         rules.FunctionExpression(node);
       },
-      FunctionDeclaration(node): void {
-        if (isAllowedEmptyDecoratedFunctions(node)) {
-          return;
-        }
-
-        rules.FunctionDeclaration(node);
-      },
     };
   },
 });
diff --git a/packages/eslint-plugin/tests/rules/no-empty-function.test.ts b/packages/eslint-plugin/tests/rules/no-empty-function.test.ts
@@ -1,5 +1,5 @@
 import rule from '../../src/rules/no-empty-function';
-import { noFormat, RuleTester } from '../RuleTester';
+import { RuleTester } from '../RuleTester';
 
 const ruleTester = new RuleTester({
   parser: '@typescript-eslint/parser',
@@ -169,22 +169,6 @@ function foo() {}
         },
       ],
     },
-    {
-      code: noFormat`
-@decorator()
-function foo() {}
-      `,
-      errors: [
-        {
-          messageId: 'unexpected',
-          data: {
-            name: "function 'foo'",
-          },
-          line: 3,
-          column: 16,
-        },
-      ],
-    },
     {
       code: `
 class Foo {

diff --git a/packages/typescript-estree/src/convert.ts b/packages/typescript-estree/src/convert.ts
@@ -907,6 +907,8 @@ export class Converter {
       // Declarations
 
       case SyntaxKind.FunctionDeclaration: {
+        this.#checkIllegalDecorators(node);
+
         const isDeclare = hasModifier(SyntaxKind.DeclareKeyword, node);
 
         const result = this.createNode<