maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Skip type parameters.

Browse source
This commit is contained in:
Ron Buckton 2017-02-01 01:24:28 -08:00
parent e0012587f5
commit 9ba2a6b14a
8 changed files with 255 additions and 178 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/checker.ts
View file

@ -858,6 +858,11 @@ namespace ts {
case SyntaxKind.ClassExpression:
case SyntaxKind.InterfaceDeclaration:
if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & SymbolFlags.Type)) {
if (!isTypeParameterSymbolDeclaredInContainer(result, location)) {
// ignore type parameters not declared in this container
result = undefined;
break;
}
if (lastLocation && getModifierFlags(lastLocation) & ModifierFlags.Static) {
// TypeScript 1.0 spec (April 2014): 3.4.1
// The scope of a type parameter extends over the entire declaration with which the type
@ -865,11 +870,6 @@ namespace ts {
error(errorLocation, Diagnostics.Static_members_cannot_reference_class_type_parameters);
return undefined;
}
// Only perform additional check if error reporting was requested
if (nameNotFoundMessage && !isTypeParameterSymbolDeclaredInContainer(result, location)) {
error(errorLocation, Diagnostics.Type_parameter_0_cannot_be_referenced_outside_of_the_declaration_that_defines_it, symbolToString(result));
return undefined;
}
break loop;
}
if (location.kind === SyntaxKind.ClassExpression && meaning & SymbolFlags.Class) {

4
src/compiler/diagnosticMessages.json
View file

@ -1127,10 +1127,6 @@
"category": "Error",
"code": 2366
},
"Type parameter '{0}' cannot be referenced outside of the declaration that defines it.": {
"category": "Error",
"code": 2367
},
"Type parameter name cannot be '{0}'": {
"category": "Error",
"code": 2368

21
tests/baselines/reference/genericDefaults.js
View file

@ -430,6 +430,13 @@ const i06c00 = (<i06>x).a;
const i06c01 = (<i06<number>>x).a;
const i06c02 = (<i06<number, string>>x).a;
interface i07 { a: A; }
interface i07<A = number> { b: A; }
const i07c00 = (<i07>x).a;
const i07c01 = (<i07>x).b;
const i07c02 = (<i07<B>>x).a;
const i07c03 = (<i07<B>>x).b;
interface Base01<T> { a: T; }
interface Base01Constructor { new <T = number>(a?: T): Base01<T>; }
@ -811,6 +818,10 @@ var i05c01 = x.a;
var i06c00 = x.a;
var i06c01 = x.a;
var i06c02 = x.a;
var i07c00 = x.a;
var i07c01 = x.b;
var i07c02 = x.a;
var i07c03 = x.b;
var Base01c00 = new Base01();
var Base01c01 = new Base01(1);
var Base01c02 = new Base01();
@ -933,6 +944,16 @@ interface i06<T = U, U = T> {
declare const i06c00: [{}, {}];
declare const i06c01: [number, number];
declare const i06c02: [number, string];
interface i07 {
a: A;
}
interface i07<A = number> {
b: A;
}
declare const i07c00: A;
declare const i07c01: number;
declare const i07c02: A;
declare const i07c03: B;
interface Base01<T> {
a: T;
}

293
tests/baselines/reference/genericDefaults.symbols
View file

@ -2004,213 +2004,254 @@ const i06c02 = (<i06<number, string>>x).a;
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(i06.a, Decl(genericDefaults.ts, 426, 29))
interface i07 { a: A; }
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>a : Symbol(i07.a, Decl(genericDefaults.ts, 431, 15))
>A : Symbol(A, Decl(genericDefaults.ts, 0, 0))
interface i07<A = number> { b: A; }
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>A : Symbol(A, Decl(genericDefaults.ts, 432, 14))
>b : Symbol(i07.b, Decl(genericDefaults.ts, 432, 27))
>A : Symbol(A, Decl(genericDefaults.ts, 432, 14))
const i07c00 = (<i07>x).a;
>i07c00 : Symbol(i07c00, Decl(genericDefaults.ts, 433, 5))
>(<i07>x).a : Symbol(i07.a, Decl(genericDefaults.ts, 431, 15))
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(i07.a, Decl(genericDefaults.ts, 431, 15))
const i07c01 = (<i07>x).b;
>i07c01 : Symbol(i07c01, Decl(genericDefaults.ts, 434, 5))
>(<i07>x).b : Symbol(i07.b, Decl(genericDefaults.ts, 432, 27))
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>b : Symbol(i07.b, Decl(genericDefaults.ts, 432, 27))
const i07c02 = (<i07<B>>x).a;
>i07c02 : Symbol(i07c02, Decl(genericDefaults.ts, 435, 5))
>(<i07<B>>x).a : Symbol(i07.a, Decl(genericDefaults.ts, 431, 15))
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>B : Symbol(B, Decl(genericDefaults.ts, 0, 26))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(i07.a, Decl(genericDefaults.ts, 431, 15))
const i07c03 = (<i07<B>>x).b;
>i07c03 : Symbol(i07c03, Decl(genericDefaults.ts, 436, 5))
>(<i07<B>>x).b : Symbol(i07.b, Decl(genericDefaults.ts, 432, 27))
>i07 : Symbol(i07, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 431, 23))
>B : Symbol(B, Decl(genericDefaults.ts, 0, 26))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>b : Symbol(i07.b, Decl(genericDefaults.ts, 432, 27))
interface Base01<T> { a: T; }
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 431, 17))
>a : Symbol(Base01.a, Decl(genericDefaults.ts, 431, 21))
>T : Symbol(T, Decl(genericDefaults.ts, 431, 17))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 438, 17))
>a : Symbol(Base01.a, Decl(genericDefaults.ts, 438, 21))
>T : Symbol(T, Decl(genericDefaults.ts, 438, 17))
interface Base01Constructor { new <T = number>(a?: T): Base01<T>; }
>Base01Constructor : Symbol(Base01Constructor, Decl(genericDefaults.ts, 431, 29))
>T : Symbol(T, Decl(genericDefaults.ts, 432, 35))
>a : Symbol(a, Decl(genericDefaults.ts, 432, 47))
>T : Symbol(T, Decl(genericDefaults.ts, 432, 35))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 432, 35))
>Base01Constructor : Symbol(Base01Constructor, Decl(genericDefaults.ts, 438, 29))
>T : Symbol(T, Decl(genericDefaults.ts, 439, 35))
>a : Symbol(a, Decl(genericDefaults.ts, 439, 47))
>T : Symbol(T, Decl(genericDefaults.ts, 439, 35))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 439, 35))
declare const Base01: Base01Constructor;
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>Base01Constructor : Symbol(Base01Constructor, Decl(genericDefaults.ts, 431, 29))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
>Base01Constructor : Symbol(Base01Constructor, Decl(genericDefaults.ts, 438, 29))
const Base01c00 = new Base01();
>Base01c00 : Symbol(Base01c00, Decl(genericDefaults.ts, 435, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>Base01c00 : Symbol(Base01c00, Decl(genericDefaults.ts, 442, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
const Base01c01 = new Base01(1);
>Base01c01 : Symbol(Base01c01, Decl(genericDefaults.ts, 436, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>Base01c01 : Symbol(Base01c01, Decl(genericDefaults.ts, 443, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
const Base01c02 = new Base01<number>();
>Base01c02 : Symbol(Base01c02, Decl(genericDefaults.ts, 437, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>Base01c02 : Symbol(Base01c02, Decl(genericDefaults.ts, 444, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
const Base01c03 = new Base01<number>(1);
>Base01c03 : Symbol(Base01c03, Decl(genericDefaults.ts, 438, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>Base01c03 : Symbol(Base01c03, Decl(genericDefaults.ts, 445, 5))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
declare class Derived01<T> extends Base01<T> { }
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 438, 40))
>T : Symbol(T, Decl(genericDefaults.ts, 440, 24))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 440, 24))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 445, 40))
>T : Symbol(T, Decl(genericDefaults.ts, 447, 24))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 447, 24))
const Derived01c00 = new Derived01();
>Derived01c00 : Symbol(Derived01c00, Decl(genericDefaults.ts, 441, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 438, 40))
>Derived01c00 : Symbol(Derived01c00, Decl(genericDefaults.ts, 448, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 445, 40))
const Derived01c01 = new Derived01(1);
>Derived01c01 : Symbol(Derived01c01, Decl(genericDefaults.ts, 442, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 438, 40))
>Derived01c01 : Symbol(Derived01c01, Decl(genericDefaults.ts, 449, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 445, 40))
const Derived01c02 = new Derived01<number>();
>Derived01c02 : Symbol(Derived01c02, Decl(genericDefaults.ts, 443, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 438, 40))
>Derived01c02 : Symbol(Derived01c02, Decl(genericDefaults.ts, 450, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 445, 40))
const Derived01c03 = new Derived01<number>(1);
>Derived01c03 : Symbol(Derived01c03, Decl(genericDefaults.ts, 444, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 438, 40))
>Derived01c03 : Symbol(Derived01c03, Decl(genericDefaults.ts, 451, 5))
>Derived01 : Symbol(Derived01, Decl(genericDefaults.ts, 445, 40))
declare class Derived02<T = string> extends Base01<T> { }
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 444, 46))
>T : Symbol(T, Decl(genericDefaults.ts, 446, 24))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 429, 42), Decl(genericDefaults.ts, 434, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 446, 24))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 451, 46))
>T : Symbol(T, Decl(genericDefaults.ts, 453, 24))
>Base01 : Symbol(Base01, Decl(genericDefaults.ts, 436, 29), Decl(genericDefaults.ts, 441, 13))
>T : Symbol(T, Decl(genericDefaults.ts, 453, 24))
const Derived02c00 = new Derived02();
>Derived02c00 : Symbol(Derived02c00, Decl(genericDefaults.ts, 447, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 444, 46))
>Derived02c00 : Symbol(Derived02c00, Decl(genericDefaults.ts, 454, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 451, 46))
const Derived02c01 = new Derived02(1);
>Derived02c01 : Symbol(Derived02c01, Decl(genericDefaults.ts, 448, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 444, 46))
>Derived02c01 : Symbol(Derived02c01, Decl(genericDefaults.ts, 455, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 451, 46))
const Derived02c02 = new Derived02<number>();
>Derived02c02 : Symbol(Derived02c02, Decl(genericDefaults.ts, 449, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 444, 46))
>Derived02c02 : Symbol(Derived02c02, Decl(genericDefaults.ts, 456, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 451, 46))
const Derived02c03 = new Derived02<number>(1);
>Derived02c03 : Symbol(Derived02c03, Decl(genericDefaults.ts, 450, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 444, 46))
>Derived02c03 : Symbol(Derived02c03, Decl(genericDefaults.ts, 457, 5))
>Derived02 : Symbol(Derived02, Decl(genericDefaults.ts, 451, 46))
type t00<T = number> = { a: T; }
>t00 : Symbol(t00, Decl(genericDefaults.ts, 450, 46))
>T : Symbol(T, Decl(genericDefaults.ts, 452, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 452, 24))
>T : Symbol(T, Decl(genericDefaults.ts, 452, 9))
>t00 : Symbol(t00, Decl(genericDefaults.ts, 457, 46))
>T : Symbol(T, Decl(genericDefaults.ts, 459, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 459, 24))
>T : Symbol(T, Decl(genericDefaults.ts, 459, 9))
const t00c00 = (<t00>x).a;
>t00c00 : Symbol(t00c00, Decl(genericDefaults.ts, 453, 5))
>(<t00>x).a : Symbol(a, Decl(genericDefaults.ts, 452, 24))
>t00 : Symbol(t00, Decl(genericDefaults.ts, 450, 46))
>t00c00 : Symbol(t00c00, Decl(genericDefaults.ts, 460, 5))
>(<t00>x).a : Symbol(a, Decl(genericDefaults.ts, 459, 24))
>t00 : Symbol(t00, Decl(genericDefaults.ts, 457, 46))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 452, 24))
>a : Symbol(a, Decl(genericDefaults.ts, 459, 24))
const t00c01 = (<t00<number>>x).a;
>t00c01 : Symbol(t00c01, Decl(genericDefaults.ts, 454, 5))
>(<t00<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 452, 24))
>t00 : Symbol(t00, Decl(genericDefaults.ts, 450, 46))
>t00c01 : Symbol(t00c01, Decl(genericDefaults.ts, 461, 5))
>(<t00<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 459, 24))
>t00 : Symbol(t00, Decl(genericDefaults.ts, 457, 46))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 452, 24))
>a : Symbol(a, Decl(genericDefaults.ts, 459, 24))
type t01<T, U = T> = { a: [T, U]; }
>t01 : Symbol(t01, Decl(genericDefaults.ts, 454, 34))
>T : Symbol(T, Decl(genericDefaults.ts, 456, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 456, 11))
>T : Symbol(T, Decl(genericDefaults.ts, 456, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 456, 22))
>T : Symbol(T, Decl(genericDefaults.ts, 456, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 456, 11))
>t01 : Symbol(t01, Decl(genericDefaults.ts, 461, 34))
>T : Symbol(T, Decl(genericDefaults.ts, 463, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 463, 11))
>T : Symbol(T, Decl(genericDefaults.ts, 463, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 463, 22))
>T : Symbol(T, Decl(genericDefaults.ts, 463, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 463, 11))
const t01c00 = (<t01<number>>x).a;
>t01c00 : Symbol(t01c00, Decl(genericDefaults.ts, 457, 5))
>(<t01<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 456, 22))
>t01 : Symbol(t01, Decl(genericDefaults.ts, 454, 34))
>t01c00 : Symbol(t01c00, Decl(genericDefaults.ts, 464, 5))
>(<t01<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 463, 22))
>t01 : Symbol(t01, Decl(genericDefaults.ts, 461, 34))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 456, 22))
>a : Symbol(a, Decl(genericDefaults.ts, 463, 22))
const t01c01 = (<t01<number, string>>x).a;
>t01c01 : Symbol(t01c01, Decl(genericDefaults.ts, 458, 5))
>(<t01<number, string>>x).a : Symbol(a, Decl(genericDefaults.ts, 456, 22))
>t01 : Symbol(t01, Decl(genericDefaults.ts, 454, 34))
>t01c01 : Symbol(t01c01, Decl(genericDefaults.ts, 465, 5))
>(<t01<number, string>>x).a : Symbol(a, Decl(genericDefaults.ts, 463, 22))
>t01 : Symbol(t01, Decl(genericDefaults.ts, 461, 34))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 456, 22))
>a : Symbol(a, Decl(genericDefaults.ts, 463, 22))
type t02<T extends number, U = T> = { a: [T, U]; }
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>T : Symbol(T, Decl(genericDefaults.ts, 460, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 460, 26))
>T : Symbol(T, Decl(genericDefaults.ts, 460, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>T : Symbol(T, Decl(genericDefaults.ts, 460, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 460, 26))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 467, 26))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 467, 26))
const t02c00 = (<t02<number>>x).a;
>t02c00 : Symbol(t02c00, Decl(genericDefaults.ts, 461, 5))
>(<t02<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>t02c00 : Symbol(t02c00, Decl(genericDefaults.ts, 468, 5))
>(<t02<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
const t02c01 = (<t02<1>>x).a;
>t02c01 : Symbol(t02c01, Decl(genericDefaults.ts, 462, 5))
>(<t02<1>>x).a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>t02c01 : Symbol(t02c01, Decl(genericDefaults.ts, 469, 5))
>(<t02<1>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
const t02c02 = (<t02<number, number>>x).a;
>t02c02 : Symbol(t02c02, Decl(genericDefaults.ts, 463, 5))
>(<t02<number, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>t02c02 : Symbol(t02c02, Decl(genericDefaults.ts, 470, 5))
>(<t02<number, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
const t02c03 = (<t02<1, number>>x).a;
>t02c03 : Symbol(t02c03, Decl(genericDefaults.ts, 464, 5))
>(<t02<1, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>t02c03 : Symbol(t02c03, Decl(genericDefaults.ts, 471, 5))
>(<t02<1, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
const t02c04 = (<t02<number, 1>>x).a;
>t02c04 : Symbol(t02c04, Decl(genericDefaults.ts, 465, 5))
>(<t02<number, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 458, 42))
>t02c04 : Symbol(t02c04, Decl(genericDefaults.ts, 472, 5))
>(<t02<number, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
>t02 : Symbol(t02, Decl(genericDefaults.ts, 465, 42))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 460, 37))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 37))
type t03<T extends number, U extends T = T> = { a: [T, U]; }
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 467, 26))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>T : Symbol(T, Decl(genericDefaults.ts, 467, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 467, 26))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>T : Symbol(T, Decl(genericDefaults.ts, 474, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 474, 26))
>T : Symbol(T, Decl(genericDefaults.ts, 474, 9))
>T : Symbol(T, Decl(genericDefaults.ts, 474, 9))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>T : Symbol(T, Decl(genericDefaults.ts, 474, 9))
>U : Symbol(U, Decl(genericDefaults.ts, 474, 26))
const t03c00 = (<t03<number>>x).a;
>t03c00 : Symbol(t03c00, Decl(genericDefaults.ts, 468, 5))
>(<t03<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>t03c00 : Symbol(t03c00, Decl(genericDefaults.ts, 475, 5))
>(<t03<number>>x).a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
const t03c01 = (<t03<1>>x).a;
>t03c01 : Symbol(t03c01, Decl(genericDefaults.ts, 469, 5))
>(<t03<1>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>t03c01 : Symbol(t03c01, Decl(genericDefaults.ts, 476, 5))
>(<t03<1>>x).a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
const t03c02 = (<t03<number, number>>x).a;
>t03c02 : Symbol(t03c02, Decl(genericDefaults.ts, 470, 5))
>(<t03<number, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>t03c02 : Symbol(t03c02, Decl(genericDefaults.ts, 477, 5))
>(<t03<number, number>>x).a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
const t03c03 = (<t03<1, 1>>x).a;
>t03c03 : Symbol(t03c03, Decl(genericDefaults.ts, 471, 5))
>(<t03<1, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>t03c03 : Symbol(t03c03, Decl(genericDefaults.ts, 478, 5))
>(<t03<1, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
const t03c04 = (<t03<number, 1>>x).a;
>t03c04 : Symbol(t03c04, Decl(genericDefaults.ts, 472, 5))
>(<t03<number, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 465, 37))
>t03c04 : Symbol(t03c04, Decl(genericDefaults.ts, 479, 5))
>(<t03<number, 1>>x).a : Symbol(a, Decl(genericDefaults.ts, 474, 47))
>t03 : Symbol(t03, Decl(genericDefaults.ts, 472, 37))
>x : Symbol(x, Decl(genericDefaults.ts, 13, 13))
>a : Symbol(a, Decl(genericDefaults.ts, 467, 47))
>a : Symbol(a, Decl(genericDefaults.ts, 474, 47))

49
tests/baselines/reference/genericDefaults.types
View file

@ -2301,6 +2301,55 @@ const i06c02 = (<i06<number, string>>x).a;
>x : any
>a : [number, string]
interface i07 { a: A; }
>i07 : i07<A>
>a : A
>A : A
interface i07<A = number> { b: A; }
>i07 : i07<A>
>A : A
>b : A
>A : A
const i07c00 = (<i07>x).a;
>i07c00 : A
>(<i07>x).a : A
>(<i07>x) : i07<number>
><i07>x : i07<number>
>i07 : i07<A>
>x : any
>a : A
const i07c01 = (<i07>x).b;
>i07c01 : number
>(<i07>x).b : number
>(<i07>x) : i07<number>
><i07>x : i07<number>
>i07 : i07<A>
>x : any
>b : number
const i07c02 = (<i07<B>>x).a;
>i07c02 : A
>(<i07<B>>x).a : A
>(<i07<B>>x) : i07<B>
><i07<B>>x : i07<B>
>i07 : i07<A>
>B : B
>x : any
>a : A
const i07c03 = (<i07<B>>x).b;
>i07c03 : B
>(<i07<B>>x).b : B
>(<i07<B>>x) : i07<B>
><i07<B>>x : i07<B>
>i07 : i07<A>
>B : B
>x : any
>b : B
interface Base01<T> { a: T; }
>Base01 : Base01<T>
>T : T

9
tests/baselines/reference/genericDefaultsErrors.errors.txt
View file

@ -17,10 +17,11 @@ tests/cases/compiler/genericDefaultsErrors.ts(30,32): error TS2344: Type 'number
tests/cases/compiler/genericDefaultsErrors.ts(33,15): error TS2707: Generic type 'i09<T, U, V>' requires between 2 and 3 type arguments.
tests/cases/compiler/genericDefaultsErrors.ts(34,15): error TS2707: Generic type 'i09<T, U, V>' requires between 2 and 3 type arguments.
tests/cases/compiler/genericDefaultsErrors.ts(37,15): error TS2707: Generic type 'i09<T, U, V>' requires between 2 and 3 type arguments.
tests/cases/compiler/genericDefaultsErrors.ts(39,20): error TS2367: Type parameter 'T' cannot be referenced outside of the declaration that defines it.
tests/cases/compiler/genericDefaultsErrors.ts(39,20): error TS2304: Cannot find name 'T'.
tests/cases/compiler/genericDefaultsErrors.ts(39,20): error TS4033: Property 'x' of exported interface has or is using private name 'T'.
==== tests/cases/compiler/genericDefaultsErrors.ts (18 errors) ====
==== tests/cases/compiler/genericDefaultsErrors.ts (19 errors) ====
declare const x: any;
@ -97,5 +98,7 @@ tests/cases/compiler/genericDefaultsErrors.ts(39,20): error TS2367: Type paramet
interface i10 { x: T; } // error
~
!!! error TS2367: Type parameter 'T' cannot be referenced outside of the declaration that defines it.
!!! error TS2304: Cannot find name 'T'.
~
!!! error TS4033: Property 'x' of exported interface has or is using private name 'T'.
interface i10<T = number> {}

40
tests/baselines/reference/genericDefaultsErrors.js
View file

@ -48,43 +48,3 @@ f11(); // ok
f11(); // error
f12(); // ok
f12("a"); // error
//// [genericDefaultsErrors.d.ts]
declare const x: any;
declare function f03<T extends string = number>(): void;
declare function f04<T extends string, U extends number = T>(): void;
declare function f05<T, U extends number = T>(): void;
declare function f06<T, U extends T = number>(): void;
declare function f11<T, U, V = number>(): void;
declare function f12<T, U = T>(a?: U): void;
interface i00<T> {
}
interface i00<U = number> {
}
interface i01<T = number> {
}
interface i01<T = string> {
}
interface i04<T = number, U> {
}
interface i05<T extends string = number> {
}
interface i06<T extends string, U extends number = T> {
}
interface i07<T, U extends number = T> {
}
interface i08<T, U extends T = number> {
}
interface i09<T, U, V = number> {
}
declare type i09t00 = i09;
declare type i09t01 = i09<1>;
declare type i09t02 = i09<1, 2>;
declare type i09t03 = i09<1, 2, 3>;
declare type i09t04 = i09<1, 2, 3, 4>;
interface i10 {
x: T;
}
interface i10<T = number> {
}

7
tests/cases/compiler/genericDefaults.ts
View file

@ -430,6 +430,13 @@ const i06c00 = (<i06>x).a;
const i06c01 = (<i06<number>>x).a;
const i06c02 = (<i06<number, string>>x).a;
interface i07 { a: A; }
interface i07<A = number> { b: A; }
const i07c00 = (<i07>x).a;
const i07c01 = (<i07>x).b;
const i07c02 = (<i07<B>>x).a;
const i07c03 = (<i07<B>>x).b;
interface Base01<T> { a: T; }
interface Base01Constructor { new <T = number>(a?: T): Base01<T>; }