Merge branch 'master' into classifiedQuickInfo

This commit is contained in:
Cyrus Najmabadi
2014-09-23 13:55:18 -07:00
84 changed files with 12428 additions and 7442 deletions
+1 -1
View File
@@ -821,7 +821,7 @@ module ts {
// applying some stricter checks on that node.
function grammarErrorOnNode(node: Node, message: DiagnosticMessage, arg0?: any, arg1?: any, arg2?: any): void {
var span = getErrorSpanForNode(node);
var start = skipTrivia(file.text, span.pos);
var start = span.end > span.pos ? skipTrivia(file.text, span.pos) : span.pos;
var length = span.end - start;
file.syntacticErrors.push(createFileDiagnostic(file, start, length, message, arg0, arg1, arg2));