Merge pull request #1456 from Microsoft/mergeMarkers

Make the compiler resilient to encountering merge conflict markers in a source code file.
This commit is contained in:
CyrusNajmabadi committed 2014-12-11 18:04:25 -08:00
commit 122d8a4d98
9 files changed
+169 -3

No files matched your search

+1
View File
@@ -5920,6 +5920,7 @@ module ts {
return TokenClass.StringLiteral;
case SyntaxKind.RegularExpressionLiteral:
return TokenClass.RegExpLiteral;
case SyntaxKind.ConflictMarkerTrivia:
case SyntaxKind.MultiLineCommentTrivia:
case SyntaxKind.SingleLineCommentTrivia:
return TokenClass.Comment;