Skip to content

fix(eslint-plugin): [explicit-function-return-type] fix checking wrong ancestor's return type #8809

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

Merged
merged 5 commits into from
Apr 20, 2024
Merged

fix(eslint-plugin): [explicit-function-return-type] fix checking wrong ancestor's return type #8809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5d0489f
fix(eslint-plugin): [explicit-function-return-type] fix checking wron…
yeonjuan Mar 31, 2024
00b1e57
fix lint errors
yeonjuan Apr 1, 2024
3566643
Merge branch 'main' into bugs/8808
yeonjuan Apr 20, 2024
7a6dd1a
add test cases
yeonjuan Apr 20, 2024
44d9f3f
Merge branch 'main' into bugs/8808
auvred Apr 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 5 additions & 8 deletions packages/eslint-plugin/src/util/explicitReturnTypeUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,15 +337,12 @@ function ancestorHasReturnType(node: FunctionNode): boolean {
// const x: Foo = () => {};
// Assume that a typed variable types the function expression
case AST_NODE_TYPES.VariableDeclarator:
if (ancestor.id.typeAnnotation) {
return true;
}
break;
return !!ancestor.id.typeAnnotation;

case AST_NODE_TYPES.PropertyDefinition:
if (ancestor.typeAnnotation) {
return true;
}
break;
return !!ancestor.typeAnnotation;

This comment was marked as resolved.

Sign in to view

This comment was marked as resolved.

Sign in to view

case AST_NODE_TYPES.ExpressionStatement:
return false;
}

ancestor = ancestor.parent;
Expand Down
93 changes: 93 additions & 0 deletions packages/eslint-plugin/tests/rules/explicit-function-return-type.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,74 @@ class Foo {
},
{
code: `
function foo(): any {
const bar = () => () => console.log('aa');
}
`,
options: [
{
allowTypedFunctionExpressions: true,
},
],
errors: [
{
messageId: 'missingReturnType',
line: 3,
endLine: 3,
column: 24,
endColumn: 26,
},
],
},
{
code: `
let anyValue: any;
function foo(): any {
anyValue = () => () => console.log('aa');
}
`,
options: [
{
allowTypedFunctionExpressions: true,
},
],
errors: [
{
messageId: 'missingReturnType',
line: 4,
endLine: 4,
column: 23,
endColumn: 25,
},
],
},
{
code: `
class Foo {
foo(): any {
const bar = () => () => {
return console.log('foo');
};
}
}
`,
options: [
{
allowTypedFunctionExpressions: true,
},
],
errors: [
{
messageId: 'missingReturnType',
line: 4,
endLine: 4,
column: 26,
endColumn: 28,
},
],
},
{
code: `
var funcExpr = function () {
return 'test';
};
Expand Down Expand Up @@ -1171,6 +1239,31 @@ const x: Foo = {
},
],
},
{
code: `
function foo(): any {
class Foo {
foo = () => () => {
return console.log('foo');
};
}
}
`,
options: [
{
allowTypedFunctionExpressions: true,
},
],
errors: [
{
messageId: 'missingReturnType',
line: 4,
endLine: 4,
column: 20,
endColumn: 22,
},
],
},
{
code: '() => () => {};',
options: [{ allowHigherOrderFunctions: true }],
Expand Down
20 changes: 11 additions & 9 deletions packages/website/src/components/editor/LoadedEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,14 +135,14 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
monaco.editor.setModelMarkers(model, 'eslint', diagnostics);
updateMarkers();
});
return () => disposable();
return (): void => disposable();
}, [webLinter, monaco, codeActions, updateMarkers]);

useEffect(() => {
const disposable = webLinter.onParse((uri, model) => {
onASTChange(model);
});
return () => disposable();
return (): void => disposable();
}, [webLinter, onASTChange]);

useEffect(() => {
Expand Down Expand Up @@ -178,7 +178,7 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
'typescript',
createProvideCodeActions(codeActions),
);
return () => disposable.dispose();
return (): void => disposable.dispose();
}, [codeActions, monaco]);

useEffect(() => {
Expand All @@ -191,7 +191,9 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
}
}
});
return () => disposable.dispose();
return (): void => {
disposable.dispose();
};
}, [editor, tabs.eslintrc]);

useEffect(() => {
Expand All @@ -204,7 +206,7 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
}
}, 150),
);
return () => disposable.dispose();
return (): void => disposable.dispose();
}, [onSelect, editor, tabs.code]);

useEffect(() => {
Expand All @@ -227,7 +229,7 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
}
},
});
return () => disposable.dispose();
return (): void => disposable.dispose();
}, [editor, monaco, webLinter]);

useEffect(() => {
Expand All @@ -243,7 +245,7 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
}),
];

return () => {
return (): void => {
closable.forEach(c => c.close());
};
}, [system, onChange]);
Expand All @@ -255,14 +257,14 @@ export const LoadedEditor: React.FC<LoadedEditorProps> = ({
system.writeFile(model.uri.path, model.getValue());
}
});
return () => disposable.dispose();
return (): void => disposable.dispose();
}, [editor, system]);

useEffect(() => {
const disposable = monaco.editor.onDidChangeMarkers(() => {
updateMarkers();
});
return () => disposable.dispose();
return (): void => disposable.dispose();
}, [monaco.editor, updateMarkers]);

const resize = useMemo(() => {
Expand Down
2 changes: 1 addition & 1 deletion packages/website/src/hooks/useMediaQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const useMediaQuery = (mediaQuery: string): boolean => {
}

documentChangeHandler();
return () => {
return (): void => {
try {
mediaQueryList.removeEventListener('change', documentChangeHandler);
} catch {
Expand Down