Skip to content

Commit c320c88

Browse files
DanielRosenwasserDanielRosenwasser
authored
Merge pull request microsoft#13485 from Microsoft/errorOnReturnStatement
Expand error span for return expression incompatibilities
2 parents d86d850 + 3ecfc8d commit c320c88

27 files changed

Lines changed: 96 additions & 96 deletions

‎src/compiler/checker.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17922,27 +17922,27 @@ namespace ts {
1792217922

1792317923
if (func.kind === SyntaxKind.SetAccessor) {
1792417924
if (node.expression) {
17925-
error(node.expression, Diagnostics.Setters_cannot_return_a_value);
17925+
error(node, Diagnostics.Setters_cannot_return_a_value);
1792617926
}
1792717927
}
1792817928
else if (func.kind === SyntaxKind.Constructor) {
17929-
if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
17930-
error(node.expression, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
17929+
if (node.expression && !checkTypeAssignableTo(exprType, returnType, node)) {
17930+
error(node, Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
1793117931
}
1793217932
}
1793317933
else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
1793417934
if (isAsyncFunctionLike(func)) {
1793517935
const promisedType = getPromisedType(returnType);
17936-
const awaitedType = checkAwaitedType(exprType, node.expression || node, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
17936+
const awaitedType = checkAwaitedType(exprType, node, Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
1793717937
if (promisedType) {
1793817938
// If the function has a return type, but promisedType is
1793917939
// undefined, an error will be reported in checkAsyncFunctionReturnType
1794017940
// so we don't need to report one here.
17941-
checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
17941+
checkTypeAssignableTo(awaitedType, promisedType, node);
1794217942
}
1794317943
}
1794417944
else {
17945-
checkTypeAssignableTo(exprType, returnType, node.expression || node);
17945+
checkTypeAssignableTo(exprType, returnType, node);
1794617946
}
1794717947
}
1794817948
}

‎tests/baselines/reference/accessors_spec_section-4.5_error-cases.errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(2,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
22
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(3,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
3-
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(3,55): error TS2322: Type '""' is not assignable to type 'number'.
3+
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(3,48): error TS2322: Type '""' is not assignable to type 'number'.
44
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(5,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
5-
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(5,54): error TS2322: Type '""' is not assignable to type 'number'.
5+
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(5,47): error TS2322: Type '""' is not assignable to type 'number'.
66
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(6,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
77
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(8,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
88
tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(9,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
@@ -20,13 +20,13 @@ tests/cases/compiler/accessors_spec_section-4.5_error-cases.ts(12,16): error TS1
2020
public get AnnotatedSetter_SetterFirst() { return ""; }
2121
~~~~~~~~~~~~~~~~~~~~~~~~~~~
2222
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
23-
~~
23+
~~~~~~~~~~
2424
!!! error TS2322: Type '""' is not assignable to type 'number'.
2525

2626
public get AnnotatedSetter_SetterLast() { return ""; }
2727
~~~~~~~~~~~~~~~~~~~~~~~~~~
2828
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
29-
~~
29+
~~~~~~~~~~
3030
!!! error TS2322: Type '""' is not assignable to type 'number'.
3131
public set AnnotatedSetter_SetterLast(a: number) { }
3232
~~~~~~~~~~~~~~~~~~~~~~~~~~

‎tests/baselines/reference/constructorReturnsInvalidType.errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
tests/cases/compiler/constructorReturnsInvalidType.ts(3,16): error TS2322: Type '1' is not assignable to type 'X'.
2-
tests/cases/compiler/constructorReturnsInvalidType.ts(3,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
1+
tests/cases/compiler/constructorReturnsInvalidType.ts(3,9): error TS2322: Type '1' is not assignable to type 'X'.
2+
tests/cases/compiler/constructorReturnsInvalidType.ts(3,9): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
33

44

55
==== tests/cases/compiler/constructorReturnsInvalidType.ts (2 errors) ====
66
class X {
77
constructor() {
88
return 1;
9-
~
9+
~~~~~~~~~
1010
!!! error TS2322: Type '1' is not assignable to type 'X'.
11-
~
11+
~~~~~~~~~
1212
!!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
1313
}
1414
foo() { }

‎tests/baselines/reference/constructorWithAssignableReturnExpression.errors.txt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,16): error TS2322: Type '1' is not assignable to type 'D'.
2-
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
3-
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,16): error TS2322: Type '{ x: number; }' is not assignable to type 'F<T>'.
1+
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,9): error TS2322: Type '1' is not assignable to type 'D'.
2+
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(12,9): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
3+
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,9): error TS2322: Type '{ x: number; }' is not assignable to type 'F<T>'.
44
Types of property 'x' are incompatible.
55
Type 'number' is not assignable to type 'T'.
6-
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,16): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
6+
tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts(26,9): error TS2409: Return type of constructor signature must be assignable to the instance type of the class
77

88

99
==== tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignableReturnExpression.ts (4 errors) ====
@@ -19,9 +19,9 @@ tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignabl
1919
x: number;
2020
constructor() {
2121
return 1; // error
22-
~
22+
~~~~~~~~~
2323
!!! error TS2322: Type '1' is not assignable to type 'D'.
24-
~
24+
~~~~~~~~~
2525
!!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
2626
}
2727
}
@@ -37,11 +37,11 @@ tests/cases/conformance/classes/constructorDeclarations/constructorWithAssignabl
3737
x: T;
3838
constructor() {
3939
return { x: 1 }; // error
40-
~~~~~~~~
40+
~~~~~~~~~~~~~~~~
4141
!!! error TS2322: Type '{ x: number; }' is not assignable to type 'F<T>'.
4242
!!! error TS2322: Types of property 'x' are incompatible.
4343
!!! error TS2322: Type 'number' is not assignable to type 'T'.
44-
~~~~~~~~
44+
~~~~~~~~~~~~~~~~
4545
!!! error TS2409: Return type of constructor signature must be assignable to the instance type of the class
4646
}
4747
}

‎tests/baselines/reference/derivedGenericClassWithAny.errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericC
22
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(11,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
33
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(19,16): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
44
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(30,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
5-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(30,25): error TS2322: Type '""' is not assignable to type 'T'.
6-
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(32,16): error TS2322: Type '""' is not assignable to type 'T'.
5+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(30,18): error TS2322: Type '""' is not assignable to type 'T'.
6+
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(32,9): error TS2322: Type '""' is not assignable to type 'T'.
77
tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericClassWithAny.ts(41,1): error TS2322: Type 'E<string>' is not assignable to type 'C<number>'.
88
Types of property 'x' are incompatible.
99
Type 'string' is not assignable to type 'number'.
@@ -48,11 +48,11 @@ tests/cases/conformance/classes/members/inheritanceAndOverriding/derivedGenericC
4848
get X(): T { return ''; } // error
4949
~
5050
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
51-
~~
51+
~~~~~~~~~~
5252
!!! error TS2322: Type '""' is not assignable to type 'T'.
5353
foo(): T {
5454
return ''; // error
55-
~~
55+
~~~~~~~~~~
5656
!!! error TS2322: Type '""' is not assignable to type 'T'.
5757
}
5858
}

‎tests/baselines/reference/fuzzy.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
tests/cases/compiler/fuzzy.ts(13,18): error TS2420: Class 'C' incorrectly implements interface 'I'.
22
Property 'alsoWorks' is missing in type 'C'.
3-
tests/cases/compiler/fuzzy.ts(21,20): error TS2322: Type '{ anything: number; oneI: this; }' is not assignable to type 'R'.
3+
tests/cases/compiler/fuzzy.ts(21,13): error TS2322: Type '{ anything: number; oneI: this; }' is not assignable to type 'R'.
44
Types of property 'oneI' are incompatible.
55
Type 'this' is not assignable to type 'I'.
66
Type 'C' is not assignable to type 'I'.
@@ -33,7 +33,7 @@ tests/cases/compiler/fuzzy.ts(25,20): error TS2352: Type '{ oneI: this; }' canno
3333

3434
doesntWork():R {
3535
return { anything:1, oneI:this };
36-
~~~~~~~~~~~~~~~~~~~~~~~~~
36+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
3737
!!! error TS2322: Type '{ anything: number; oneI: this; }' is not assignable to type 'R'.
3838
!!! error TS2322: Types of property 'oneI' are incompatible.
3939
!!! error TS2322: Type 'this' is not assignable to type 'I'.

‎tests/baselines/reference/getSetAccessorContextualTyping.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/conformance/expressions/contextualTyping/getSetAccessorContextualTyping.ts(8,16): error TS2322: Type '"string"' is not assignable to type 'number'.
1+
tests/cases/conformance/expressions/contextualTyping/getSetAccessorContextualTyping.ts(8,9): error TS2322: Type '"string"' is not assignable to type 'number'.
22

33

44
==== tests/cases/conformance/expressions/contextualTyping/getSetAccessorContextualTyping.ts (1 errors) ====
@@ -10,7 +10,7 @@ tests/cases/conformance/expressions/contextualTyping/getSetAccessorContextualTyp
1010
set X(x: number) { }
1111
get X() {
1212
return "string"; // Error; get contextual type by set accessor parameter type annotation
13-
~~~~~~~~
13+
~~~~~~~~~~~~~~~~
1414
!!! error TS2322: Type '"string"' is not assignable to type 'number'.
1515
}
1616

‎tests/baselines/reference/inferSetterParamType.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tests/cases/compiler/inferSetterParamType.ts(3,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
22
tests/cases/compiler/inferSetterParamType.ts(6,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
33
tests/cases/compiler/inferSetterParamType.ts(12,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
4-
tests/cases/compiler/inferSetterParamType.ts(13,16): error TS2322: Type '0' is not assignable to type 'string'.
4+
tests/cases/compiler/inferSetterParamType.ts(13,9): error TS2322: Type '0' is not assignable to type 'string'.
55
tests/cases/compiler/inferSetterParamType.ts(15,9): error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
66

77

@@ -25,7 +25,7 @@ tests/cases/compiler/inferSetterParamType.ts(15,9): error TS1056: Accessors are
2525
~~~
2626
!!! error TS1056: Accessors are only available when targeting ECMAScript 5 and higher.
2727
return 0; // should be an error - can't coerce infered return type to match setter annotated type
28-
~
28+
~~~~~~~~~
2929
!!! error TS2322: Type '0' is not assignable to type 'string'.
3030
}
3131
set bar(n:string) {

‎tests/baselines/reference/invalidReturnStatements.errors.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(2
22
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(3,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
33
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(4,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
44
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(5,17): error TS2355: A function whose declared type is neither 'void' nor 'any' must return a value.
5-
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,29): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
5+
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(16,22): error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
66
Property 'name' is missing in type '{ id: number; }'.
7-
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,29): error TS2322: Type 'C' is not assignable to type 'D'.
7+
tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(18,22): error TS2322: Type 'C' is not assignable to type 'D'.
88
Property 'name' is missing in type 'C'.
99

1010

@@ -33,12 +33,12 @@ tests/cases/conformance/statements/returnStatements/invalidReturnStatements.ts(1
3333
name: string;
3434
}
3535
function fn10(): D { return { id: 12 }; }
36-
~~~~~~~~~~
36+
~~~~~~~~~~~~~~~~~~
3737
!!! error TS2322: Type '{ id: number; }' is not assignable to type 'D'.
3838
!!! error TS2322: Property 'name' is missing in type '{ id: number; }'.
3939

4040
function fn11(): D { return new C(); }
41-
~~~~~~~
41+
~~~~~~~~~~~~~~~
4242
!!! error TS2322: Type 'C' is not assignable to type 'D'.
4343
!!! error TS2322: Property 'name' is missing in type 'C'.
4444

‎tests/baselines/reference/matchReturnTypeInAllBranches.errors.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,20): error TS2322: Type '12345' is not assignable to type 'boolean'.
1+
tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,13): error TS2322: Type '12345' is not assignable to type 'boolean'.
22

33

44
==== tests/cases/compiler/matchReturnTypeInAllBranches.ts (1 errors) ====
@@ -32,7 +32,7 @@ tests/cases/compiler/matchReturnTypeInAllBranches.ts(30,20): error TS2322: Type
3232
else
3333
{
3434
return 12345;
35-
~~~~~
35+
~~~~~~~~~~~~~
3636
!!! error TS2322: Type '12345' is not assignable to type 'boolean'.
3737
}
3838
}

0 commit comments

Comments
 (0)