Skip to content

Commit 7c2a3c2

Browse files
ahejlsbergahejlsberg
committed
Modifying test a bit
1 parent 33517c4 commit 7c2a3c2

File tree

3 files changed

+59
-14
lines changed

3 files changed

+59
-14
lines changed

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

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(8,9): error TS2315: Type 'C' is not generic.
2-
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(9,9): error TS2315: Type 'I' is not generic.
3-
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(10,9): error TS2315: Type 'E' is not generic.
4-
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(11,9): error TS2315: Type 'T' is not generic.
5-
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(14,12): error TS2315: Type 'U' is not generic.
1+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(7,9): error TS2315: Type 'C' is not generic.
2+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(8,9): error TS2315: Type 'I' is not generic.
3+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(9,9): error TS2315: Type 'E' is not generic.
4+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(10,9): error TS2315: Type 'T' is not generic.
5+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(17,13): error TS2315: Type 'C' is not generic.
6+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(18,13): error TS2315: Type 'I' is not generic.
7+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(19,13): error TS2315: Type 'E' is not generic.
8+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(20,13): error TS2315: Type 'T' is not generic.
9+
tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts(21,13): error TS2315: Type 'U' is not generic.
610

711

8-
==== tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts (5 errors) ====
12+
==== tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts (9 errors) ====
913
// Check that errors are reported for non-generic types with type arguments
1014

1115
class C { }
1216
interface I { }
1317
enum E { }
1418
type T = { };
15-
1619
var v1: C<string>;
1720
~~~~~~~~~
1821
!!! error TS2315: Type 'C' is not generic.
@@ -27,8 +30,24 @@ tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeRefer
2730
!!! error TS2315: Type 'T' is not generic.
2831

2932
function f<U>() {
30-
var x: U<string>;
31-
~~~~~~~~~
33+
class C { }
34+
interface I { }
35+
enum E { }
36+
type T = {};
37+
var v1: C<string>;
38+
~~~~~~~~~
39+
!!! error TS2315: Type 'C' is not generic.
40+
var v2: I<string>;
41+
~~~~~~~~~
42+
!!! error TS2315: Type 'I' is not generic.
43+
var v3: E<string>;
44+
~~~~~~~~~
45+
!!! error TS2315: Type 'E' is not generic.
46+
var v4: T<string>;
47+
~~~~~~~~~
48+
!!! error TS2315: Type 'T' is not generic.
49+
var v5: U<string>;
50+
~~~~~~~~~
3251
!!! error TS2315: Type 'U' is not generic.
3352
}
3453

‎tests/baselines/reference/nonGenericTypeReferenceWithTypeArguments.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,21 @@ class C { }
55
interface I { }
66
enum E { }
77
type T = { };
8-
98
var v1: C<string>;
109
var v2: I<string>;
1110
var v3: E<string>;
1211
var v4: T<string>;
1312

1413
function f<U>() {
15-
var x: U<string>;
14+
class C { }
15+
interface I { }
16+
enum E { }
17+
type T = {};
18+
var v1: C<string>;
19+
var v2: I<string>;
20+
var v3: E<string>;
21+
var v4: T<string>;
22+
var v5: U<string>;
1623
}
1724

1825

@@ -31,5 +38,17 @@ var v2;
3138
var v3;
3239
var v4;
3340
function f() {
34-
var x;
41+
var C = (function () {
42+
function C() {
43+
}
44+
return C;
45+
})();
46+
var E;
47+
(function (E) {
48+
})(E || (E = {}));
49+
var v1;
50+
var v2;
51+
var v3;
52+
var v4;
53+
var v5;
3554
}

‎tests/cases/conformance/types/specifyingTypes/typeReferences/nonGenericTypeReferenceWithTypeArguments.ts

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,19 @@ class C { }
44
interface I { }
55
enum E { }
66
type T = { };
7-
87
var v1: C<string>;
98
var v2: I<string>;
109
var v3: E<string>;
1110
var v4: T<string>;
1211

1312
function f<U>() {
14-
var x: U<string>;
13+
class C { }
14+
interface I { }
15+
enum E { }
16+
type T = {};
17+
var v1: C<string>;
18+
var v2: I<string>;
19+
var v3: E<string>;
20+
var v4: T<string>;
21+
var v5: U<string>;
1522
}

0 commit comments

Comments
 (0)