consistentlly compute the length of an unterminated multiline comment

mhegazy · mhegazy · commit 132cd276d14e · 2014-08-07T23:44:34.000-07:00
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -676,9 +676,8 @@ module ts {
                         if (text.charCodeAt(pos + 1) === CharacterCodes.asterisk) {
                             pos += 2;
 
-                            var safeLength = len - 1; // For lookahead.
                             var commentClosed = false;
-                            while (pos < safeLength) {
+                            while (pos < len) {
                                 var ch = text.charCodeAt(pos);
 
                                 if (ch === CharacterCodes.asterisk && text.charCodeAt(pos + 1) === CharacterCodes.slash) {
@@ -694,7 +693,6 @@ module ts {
                             }
 
                             if (!commentClosed) {
-                                pos++;
                                 error(Diagnostics.Asterisk_Slash_expected);
                             }
 

Original file line number	Diff line number	Diff line change
`@@ -676,9 +676,8 @@ module ts {`
`676`	`676`	`if (text.charCodeAt(pos + 1) === CharacterCodes.asterisk) {`
`677`	`677`	`pos += 2;`
`678`	`678`
`679`		`- var safeLength = len - 1; // For lookahead.`
`680`	`679`	`var commentClosed = false;`
`681`		`- while (pos < safeLength) {`
	`680`	`+ while (pos < len) {`
`682`	`681`	`var ch = text.charCodeAt(pos);`
`683`	`682`
`684`	`683`	`if (ch === CharacterCodes.asterisk && text.charCodeAt(pos + 1) === CharacterCodes.slash) {`
`@@ -694,7 +693,6 @@ module ts {`
`694`	`693`	`}`
`695`	`694`
`696`	`695`	`if (!commentClosed) {`
`697`		`- pos++;`
`698`	`696`	`error(Diagnostics.Asterisk_Slash_expected);`
`699`	`697`	`}`
`700`	`698`