chore: revert prefer-ast-types-enum false positives

typescript-eslint · Jan 24, 2020 · 1fbfd9e · 1fbfd9e
1 parent fb6b0fa
commit 1fbfd9e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/packages/eslint-plugin/src/rules/no-inferrable-types.ts b/packages/eslint-plugin/src/rules/no-inferrable-types.ts
@@ -125,7 +125,8 @@ export default util.createRule<Options, MessageIds>({
         case AST_NODE_TYPES.TSBooleanKeyword:
           return (
             hasUnaryPrefix(init, '!') ||
-            isFunctionCall(init, AST_TOKEN_TYPES.Boolean) ||
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            isFunctionCall(init, 'Boolean') ||
             isLiteral(init, 'boolean')
           );
 
@@ -146,7 +147,8 @@ export default util.createRule<Options, MessageIds>({
 
         case AST_NODE_TYPES.TSStringKeyword:
           return (
-            isFunctionCall(init, AST_TOKEN_TYPES.String) ||
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            isFunctionCall(init, 'String') ||
             isLiteral(init, 'string') ||
             init.type === AST_NODE_TYPES.TemplateLiteral
           );

diff --git a/packages/eslint-plugin/src/rules/no-type-alias.ts b/packages/eslint-plugin/src/rules/no-type-alias.ts
@@ -260,7 +260,8 @@ export default util.createRule<Options, MessageIds>({
         // tuple types
         checkAndReport(allowTupleTypes!, isTopLevel, type, 'Tuple Types');
       } else if (
-        type.node.type.endsWith(AST_TOKEN_TYPES.Keyword) ||
+        // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+        type.node.type.endsWith('Keyword') ||
         aliasTypes.has(type.node.type)
       ) {
         // alias / keyword

diff --git a/packages/eslint-plugin/src/rules/no-unused-vars-experimental.ts b/packages/eslint-plugin/src/rules/no-unused-vars-experimental.ts
@@ -141,7 +141,8 @@ export default util.createRule<Options, MessageIds>({
         case ts.SyntaxKind.ImportSpecifier:
         // a namespace import is NOT used, but the default import is used
         case ts.SyntaxKind.NamespaceImport:
-          report(AST_NODE_TYPES.Import);
+          // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+          report('Import');
           break;
 
         case ts.SyntaxKind.InterfaceDeclaration:

diff --git a/packages/eslint-plugin/tests/rules/ban-types.test.ts b/packages/eslint-plugin/tests/rules/ban-types.test.ts
@@ -96,7 +96,8 @@ ruleTester.run('ban-types', rule, {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 1,
@@ -112,7 +113,8 @@ ruleTester.run('ban-types', rule, {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 1,
@@ -128,7 +130,8 @@ ruleTester.run('ban-types', rule, {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 1,
@@ -172,7 +175,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 2,
@@ -181,7 +185,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 2,
@@ -199,7 +204,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 3,
@@ -223,7 +229,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 5,
@@ -232,7 +239,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 6,
@@ -241,7 +249,8 @@ class Foo<F = string> extends Bar<string> implements Baz<Object> {
         {
           messageId: 'bannedTypeMessage',
           data: {
-            name: AST_TOKEN_TYPES.String,
+            // eslint-disable-next-line @typescript-eslint/internal/prefer-ast-types-enum
+            name: 'String',
             customMessage: ' Use string instead.',
           },
           line: 6,