microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-06-17 00:34:47 -05:00
Code Issues Packages Projects Releases 212 Wiki Activity

Lookup type arguments correcly for taged templates when checking generic arity (#24496) (#24504)

Browse Source
This commit is contained in:
Wesley Wigham
2018-05-30 15:41:48 -07:00
committed by GitHub
parent 7b1e32ecec
commit 71ea6c3f28
5 changed files with 93 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/checker.ts
View File

@@ -17646,7 +17646,7 @@ namespace ts {
// Even if the call is incomplete, we'll have a missing expression as our last argument,
// so we can say the count is just the arg list length
argCount = args.length;
typeArguments = undefined;
typeArguments = node.typeArguments;
if (node.template.kind === SyntaxKind.TemplateExpression) {
// If a tagged template expression lacks a tail literal, the call is incomplete.

19
tests/baselines/reference/genericTemplateOverloadResolution.js Normal file
View File

@@ -0,0 +1,19 @@
//// [genericTemplateOverloadResolution.ts]
interface IFooFn {
(strings: TemplateStringsArray): Promise<{}>;
<T>(strings: TemplateStringsArray): Promise<T>;
}
declare const fooFn: IFooFn;
declare function expect(x: Promise<number>): void;
expect(fooFn<number>``);
//// [genericTemplateOverloadResolution.js]
var __makeTemplateObject = (this && this.__makeTemplateObject) || function (cooked, raw) {
if (Object.defineProperty) { Object.defineProperty(cooked, "raw", { value: raw }); } else { cooked.raw = raw; }
return cooked;
};
expect(fooFn(__makeTemplateObject([""], [""])));

30
tests/baselines/reference/genericTemplateOverloadResolution.symbols Normal file
View File

@@ -0,0 +1,30 @@
=== tests/cases/compiler/genericTemplateOverloadResolution.ts ===
interface IFooFn {
>IFooFn : Symbol(IFooFn, Decl(genericTemplateOverloadResolution.ts, 0, 0))
(strings: TemplateStringsArray): Promise<{}>;
>strings : Symbol(strings, Decl(genericTemplateOverloadResolution.ts, 1, 5))
>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.d.ts, --, --))
<T>(strings: TemplateStringsArray): Promise<T>;
>T : Symbol(T, Decl(genericTemplateOverloadResolution.ts, 2, 5))
>strings : Symbol(strings, Decl(genericTemplateOverloadResolution.ts, 2, 8))
>TemplateStringsArray : Symbol(TemplateStringsArray, Decl(lib.d.ts, --, --))
>Promise : Symbol(Promise, Decl(lib.d.ts, --, --))
>T : Symbol(T, Decl(genericTemplateOverloadResolution.ts, 2, 5))
}
declare const fooFn: IFooFn;
>fooFn : Symbol(fooFn, Decl(genericTemplateOverloadResolution.ts, 5, 13))
>IFooFn : Symbol(IFooFn, Decl(genericTemplateOverloadResolution.ts, 0, 0))
declare function expect(x: Promise<number>): void;
>expect : Symbol(expect, Decl(genericTemplateOverloadResolution.ts, 5, 28))
>x : Symbol(x, Decl(genericTemplateOverloadResolution.ts, 7, 24))
>Promise : Symbol(Promise, Decl(lib.d.ts, --, --))
expect(fooFn<number>``);
>expect : Symbol(expect, Decl(genericTemplateOverloadResolution.ts, 5, 28))
>fooFn : Symbol(fooFn, Decl(genericTemplateOverloadResolution.ts, 5, 13))

33
tests/baselines/reference/genericTemplateOverloadResolution.types Normal file
View File

@@ -0,0 +1,33 @@
=== tests/cases/compiler/genericTemplateOverloadResolution.ts ===
interface IFooFn {
>IFooFn : IFooFn
(strings: TemplateStringsArray): Promise<{}>;
>strings : TemplateStringsArray
>TemplateStringsArray : TemplateStringsArray
>Promise : Promise<T>
<T>(strings: TemplateStringsArray): Promise<T>;
>T : T
>strings : TemplateStringsArray
>TemplateStringsArray : TemplateStringsArray
>Promise : Promise<T>
>T : T
}
declare const fooFn: IFooFn;
>fooFn : IFooFn
>IFooFn : IFooFn
declare function expect(x: Promise<number>): void;
>expect : (x: Promise<number>) => void
>x : Promise<number>
>Promise : Promise<T>
expect(fooFn<number>``);
>expect(fooFn<number>``) : void
>expect : (x: Promise<number>) => void
>fooFn<number>`` : Promise<number>
>fooFn : IFooFn
>`` : ""

10
tests/cases/compiler/genericTemplateOverloadResolution.ts Normal file
View File

@@ -0,0 +1,10 @@
interface IFooFn {
(strings: TemplateStringsArray): Promise<{}>;
<T>(strings: TemplateStringsArray): Promise<T>;
}
declare const fooFn: IFooFn;
declare function expect(x: Promise<number>): void;
expect(fooFn<number>``);