Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(eslint-plugin): [no-shadow] fix static class generics for class expressions #7724

Merged
merged 4 commits into from
Oct 11, 2023
Merged

fix(eslint-plugin): [no-shadow] fix static class generics for class expressions #7724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e02253
Add test for factory generating class functionn with generic type
peanutenthusiast Sep 19, 2023
34d5905
Rename isGenericOfClassDecl to isGenericOfClass, check for class expr…
peanutenthusiast Oct 5, 2023
08feeaa
Apply eslint fixer on no shadow test class expression test case
peanutenthusiast Oct 5, 2023
0cdc6d5
Apply yarn lint-fix
peanutenthusiast Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions packages/eslint-plugin/src/rules/no-shadow.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ export default util.createRule<Options, MessageIds>({
return methodDefinition.static;
}

function isGenericOfClassDecl(variable: TSESLint.Scope.Variable): boolean {
function isGenericOfClass(variable: TSESLint.Scope.Variable): boolean {
if (!('isTypeVariable' in variable)) {
// this shouldn't happen...
return false;
Expand All @@ -224,16 +224,17 @@ export default util.createRule<Options, MessageIds>({
return false;
}
const classDecl = typeParameterDecl.parent;
return classDecl?.type === AST_NODE_TYPES.ClassDeclaration;
return (
classDecl?.type === AST_NODE_TYPES.ClassDeclaration ||
classDecl?.type === AST_NODE_TYPES.ClassExpression
);
}

function isGenericOfAStaticMethodShadow(
variable: TSESLint.Scope.Variable,
shadowed: TSESLint.Scope.Variable,
): boolean {
return (
isGenericOfStaticMethod(variable) && isGenericOfClassDecl(shadowed)
);
return isGenericOfStaticMethod(variable) && isGenericOfClass(shadowed);
}

function isImportDeclaration(
Expand Down
11 changes: 11 additions & 0 deletions packages/eslint-plugin/tests/rules/no-shadow/no-shadow.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,17 @@ export class Wrapper<Wrapped> {
static create<Wrapped>(wrapped: Wrapped) {
return new Wrapper<Wrapped>(wrapped);
}
}
`,
`
function makeA() {
return class A<T> {
constructor(public value: T) {}

static make<T>(value: T) {
return new A<T>(value);
}
};
}
`,
{
Expand Down