Merge branch 'jbondc-minor-3'

Author: mhegazy

src/compiler/emitter.ts

@@ -1783,7 +1783,21 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
 
                 emit(node.expression);
                 let indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, node.dotToken);
-                write(".");
+                
+                // 1 .toString is a valid property access, emit a space after the literal 
+                let shouldEmitSpace: boolean;
+                if (!indentedBeforeDot && node.expression.kind === SyntaxKind.NumericLiteral) {
+                    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/types.ts

@@ -1881,7 +1881,7 @@ namespace ts {
         CarriageReturnLineFeed = 0,
         LineFeed = 1,
     }
-	
+
     export interface LineAndCharacter {
         line: number;
         /*

tests/baselines/reference/numLit.errors.txt

@@ -1,13 +1,33 @@
 tests/cases/compiler/numLit.ts(3,3): error TS1005: ';' expected.
-tests/cases/compiler/numLit.ts(3,3): error TS2304: Cannot find name 'toString'.
+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 (2 errors) ====
+==== tests/cases/compiler/numLit.ts (4 errors) ====
     1..toString();
     1.0.toString();
     1.toString();
       ~~~~~~~~
 !!! error TS1005: ';' expected.
-      ~~~~~~~~
-!!! error TS2304: Cannot find name 'toString'.
-    1.+2.0 + 3. ;
+    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

@@ -2,11 +2,37 @@
 1..toString();
 1.0.toString();
 1.toString();
-1.+2.0 + 3. ;
+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()
+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.
+
 
 //// [numLit.js]
 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 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/cases/compiler/numLit.ts

@@ -1,4 +1,17 @@
 1..toString();
 1.0.toString();
 1.toString();
-1.+2.0 + 3. ;
+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()
+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.