Revert changes to the parser and augment check to the emitter to handel '1..toString' case

Author: mhegazy

src/compiler/emitter.ts

@@ -1783,11 +1783,21 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 
                 emit(node.expression);
                 let indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
+                
+                // 1 .toString is a valid property access, emit a space after the literal 
+                let shouldEmitSpace: boolean;
                 if (!indentedBeforeDot && node.expression.kind === SyntaxKind.NumericLiteral) {
-                    write(" ."); // JS compat with numeric literal
-                } else {
+                    let text = getSourceTextOfNodeFromSourceFile(currentSourceFile, node.expression);
+                    shouldEmitSpace = text.indexOf(tokenToString(SyntaxKind.DotToken)) < 0;
+                }
+
+                if (shouldEmitSpace) {
+                    write(" ."); 
+                }
+                else {
                     write(".");
                 }
+
                 let indentedAfterDot = indentIfOnDifferentLines(node, node.dotToken, node.name);
                 emit(node.name);
                 decreaseIndentIf(indentedBeforeDot, indentedAfterDot);

src/compiler/parser.ts

@@ -1830,30 +1830,20 @@ namespace ts {
             }
 
             let tokenPos = scanner.getTokenPos();
-            let nextCharCode: number;
-
             nextToken();
             finishNode(node);
 
-            if (node.kind === SyntaxKind.NumericLiteral) {
-                // Octal literals are not allowed in strict mode or ES5
-                // Note that theoretically the following condition would hold true literals like 009,
-                // which is not octal.But because of how the scanner separates the tokens, we would
-                // never get a token like this. Instead, we would get 00 and 9 as two separate tokens.
-                // We also do not need to check for negatives because any prefix operator would be part of a
-                // parent unary expression.
-                if (sourceText.charCodeAt(tokenPos) === CharacterCodes._0 && isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                    node.flags |= NodeFlags.OctalLiteral;
-                }
-                else if (token === SyntaxKind.Identifier && sourceText.charCodeAt(node.end-1) === CharacterCodes.dot) {
-                    nextCharCode = sourceText.charCodeAt(node.end);
-                    if (!isWhiteSpace(nextCharCode) && !isLineBreak(nextCharCode)) {
-                        // If we see 23.Identifier, go back 1 char to scan .Identifier 
-                        node.end = node.end - 1;
-                        scanner.setTextPos(node.end);
-                        nextToken()
-                    }
-                }
+            // Octal literals are not allowed in strict mode or ES5
+            // Note that theoretically the following condition would hold true literals like 009,
+            // which is not octal.But because of how the scanner separates the tokens, we would
+            // never get a token like this. Instead, we would get 00 and 9 as two separate tokens.
+            // We also do not need to check for negatives because any prefix operator would be part of a
+            // parent unary expression.
+            if (node.kind === SyntaxKind.NumericLiteral
+                && sourceText.charCodeAt(tokenPos) === CharacterCodes._0
+                && isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
+
+                node.flags |= NodeFlags.OctalLiteral;
             }
 
             return node;

tests/baselines/reference/numLit.errors.txt

@@ -0,0 +1,33 @@
+tests/cases/compiler/numLit.ts(3,3): error TS1005: ';' expected.
+tests/cases/compiler/numLit.ts(9,15): error TS1005: ',' expected.
+tests/cases/compiler/numLit.ts(9,23): error TS1005: '=' expected.
+tests/cases/compiler/numLit.ts(9,24): error TS1109: Expression expected.
+
+
+==== tests/cases/compiler/numLit.ts (4 errors) ====
+    1..toString();
+    1.0.toString();
+    1.toString();
+      ~~~~~~~~
+!!! error TS1005: ';' expected.
+    1.+2.0 + 3. ;
+    
+    // Preserve whitespace where important for JS compatibility
+    var i: number = 1;
+    var test1 = i.toString();  
+    var test2 = 2.toString(); // emitted as 2 .toString()
+                  ~~~~~~~~
+!!! error TS1005: ',' expected.
+                          ~
+!!! error TS1005: '=' expected.
+                           ~
+!!! error TS1109: Expression expected.
+    var test3 = 3 .toString();
+    var test4 = 3    .toString();
+    var test5 = 3	.toString(); 
+    var test6 = 3.['toString']();
+    var test7 = 3
+    .toString();
+    var test8 = new Number(4).toString();
+    var test9 = 3. + 3.
+    

tests/baselines/reference/numLit.js

@@ -19,14 +19,15 @@ var test9 = 3. + 3.
 
 
 //// [numLit.js]
-1. .toString();
-1.0 .toString();
-1 .toString();
+1..toString();
+1.0.toString();
+1.;
+toString();
 1. + 2.0 + 3.;
 // Preserve whitespace where important for JS compatibility
 var i = 1;
 var test1 = i.toString();
-var test2 = 2 .toString(); // emitted as 2 .toString()
+var test2 = 2., toString = (); // emitted as 2 .toString()
 var test3 = 3 .toString();
 var test4 = 3 .toString();
 var test5 = 3 .toString();

tests/baselines/reference/numLit.symbols

@@ -8,4 +8,4 @@ aBool.toString();
 true.toString();
 var aBool = false;
 aBool.toString();
-1. .toString();
+1..toString();