Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Properly re-scan > token in type argument list determination logic (#49560)

Browse Source 
* Properly re-scan '>' token in type argument list determination logic

* Add regression test
This commit is contained in:
Anders Hejlsberg
2022-06-15 12:06:08 -07:00
committed by GitHub
parent ccd8b1d27e
commit 18ac37221b
6 changed files with 87 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/parser.ts
+2 -1
View File
@@ -5764,10 +5764,11 @@ namespace ts {
nextToken();
const typeArguments = parseDelimitedList(ParsingContext.TypeArguments, parseType);
if (!parseExpected(SyntaxKind.GreaterThanToken)) {
if (reScanGreaterToken() !== SyntaxKind.GreaterThanToken) {
// If it doesn't have the closing `>` then it's definitely not an type argument list.
return undefined;
}
nextToken();
// We successfully parsed a type argument list. The next token determines whether we want to
// treat it as such. If the type argument list is followed by `(` or a template literal, as in
tests/baselines/reference/instantiationExpressionErrors.errors.txt
+6
View File
@@ -140,4 +140,10 @@ tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpr
protected specialFoo = f<string>
protected bar = 123
}
// Repro from #49551
const enum MyVer { v1 = 1, v2 = 2 }
let ver = 21
const a = ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2)
tests/baselines/reference/instantiationExpressionErrors.js
+14
View File
@@ -96,6 +96,12 @@ class C4 {
protected specialFoo = f<string>
protected bar = 123
}
// Repro from #49551
const enum MyVer { v1 = 1, v2 = 2 }
let ver = 21
const a = ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2)
//// [instantiationExpressionErrors.js]
@@ -179,6 +185,8 @@ var C4 = /** @class */ (function () {
}
return C4;
}());
var ver = 21;
var a = ver < (1 /* MyVer.v1 */ >= 2 /* MyVer.v2 */ ? 1 /* MyVer.v1 */ : 2 /* MyVer.v2 */);
//// [instantiationExpressionErrors.d.ts]
@@ -283,3 +291,9 @@ declare class C4 {
};
protected bar: number;
}
declare const enum MyVer {
v1 = 1,
v2 = 2
}
declare let ver: number;
declare const a: boolean;
tests/baselines/reference/instantiationExpressionErrors.symbols
+26
View File
@@ -239,3 +239,29 @@ class C4 {
>bar : Symbol(C4.bar, Decl(instantiationExpressionErrors.ts, 94, 36))
}
// Repro from #49551
const enum MyVer { v1 = 1, v2 = 2 }
>MyVer : Symbol(MyVer, Decl(instantiationExpressionErrors.ts, 96, 1))
>v1 : Symbol(MyVer.v1, Decl(instantiationExpressionErrors.ts, 100, 18))
>v2 : Symbol(MyVer.v2, Decl(instantiationExpressionErrors.ts, 100, 26))
let ver = 21
>ver : Symbol(ver, Decl(instantiationExpressionErrors.ts, 101, 3))
const a = ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2)
>a : Symbol(a, Decl(instantiationExpressionErrors.ts, 102, 5))
>ver : Symbol(ver, Decl(instantiationExpressionErrors.ts, 101, 3))
>MyVer.v1 : Symbol(MyVer.v1, Decl(instantiationExpressionErrors.ts, 100, 18))
>MyVer : Symbol(MyVer, Decl(instantiationExpressionErrors.ts, 96, 1))
>v1 : Symbol(MyVer.v1, Decl(instantiationExpressionErrors.ts, 100, 18))
>MyVer.v2 : Symbol(MyVer.v2, Decl(instantiationExpressionErrors.ts, 100, 26))
>MyVer : Symbol(MyVer, Decl(instantiationExpressionErrors.ts, 96, 1))
>v2 : Symbol(MyVer.v2, Decl(instantiationExpressionErrors.ts, 100, 26))
>MyVer.v1 : Symbol(MyVer.v1, Decl(instantiationExpressionErrors.ts, 100, 18))
>MyVer : Symbol(MyVer, Decl(instantiationExpressionErrors.ts, 96, 1))
>v1 : Symbol(MyVer.v1, Decl(instantiationExpressionErrors.ts, 100, 18))
>MyVer.v2 : Symbol(MyVer.v2, Decl(instantiationExpressionErrors.ts, 100, 26))
>MyVer : Symbol(MyVer, Decl(instantiationExpressionErrors.ts, 96, 1))
>v2 : Symbol(MyVer.v2, Decl(instantiationExpressionErrors.ts, 100, 26))
tests/baselines/reference/instantiationExpressionErrors.types
+33
View File
@@ -325,3 +325,36 @@ class C4 {
>123 : 123
}
// Repro from #49551
const enum MyVer { v1 = 1, v2 = 2 }
>MyVer : MyVer
>v1 : MyVer.v1
>1 : 1
>v2 : MyVer.v2
>2 : 2
let ver = 21
>ver : number
>21 : 21
const a = ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2)
>a : boolean
>ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2) : boolean
>ver : number
>(MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2) : MyVer
>MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2 : MyVer
>MyVer.v1 >= MyVer.v2 : boolean
>MyVer.v1 : MyVer.v1
>MyVer : typeof MyVer
>v1 : MyVer.v1
>MyVer.v2 : MyVer.v2
>MyVer : typeof MyVer
>v2 : MyVer.v2
>MyVer.v1 : MyVer.v1
>MyVer : typeof MyVer
>v1 : MyVer.v1
>MyVer.v2 : MyVer.v2
>MyVer : typeof MyVer
>v2 : MyVer.v2
tests/cases/conformance/types/typeParameters/typeArgumentLists/instantiationExpressionErrors.ts
+6
View File
@@ -98,3 +98,9 @@ class C4 {
protected specialFoo = f<string>
protected bar = 123
}
// Repro from #49551
const enum MyVer { v1 = 1, v2 = 2 }
let ver = 21
const a = ver < (MyVer.v1 >= MyVer.v2 ? MyVer.v1 : MyVer.v2)