Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
25 changes: 21 additions & 4 deletions src/rules/no-misused-observables.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { AST_NODE_TYPES, TSESTree as es, TSESLint as eslint, ESLintUtils } from '@typescript-eslint/utils';
import { getFunctionHeadLocation, isFunction } from '@typescript-eslint/utils/ast-utils';
import * as tsutils from 'ts-api-utils';
import ts from 'typescript';
import {
Expand Down Expand Up @@ -251,10 +252,25 @@ export const noMisusedObservablesRule = ruleCreator({
return;
}

context.report({
messageId: 'forbiddenVoidReturnProperty',
node: node.value,
});
if (isFunction(node.value)) {
const functionNode = node.value;
if (functionNode.returnType) {
context.report({
messageId: 'forbiddenVoidReturnProperty',
node: functionNode.returnType.typeAnnotation,
});
} else {
context.report({
messageId: 'forbiddenVoidReturnProperty',
loc: getFunctionHeadLocation(functionNode, context.sourceCode),
});
}
} else {
context.report({
messageId: 'forbiddenVoidReturnProperty',
node: node.value,
});
}
}

function checkReturnStatement(node: es.ReturnStatement): void {
Expand All @@ -277,6 +293,7 @@ export const noMisusedObservablesRule = ruleCreator({
return current;
}
const functionNode = getFunctionNode();

if (
functionNode?.returnType
&& !isPossiblyFunctionType(functionNode.returnType)
Expand Down
4 changes: 2 additions & 2 deletions tests/rules/no-misused-observables.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ ruleTester({ types: true }).run('no-misused-observables', noMisusedObservablesRu
type Foo = { bar: () => void };
const foo: Foo = {
bar: () => of(42),
~~~~~~~~~~~~ [forbiddenVoidReturnProperty]
~~ [forbiddenVoidReturnProperty]
};
`,
),
Expand All @@ -752,7 +752,7 @@ ruleTester({ types: true }).run('no-misused-observables', noMisusedObservablesRu
type Foo = { bar: () => void };
const foo: Foo = {
bar(): Observable<number> { return of(42); },
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [forbiddenVoidReturnProperty]
~~~~~~~~~~~~~~~~~~ [forbiddenVoidReturnProperty]
};
`,
),
Expand Down