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

Merge branch 'release-1.1'

Browse Source 
Conflicts:
	Jakefile
	src/compiler/tsc.ts
This commit is contained in:
Mohamed Hegazy
2014-09-22 14:55:28 -07:00
parent f7a29222fa dbf87641d7
commit 95394220b4
13 changed files with 1014 additions and 1643 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/parser.ts
+1 -1
View File
@@ -819,7 +819,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));