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

Fix merge issues

Browse Source
This commit is contained in:
Jason Freeman
2014-11-25 12:03:55 -08:00
parent f6266fc99e
commit d43ed2f10e
5 changed files with 24 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/compiler/parser.ts
View File

@@ -1272,17 +1272,21 @@ module ts {
function parseContextualModifier(t: SyntaxKind): boolean {
return token === t && tryParse(() => {
nextToken();
return token === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
return canFollowModifier();
});
}
function parseAnyContextualModifier(): boolean {
return isModifier(token) && tryParse(() => {
nextToken();
return token === SyntaxKind.OpenBracketToken || isLiteralPropertyName();
return canFollowModifier();
});
}
function canFollowModifier(): boolean {
return token === SyntaxKind.OpenBracketToken || token === SyntaxKind.AsteriskToken || isLiteralPropertyName();
}
// True if positioned at the start of a list element
function isListElement(kind: ParsingContext, inErrorRecovery: boolean): boolean {
switch (kind) {