Trailing comment tests for parameters, fixes the trailing // comments and parameter indentation

Author: sheetalkamat

src/compiler/emitter.ts

@@ -1204,13 +1204,13 @@ module ts {
             }
 
             function emitSignatureParameters(node: FunctionDeclaration) {
+                increaseIndent();
                 write("(");
                 if (node) {
-                    increaseIndent();
                     emitCommaList(node.parameters, node.parameters.length - (hasRestParameters(node) ? 1 : 0));
-                    decreaseIndent();
                 }
                 write(")");
+                decreaseIndent();
             }
 
             function emitSignatureAndBody(node: FunctionDeclaration) {
@@ -1386,8 +1386,8 @@ module ts {
                                 write("function ");
                                 emitSignatureAndBody(accessors.getAccessor);
                                 emitEnd(accessors.getAccessor);
-                                write(",");
                                 emitTrailingComments(accessors.getAccessor);
+                                write(",");
                             }
                             if (accessors.setAccessor) {
                                 writeLine();
@@ -1397,8 +1397,8 @@ module ts {
                                 write("function ");
                                 emitSignatureAndBody(accessors.setAccessor);
                                 emitEnd(accessors.setAccessor);
-                                write(",");
                                 emitTrailingComments(accessors.setAccessor);
+                                write(",");
                             }
                             writeLine();
                             write("enumerable: true,");

src/compiler/scanner.ts

@@ -385,12 +385,14 @@ module ts {
                     continue;
                 case CharacterCodes.slash:
                     var nextChar = text.charCodeAt(pos + 1);
+                    var hasTrailingNewLine = false;
                     if (nextChar === CharacterCodes.slash || nextChar === CharacterCodes.asterisk) {
                         var startPos = pos;
                         pos += 2;
                         if (nextChar === CharacterCodes.slash) {
                             while (pos < text.length) {
                                 if (isLineBreak(text.charCodeAt(pos))) {
+                                    hasTrailingNewLine = true;
                                     break;
                                 }
                                 pos++;
@@ -407,7 +409,7 @@ module ts {
                         }
                         if (collecting) {
                             if (!result) result = [];
-                            result.push({ pos: startPos, end: pos });
+                            result.push({ pos: startPos, end: pos, hasTrailingNewLine: hasTrailingNewLine });
                         }
                         continue;
                     }

tests/baselines/reference/AmbientModuleAndAmbientWithSameNameAndCommonRoot.js

@@ -28,4 +28,4 @@ var p = new A.Point(0, 0); // unexpected error here, bug 840000
 //// [test.js]
 var p;
 var p = A.Point.Origin;
-var p = new A.Point(0, 0); // unexpected error here, bug 840000 
+var p = new A.Point(0, 0); // unexpected error here, bug 840000

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndExportedFunctionThatShareAName.js

@@ -30,15 +30,15 @@ var Point = (function () {
     }
     Point.Origin = function () {
         return { x: 0, y: 0 };
-    }; // unexpected error here bug 840246 
+    }; // unexpected error here bug 840246
     return Point;
 })();
 var Point;
 (function (Point) {
     function Origin() {
         return null;
     }
-    Point.Origin = Origin; //expected duplicate identifier error 
+    Point.Origin = Origin; //expected duplicate identifier error
 })(Point || (Point = {}));
 var A;
 (function (A) {
@@ -49,15 +49,15 @@ var A;
         }
         Point.Origin = function () {
             return { x: 0, y: 0 };
-        }; // unexpected error here bug 840246 
+        }; // unexpected error here bug 840246
         return Point;
     })();
     A.Point = Point;
     (function (Point) {
         function Origin() {
             return "";
         }
-        Point.Origin = Origin; //expected duplicate identifier error 
+        Point.Origin = Origin; //expected duplicate identifier error
     })(A.Point || (A.Point = {}));
     var Point = A.Point;
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticFunctionAndNonExportedFunctionThatShareAName.js

@@ -37,7 +37,7 @@ var Point;
 (function (Point) {
     function Origin() {
         return "";
-    } // not an error, since not exported 
+    } // not an error, since not exported
 })(Point || (Point = {}));
 var A;
 (function (A) {
@@ -55,7 +55,7 @@ var A;
     (function (Point) {
         function Origin() {
             return "";
-        } // not an error since not exported 
+        } // not an error since not exported
     })(A.Point || (A.Point = {}));
     var Point = A.Point;
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndExportedVarThatShareAName.js

@@ -33,7 +33,7 @@ var Point = (function () {
 })();
 var Point;
 (function (Point) {
-    Point.Origin = ""; //expected duplicate identifier error 
+    Point.Origin = ""; //expected duplicate identifier error
 })(Point || (Point = {}));
 var A;
 (function (A) {
@@ -47,7 +47,7 @@ var A;
     })();
     A.Point = Point;
     (function (Point) {
-        Point.Origin = ""; //expected duplicate identifier error 
+        Point.Origin = ""; //expected duplicate identifier error
     })(A.Point || (A.Point = {}));
     var Point = A.Point;
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleThatMergeWithStaticVariableAndNonExportedVarThatShareAName.js

@@ -33,7 +33,7 @@ var Point = (function () {
 })();
 var Point;
 (function (Point) {
-    var Origin = ""; // not an error, since not exported 
+    var Origin = ""; // not an error, since not exported
 })(Point || (Point = {}));
 var A;
 (function (A) {
@@ -47,7 +47,7 @@ var A;
     })();
     A.Point = Point;
     (function (Point) {
-        var Origin = ""; // not an error since not exported 
+        var Origin = ""; // not an error since not exported
     })(A.Point || (A.Point = {}));
     var Point = A.Point;
 })(A || (A = {}));

tests/baselines/reference/ClassAndModuleWithSameNameAndCommonRoot.js

@@ -69,7 +69,7 @@ var X;
 //// [test.js]
 //var cl: { x: number; y: number; }
 var cl = new X.Y.Point(1, 1);
-var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ? 
+var cl = X.Y.Point.Origin; // error not expected here same as bug 83996 ?
 //// [simple.js]
 var A = (function () {
     function A() {

tests/baselines/reference/FunctionAndModuleWithSameNameAndCommonRoot.js

@@ -64,7 +64,7 @@ var fn;
 var fn = A.Point;
 var cl;
 var cl = A.Point();
-var cl = A.Point.Origin; // not expected to be an error. 
+var cl = A.Point.Origin; // not expected to be an error.
 //// [simple.js]
 var B;
 (function (B) {
@@ -78,7 +78,7 @@ var B;
     var Point = B.Point;
 })(B || (B = {}));
 var fn;
-var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected 
+var fn = B.Point; // not expected to be an error. bug 840000: [corelang] Function of fundule not assignalbe as expected
 var cl;
 var cl = B.Point();
 var cl = B.Point.Origin;

tests/baselines/reference/InvalidNonInstantiatedModule.js

@@ -9,5 +9,5 @@ var x: typeof M; // Error only a namespace
 
 
 //// [InvalidNonInstantiatedModule.js]
-var m = M; // Error, not instantiated can not be used as var 
-var x; // Error only a namespace 
+var m = M; // Error, not instantiated can not be used as var
+var x; // Error only a namespace