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

Don't widen inferred return types when a contextual signature is available #40311

Closed
wants to merge 6 commits into from
Closed

Don't widen inferred return types when a contextual signature is available #40311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a7d564d
Added test.
DanielRosenwasser Aug 28, 2020
44c5d87
Accepted baselines.
DanielRosenwasser Aug 28, 2020
8f45d23
Only widen return types of function expressions in the absence of a c…
DanielRosenwasser Aug 28, 2020
e9b467a
Accepted baselines.
DanielRosenwasser Aug 29, 2020
a8aa336
Added missing 'source' property to 'DiagnosticWithLinePosition'.
DanielRosenwasser Aug 29, 2020
4f30b40
Update baselines.
DanielRosenwasser Aug 29, 2020
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
18 changes: 11 additions & 7 deletions src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28295,14 +28295,16 @@ namespace ts {
returnType = getUnionType(types, UnionReduction.Subtype);
}

const contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
if (returnType || yieldType || nextType) {
if (yieldType) reportErrorsFromWidening(func, yieldType, WideningKind.GeneratorYield);
if (returnType) reportErrorsFromWidening(func, returnType, WideningKind.FunctionReturn);
if (nextType) reportErrorsFromWidening(func, nextType, WideningKind.GeneratorNext);
if (!contextualSignature) {
if (yieldType) reportErrorsFromWidening(func, yieldType, WideningKind.GeneratorYield);
if (returnType) reportErrorsFromWidening(func, returnType, WideningKind.FunctionReturn);
if (nextType) reportErrorsFromWidening(func, nextType, WideningKind.GeneratorNext);
}
if (returnType && isUnitType(returnType) ||
yieldType && isUnitType(yieldType) ||
nextType && isUnitType(nextType)) {
const contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
const contextualType = !contextualSignature ? undefined :
contextualSignature === getSignatureFromDeclaration(func) ? isGenerator ? undefined : returnType :
instantiateContextualType(getReturnTypeOfSignature(contextualSignature), func);
Expand All @@ -28316,9 +28318,11 @@ namespace ts {
}
}

if (yieldType) yieldType = getWidenedType(yieldType);
if (returnType) returnType = getWidenedType(returnType);
if (nextType) nextType = getWidenedType(nextType);
if (!contextualSignature) {
if (yieldType) yieldType = getWidenedType(yieldType);
if (returnType) returnType = getWidenedType(returnType);
if (nextType) nextType = getWidenedType(nextType);
}
}

if (isGenerator) {
Expand Down
1 change: 1 addition & 0 deletions src/server/protocol.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,7 @@ namespace ts.server.protocol {
endLocation: Location;
category: string;
code: number;
source?: string;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this change unrelated?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, I think @sheetalkamat might have a better idea, but this un-breaks an excess property error we had in the server layer.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#15296 added this so diagnostics origin can be distinguished.

/** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
reportsUnnecessary?: {};
reportsDeprecated?: {};
Expand Down
1 change: 1 addition & 0 deletions tests/baselines/reference/api/tsserverlibrary.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6791,6 +6791,7 @@ declare namespace ts.server.protocol {
endLocation: Location;
category: string;
code: number;
source?: string;
/** May store more in future. For now, this will simply be `true` to indicate when a diagnostic is an unused-identifier diagnostic. */
reportsUnnecessary?: {};
reportsDeprecated?: {};
Expand Down
4 changes: 2 additions & 2 deletions tests/baselines/reference/assignmentCompatBug2.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(5,13): error TS2322: Type '{ b: num
Object literal may only specify known properties, and 'a' does not exist in type '{ b: number; }'.
tests/cases/compiler/assignmentCompatBug2.ts(15,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
tests/cases/compiler/assignmentCompatBug2.ts(20,1): error TS2741: Property 'g' is missing in type '{ f: (n: number) => number; m: number; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.


==== tests/cases/compiler/assignmentCompatBug2.ts (6 errors) ====
Expand Down Expand Up @@ -59,7 +59,7 @@ tests/cases/compiler/assignmentCompatBug2.ts(33,1): error TS2741: Property 'm' i

b3 = {
~~
!!! error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
!!! error TS2741: Property 'm' is missing in type '{ f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }' but required in type '{ f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }'.
!!! related TS2728 tests/cases/compiler/assignmentCompatBug2.ts:7:55: 'm' is declared here.
f: (n) => { return 0; },
g: (s) => { return 0; },
Expand Down
16 changes: 8 additions & 8 deletions tests/baselines/reference/assignmentCompatBug2.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ b3 = {
}; // error

b3 = {
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => any; }
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => null; }
>b3 : { f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => any; }
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, m: 0, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; m: number; n: number; k: (a: any) => null; }

f: (n) => { return 0; },
>f : (n: number) => number
Expand All @@ -118,17 +118,17 @@ b3 = {
>0 : 0

k: (a) =>{ return null; },
>k : (a: any) => any
>(a) =>{ return null; } : (a: any) => any
>k : (a: any) => null
>(a) =>{ return null; } : (a: any) => null
>a : any
>null : null

}; // ok

b3 = {
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }
>b3 = { f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }
>b3 : { f(n: number): number; g(s: string): number; m: number; n?: number; k?(a: any): any; }
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => any; }
>{ f: (n) => { return 0; }, g: (s) => { return 0; }, n: 0, k: (a) =>{ return null; },} : { f: (n: number) => number; g: (s: string) => number; n: number; k: (a: any) => null; }

f: (n) => { return 0; },
>f : (n: number) => number
Expand All @@ -147,8 +147,8 @@ b3 = {
>0 : 0

k: (a) =>{ return null; },
>k : (a: any) => any
>(a) =>{ return null; } : (a: any) => any
>k : (a: any) => null
>(a) =>{ return null; } : (a: any) => null
>a : any
>null : null

Expand Down
Loading