From 5548b80a996ebc8b6243e652cb6b3069f07c1a06 Mon Sep 17 00:00:00 2001 From: islandryu Date: Sat, 12 Feb 2022 20:14:28 +0900 Subject: [PATCH] fix(eslint-plugin): [no-unnecessary-type-arguments] Use Symbol to check if it's the same type --- .../rules/no-unnecessary-type-arguments.ts | 18 +++++++++---- .../no-unnecessary-type-arguments.test.ts | 27 +++++++++++++++++++ 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts b/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts index 67244961bca6..318af6c6d016 100644 --- a/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts +++ b/packages/eslint-plugin/src/rules/no-unnecessary-type-arguments.ts @@ -37,7 +37,6 @@ export default util.createRule<[], MessageIds>({ create(context) { const parserServices = util.getParserServices(context); const checker = parserServices.program.getTypeChecker(); - const sourceCode = context.getSourceCode(); function checkTSArgsAndParameters( esParameters: TSESTree.TSTypeParameterInstantiation, @@ -47,11 +46,20 @@ export default util.createRule<[], MessageIds>({ const i = esParameters.params.length - 1; const arg = esParameters.params[i]; const param = typeParameters[i]; - + if (!param?.default) { + return; + } // TODO: would like checker.areTypesEquivalent. https://github.com/Microsoft/TypeScript/issues/13502 - if ( - !param?.default || - param.default.getText() !== sourceCode.getText(arg) + const defaultType = checker.getTypeAtLocation(param.default); + const argTsNode = parserServices.esTreeNodeToTSNodeMap.get(arg); + const argType = checker.getTypeAtLocation(argTsNode); + if (!argType.aliasSymbol && !defaultType.aliasSymbol) { + if (argType.flags !== defaultType.flags) { + return; + } + } else if ( + argType.aliasSymbol !== defaultType.aliasSymbol || + argType.aliasTypeArguments !== defaultType.aliasTypeArguments ) { return; } diff --git a/packages/eslint-plugin/tests/rules/no-unnecessary-type-arguments.test.ts b/packages/eslint-plugin/tests/rules/no-unnecessary-type-arguments.test.ts index 9c642d5f88fd..dc140aade441 100644 --- a/packages/eslint-plugin/tests/rules/no-unnecessary-type-arguments.test.ts +++ b/packages/eslint-plugin/tests/rules/no-unnecessary-type-arguments.test.ts @@ -290,5 +290,32 @@ function bar>() {} bar(); `, }, + { + code: ` +type DefaultE = { foo: string }; +type T = { box: E }; +type G = T; +declare module 'bar' { + type DefaultE = { somethingElse: true }; + type G = T; +} + `, + errors: [ + { + line: 4, + column: 12, + messageId: 'unnecessaryTypeParameter', + }, + ], + output: ` +type DefaultE = { foo: string }; +type T = { box: E }; +type G = T; +declare module 'bar' { + type DefaultE = { somethingElse: true }; + type G = T; +} + `, + }, ], }); pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.

Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy