Skip to content

Continue inferring single generic signature's type parameters in presence of errors #19159

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

Closed
wants to merge 3 commits into from
Closed

Continue inferring single generic signature's type parameters in presence of errors #19159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5b63a8b
Continue inferring single generic signature's type parameters
sandersn Oct 13, 2017
00fb692
Update baselines
sandersn Oct 13, 2017
3a23462
Test multi-round inference in presence of errors
sandersn Oct 13, 2017
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
7 changes: 6 additions & 1 deletion src/compiler/checker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16350,10 +16350,15 @@ namespace ts {
}
if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
candidateForArgumentError = candidate;
break;
if (candidates.length > 1) {
break;
}
}
if (excludeCount === 0) {
candidates[candidateIndex] = candidate;
if (candidate === candidateForArgumentError) {
break;
}
return candidate;
}
excludeCount--;
Expand Down
8 changes: 4 additions & 4 deletions tests/baselines/reference/contextualTypingWithFixedTypeParameters1.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(2,22): error TS2339: Property 'foo' does not exist on type 'string'.
tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(3,32): error TS2339: Property 'foo' does not exist on type '""'.
tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(3,38): error TS2345: Argument of type '1' is not assignable to parameter of type '""'.
tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(3,32): error TS2339: Property 'foo' does not exist on type 'string'.
tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(3,38): error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.


==== tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts (3 errors) ====
Expand All @@ -10,6 +10,6 @@ tests/cases/compiler/contextualTypingWithFixedTypeParameters1.ts(3,38): error TS
!!! error TS2339: Property 'foo' does not exist on type 'string'.
var r9 = f10('', () => (a => a.foo), 1); // error
~~~
!!! error TS2339: Property 'foo' does not exist on type '""'.
!!! error TS2339: Property 'foo' does not exist on type 'string'.
~
!!! error TS2345: Argument of type '1' is not assignable to parameter of type '""'.
!!! error TS2345: Argument of type '1' is not assignable to parameter of type 'string'.
10 changes: 5 additions & 5 deletions tests/baselines/reference/contextualTypingWithFixedTypeParameters1.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ var r9 = f10('', () => (a => a.foo), 1); // error
>f10('', () => (a => a.foo), 1) : any
>f10 : <T>(x: T, b: () => (a: T) => void, y: T) => T
>'' : ""
>() => (a => a.foo) : () => (a: "") => any
>(a => a.foo) : (a: "") => any
>a => a.foo : (a: "") => any
>a : ""
>() => (a => a.foo) : () => (a: string) => any
>(a => a.foo) : (a: string) => any
>a => a.foo : (a: string) => any
>a : string
>a.foo : any
>a : ""
>a : string
>foo : any
>1 : 1

8 changes: 8 additions & 0 deletions tests/baselines/reference/multipleRoundInferenceAfterError.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//// [multipleRoundInferenceAfterError.ts]
// Fixes #18715
declare function inference<T>(target: T, name: keyof T): void;
inference({ a: 1, b: 2, c: 3, d(n) { return n } }, "d");


//// [multipleRoundInferenceAfterError.js]
inference({ a: 1, b: 2, c: 3, d: function (n) { return n; } }, "d");
19 changes: 19 additions & 0 deletions tests/baselines/reference/multipleRoundInferenceAfterError.symbols
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
=== tests/cases/compiler/multipleRoundInferenceAfterError.ts ===
// Fixes #18715
declare function inference<T>(target: T, name: keyof T): void;
>inference : Symbol(inference, Decl(multipleRoundInferenceAfterError.ts, 0, 0))
>T : Symbol(T, Decl(multipleRoundInferenceAfterError.ts, 1, 27))
>target : Symbol(target, Decl(multipleRoundInferenceAfterError.ts, 1, 30))
>T : Symbol(T, Decl(multipleRoundInferenceAfterError.ts, 1, 27))
>name : Symbol(name, Decl(multipleRoundInferenceAfterError.ts, 1, 40))
>T : Symbol(T, Decl(multipleRoundInferenceAfterError.ts, 1, 27))

inference({ a: 1, b: 2, c: 3, d(n) { return n } }, "d");
>inference : Symbol(inference, Decl(multipleRoundInferenceAfterError.ts, 0, 0))
>a : Symbol(a, Decl(multipleRoundInferenceAfterError.ts, 2, 11))
>b : Symbol(b, Decl(multipleRoundInferenceAfterError.ts, 2, 17))
>c : Symbol(c, Decl(multipleRoundInferenceAfterError.ts, 2, 23))
>d : Symbol(d, Decl(multipleRoundInferenceAfterError.ts, 2, 29))
>n : Symbol(n, Decl(multipleRoundInferenceAfterError.ts, 2, 32))
>n : Symbol(n, Decl(multipleRoundInferenceAfterError.ts, 2, 32))

25 changes: 25 additions & 0 deletions tests/baselines/reference/multipleRoundInferenceAfterError.types
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
=== tests/cases/compiler/multipleRoundInferenceAfterError.ts ===
// Fixes #18715
declare function inference<T>(target: T, name: keyof T): void;
>inference : <T>(target: T, name: keyof T) => void
>T : T
>target : T
>T : T
>name : keyof T
>T : T

inference({ a: 1, b: 2, c: 3, d(n) { return n } }, "d");
>inference({ a: 1, b: 2, c: 3, d(n) { return n } }, "d") : void
>inference : <T>(target: T, name: keyof T) => void
>{ a: 1, b: 2, c: 3, d(n) { return n } } : { a: number; b: number; c: number; d(n: any): any; }
>a : number
>1 : 1
>b : number
>2 : 2
>c : number
>3 : 3
>d : (n: any) => any
>n : any
>n : any
>"d" : "d"

4 changes: 2 additions & 2 deletions tests/baselines/reference/typeInferenceConflictingCandidates.errors.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
tests/cases/compiler/typeInferenceConflictingCandidates.ts(3,7): error TS2345: Argument of type '3' is not assignable to parameter of type '""'.
tests/cases/compiler/typeInferenceConflictingCandidates.ts(3,7): error TS2345: Argument of type '3' is not assignable to parameter of type 'string'.


==== tests/cases/compiler/typeInferenceConflictingCandidates.ts (1 errors) ====
declare function g<T>(a: T, b: T, c: (t: T) => T): T;

g("", 3, a => a);
~
!!! error TS2345: Argument of type '3' is not assignable to parameter of type '""'.
!!! error TS2345: Argument of type '3' is not assignable to parameter of type 'string'.
6 changes: 3 additions & 3 deletions tests/baselines/reference/typeInferenceConflictingCandidates.types
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ g("", 3, a => a);
>g : <T>(a: T, b: T, c: (t: T) => T) => T
>"" : ""
>3 : 3
>a => a : (a: any) => any
>a : any
>a : any
>a => a : (a: string) => string
>a : string
>a : string

3 changes: 3 additions & 0 deletions tests/cases/compiler/multipleRoundInferenceAfterError.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Fixes #18715
declare function inference<T>(target: T, name: keyof T): void;
inference({ a: 1, b: 2, c: 3, d(n) { return n } }, "d");
24 changes: 12 additions & 12 deletions tests/cases/fourslash/genericFunctionSignatureHelp3.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,32 @@
////function foo6<T>(x: number, callback: (y6: T) => number) { }
////function foo7<T>(x: number, callback: (y7: T) => number) { }
//// IDE shows the results on the right of each line, fourslash says different
////foo1(/*1*/ // signature help shows y as T
////foo1(/*1*/ // signature help shows y as {}
////foo2(1,/*2*/ // signature help shows y as {}
////foo3(1, (/*3*/ // signature help shows y as T
////foo3(1, (/*3*/ // signature help shows y as {}
////foo4<string>(1,/*4*/ // signature help shows y as string
////foo5<string>(1, (/*5*/ // signature help shows y as T
////foo5<string>(1, (/*5*/ // signature help shows y as string
////foo6(1, </*6*/ // signature help shows y as {}
////foo7(1, <string>(/*7*/ // signature help shows y as T
////foo7(1, <string>(/*7*/ // signature help shows y as {}

goTo.marker('1');
verify.currentSignatureHelpIs('foo1<T>(x: number, callback: (y1: T) => number): void');
verify.currentSignatureHelpIs('foo1(x: number, callback: (y1: {}) => number): void');

// goTo.marker('2');
// verify.currentSignatureHelpIs('foo2(x: number, callback: (y2: {}) => number): void');
goTo.marker('2');
verify.currentSignatureHelpIs('foo2(x: number, callback: (y2: {}) => number): void');

goTo.marker('3');
verify.currentSignatureHelpIs('foo3<T>(x: number, callback: (y3: T) => number): void');
verify.currentSignatureHelpIs('foo3(x: number, callback: (y3: {}) => number): void');

// goTo.marker('4');
// verify.currentSignatureHelpIs('foo4(x: number, callback: (y4: string) => number): void');
goTo.marker('4');
verify.currentSignatureHelpIs('foo4(x: number, callback: (y4: string) => number): void');

goTo.marker('5');
verify.currentSignatureHelpIs('foo5(x: number, callback: (y5: string) => number): void');

goTo.marker('6');
// verify.currentSignatureHelpIs('foo6(x: number, callback: (y6: {}) => number): void');
verify.currentSignatureHelpIs('foo6(x: number, callback: (y6: {}) => number): void');
edit.insert('string>(null,null);'); // need to make this line parse so we can get reasonable LS answers to later tests

goTo.marker('7');
verify.currentSignatureHelpIs('foo7<T>(x: number, callback: (y7: T) => number): void');
verify.currentSignatureHelpIs('foo7(x: number, callback: (y7: {}) => number): void');
16 changes: 8 additions & 8 deletions tests/cases/fourslash/genericFunctionSignatureHelp3MultiFile.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,23 @@
////foo7(1, <string>(/*7*/ // signature help shows y as T

goTo.marker('1');
verify.currentSignatureHelpIs('foo1<T>(x: number, callback: (y1: T) => number): void');
verify.currentSignatureHelpIs('foo1(x: number, callback: (y1: {}) => number): void');

// goTo.marker('2');
// verify.currentSignatureHelpIs('foo2(x: number, callback: (y2: {}) => number): void');
goTo.marker('2');
verify.currentSignatureHelpIs('foo2(x: number, callback: (y2: {}) => number): void');

goTo.marker('3');
verify.currentSignatureHelpIs('foo3<T>(x: number, callback: (y3: T) => number): void');
verify.currentSignatureHelpIs('foo3(x: number, callback: (y3: {}) => number): void');

// goTo.marker('4');
// verify.currentSignatureHelpIs('foo4(x: number, callback: (y4: string) => number): void');
goTo.marker('4');
verify.currentSignatureHelpIs('foo4(x: number, callback: (y4: string) => number): void');

goTo.marker('5');
verify.currentSignatureHelpIs('foo5(x: number, callback: (y5: string) => number): void');

goTo.marker('6');
// verify.currentSignatureHelpIs('foo6(x: number, callback: (y6: {}) => number): void');
verify.currentSignatureHelpIs('foo6(x: number, callback: (y6: {}) => number): void');
edit.insert('string>(null,null);'); // need to make this line parse so we can get reasonable LS answers to later tests

goTo.marker('7');
verify.currentSignatureHelpIs('foo7<T>(x: number, callback: (y7: T) => number): void');
verify.currentSignatureHelpIs('foo7(x: number, callback: (y7: {}) => number): void');