Skip to content

[Release-2.0.5]: Port PR#11118 #11390

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

Merged
yuit merged 4 commits into from
Oct 5, 2016
Merged

[Release-2.0.5]: Port PR#11118 #11390

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13373e4
Address Github #11081 when we start paring "1" in type and keep going…
Sep 24, 2016
5347bab
Add tests
Sep 24, 2016
b9dc02b
Update baselines
Sep 24, 2016
6087667
Update baselines from porting change to release-2.0.5
Oct 5, 2016
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
Next Next commit
Address Github #11081 when we start paring "1" in type and keep going… 
… instead of terminate when see ")"
  • Loading branch information
Kanchalai Tanglertsampan committed Oct 5, 2016
commit 13373e41c8cda47e15bd585da4d69122c03ba46a
4 changes: 2 additions & 2 deletions src/compiler/parser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1380,8 +1380,8 @@ namespace ts {
// Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
return token() === SyntaxKind.CloseParenToken || token() === SyntaxKind.CloseBracketToken /*|| token === SyntaxKind.OpenBraceToken*/;
case ParsingContext.TypeArguments:
// Tokens other than '>' are here for better error recovery
return token() === SyntaxKind.GreaterThanToken || token() === SyntaxKind.OpenParenToken;
// All other tokens should cause the type-argument to terminate except comma token
return token() !== SyntaxKind.CommaToken;
case ParsingContext.HeritageClauses:
return token() === SyntaxKind.OpenBraceToken || token() === SyntaxKind.CloseBraceToken;
case ParsingContext.JsxAttributes:
Expand Down