save token in scanner after scaning hex literal

vladima · vladima · commit 60417ff37966 · 2014-11-20T13:44:51.000-08:00
diff --git a/src/compiler/scanner.ts b/src/compiler/scanner.ts
@@ -931,12 +931,12 @@ module ts {
                                 value = 0;
                             }
                             tokenValue = "" + value;
-                            return SyntaxKind.NumericLiteral;
+                            return token = SyntaxKind.NumericLiteral;
                         }
                         // Try to parse as an octal
                         if (pos + 1 < len && isOctalDigit(text.charCodeAt(pos + 1))) {
                             tokenValue = "" + scanOctalDigits();
-                            return SyntaxKind.NumericLiteral;
+                            return token = SyntaxKind.NumericLiteral;
                         }
                         // This fall-through is a deviation from the EcmaScript grammar. The grammar says that a leading zero
                         // can only be followed by an octal digit, a dot, or the end of the number literal. However, we are being
diff --git a/tests/cases/fourslash/formattingHexLiteral.ts b/tests/cases/fourslash/formattingHexLiteral.ts
@@ -0,0 +1,5 @@
+/// <reference path='fourslash.ts' />
+
+////var x =  0x1,y;
+
+format.document(); // should not crash

Original file line number	Diff line number	Diff line change
`@@ -931,12 +931,12 @@ module ts {`
`931`	`931`	`value = 0;`
`932`	`932`	`}`
`933`	`933`	`tokenValue = "" + value;`
`934`		`- return SyntaxKind.NumericLiteral;`
	`934`	`+ return token = SyntaxKind.NumericLiteral;`
`935`	`935`	`}`
`936`	`936`	`// Try to parse as an octal`
`937`	`937`	`if (pos + 1 < len && isOctalDigit(text.charCodeAt(pos + 1))) {`
`938`	`938`	`tokenValue = "" + scanOctalDigits();`
`939`		`- return SyntaxKind.NumericLiteral;`
	`939`	`+ return token = SyntaxKind.NumericLiteral;`
`940`	`940`	`}`
`941`	`941`	`// This fall-through is a deviation from the EcmaScript grammar. The grammar says that a leading zero`
`942`	`942`	`// can only be followed by an octal digit, a dot, or the end of the number literal. However, we are being`