Fix bug: keep comments unless --removeComments

src/compiler/emitter.ts

@@ -296,21 +296,21 @@ namespace ts {
      * If loop contains block scoped binding captured in some function then loop body is converted to a function.
      * Lexical bindings declared in loop initializer will be passed into the loop body function as parameters,
      * however if this binding is modified inside the body - this new value should be propagated back to the original binding.
-     * This is done by declaring new variable (out parameter holder) outside of the loop for every binding that is reassigned inside the body. 
+     * This is done by declaring new variable (out parameter holder) outside of the loop for every binding that is reassigned inside the body.
      * On every iteration this variable is initialized with value of corresponding binding.
      * At every point where control flow leaves the loop either explicitly (break/continue) or implicitly (at the end of loop body)
      * we copy the value inside the loop to the out parameter holder.
-     * 
+     *
      * for (let x;;) {
      *     let a = 1;
      *     let b = () => a;
      *     x++
      *     if (...) break;
      *     ...
      * }
-     * 
+     *
      * will be converted to
-     * 
+     *
      * var out_x;
      * var loop = function(x) {
      *     var a = 1;
@@ -326,7 +326,7 @@ namespace ts {
      *     x = out_x;
      *     if (state === "break") break;
      * }
-     * 
+     *
      * NOTE: values to out parameters are not copies if loop is abrupted with 'return' - in this case this will end the entire enclosing function
      * so nobody can observe this new value.
      */
@@ -3073,7 +3073,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
                 }
 
                 writeLine();
-                // end of loop body -> copy out parameter 
+                // end of loop body -> copy out parameter
                 copyLoopOutParameters(convertedLoopState, CopyDirection.ToOutParameter, /*emitAsStatements*/true);
 
                 decreaseIndent();
@@ -7269,7 +7269,7 @@ const _super = (function (geti, seti) {
                     }
 
                     // text should be quoted string
-                    // for deduplication purposes in key remove leading and trailing quotes so 'a' and "a" will be considered the same                     
+                    // for deduplication purposes in key remove leading and trailing quotes so 'a' and "a" will be considered the same
                     const key = text.substr(1, text.length - 2);
 
                     if (hasProperty(groupIndices, key)) {
@@ -8070,7 +8070,7 @@ const _super = (function (geti, seti) {
                     leadingComments = getLeadingCommentsToEmit(node);
                 }
                 else {
-                    // If the node will not be emitted in JS, remove all the comments(normal, pinned and ///) associated with the node,
+                    // If the node will not be emitted in JS, remove /// reference comments associated with the node,
                     // unless it is a triple slash comment at the top of the file.
                     // For Example:
                     //      /// <reference-path ...>
@@ -8081,6 +8081,11 @@ const _super = (function (geti, seti) {
                     if (node.pos === 0) {
                         leadingComments = filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
                     }
+                    else {
+                        leadingComments = filter(getLeadingCommentsToEmit(node), function (comment: CommentRange) {
+                            return !isTripleSlashComment(comment);
+                        });
+                    }
                 }
 
                 emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);

tests/baselines/reference/1.0lib-noErrors.js

@@ -1158,3 +1158,60 @@ MERCHANTABLITY OR NON-INFRINGEMENT.
 See the Apache Version 2.0 License for specific language governing permissions
 and limitations under the License.
 ***************************************************************************** */
+/**
+  * Evaluates JavaScript code and executes it.
+  * @param x A String value that contains valid JavaScript code.
+  */
+/**
+  * Converts A string to an integer.
+  * @param s A string to convert into a number.
+  * @param radix A value between 2 and 36 that specifies the base of the number in numString.
+  * If this argument is not supplied, strings with a prefix of '0x' are considered hexadecimal.
+  * All other strings are considered decimal.
+  */
+/**
+  * Converts a string to a floating-point number.
+  * @param string A string that contains a floating-point number.
+  */
+/**
+  * Returns a Boolean value that indicates whether a value is the reserved value NaN (not a number).
+  * @param number A numeric value.
+  */
+/**
+  * Determines whether a supplied number is finite.
+  * @param number Any numeric value.
+  */
+/**
+  * Gets the unencoded version of an encoded Uniform Resource Identifier (URI).
+  * @param encodedURI A value representing an encoded URI.
+  */
+/**
+  * Gets the unencoded version of an encoded component of a Uniform Resource Identifier (URI).
+  * @param encodedURIComponent A value representing an encoded URI component.
+  */
+/**
+  * Encodes a text string as a valid Uniform Resource Identifier (URI)
+  * @param uri A value representing an encoded URI.
+  */
+/**
+  * Encodes a text string as a valid component of a Uniform Resource Identifier (URI).
+  * @param uriComponent A value representing an encoded URI component.
+  */
+/**
+  * Provides functionality common to all JavaScript objects.
+  */
+/**
+  * Creates a new function.
+  */
+/**
+  * Allows manipulation and formatting of text strings and determination and location of substrings within strings.
+  */
+/** An object that represents a number of any kind. All JavaScript numbers are 64-bit floating-point numbers. */
+/** An intrinsic object that provides basic mathematics functionality and constants. */
+/** Enables basic storage and retrieval of dates and times. */
+/**
+  * An intrinsic object that provides functions to convert JavaScript values to and from the JavaScript Object Notation (JSON) format.
+  */
+/////////////////////////////
+/// ECMAScript Array API (specially handled by compiler)
+/////////////////////////////

tests/baselines/reference/ambientDeclarations.js

@@ -77,7 +77,19 @@ declare module 'external1' {
 
 
 //// [ambientDeclarations.js]
+// Ambient variable with type annotation
+// Ambient function with no type annotations
+// Ambient function with type annotations
+// Ambient function with valid overloads
+// Ambient function with optional parameters
+// Ambient class
+// Ambient enum
+// Ambient enum with integer literal initializer
+// Ambient enum members are always exported with or without export keyword
 var x = E3.B;
+// Ambient module
 // Ambient module members are always exported with or without export keyword
 var p = M1.x;
 var q = M1.fn();
+// Ambient external module in the global module
+// Ambient external module with a string literal name that is a top level external module name

tests/baselines/reference/ambientEnum1.js

@@ -9,3 +9,4 @@
     }
 
 //// [ambientEnum1.js]
+// Ambient enum with computer member

tests/baselines/reference/ambientErrors.js

@@ -60,4 +60,15 @@ declare module 'bar' {
 
 
 //// [ambientErrors.js]
+// Ambient functions with invalid overloads
+// Ambient functions with duplicate signatures
+// Ambient function overloads that differ only by return type
+// Ambient function with default parameter values
+// Ambient function with function body
 ;
+// Ambient enum with non - integer literal constant member
+// Ambient enum with computer member
+// Ambient module with initializers for values, bodies for functions / classes
+// Ambient external module not in the global module
+// Ambient external module with a string literal name that isn't a top level external module name
+// Ambient external module with export assignment and other exported members

tests/baselines/reference/ambientExternalModuleMerging.js

@@ -24,3 +24,4 @@ define(["require", "exports", "M"], function (require, exports, M) {
     var y = M.y;
 });
 //// [ambientExternalModuleMerging_declare.js]
+// Merge

tests/baselines/reference/assignmentCompatWithObjectMembersOptionality.js

@@ -116,9 +116,11 @@ var Derived2 = (function (_super) {
 }(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
+    // targets
     var c;
     var a;
     var b = { opt: new Base() };
+    // sources
     var d;
     var e;
     var f;
@@ -139,9 +141,11 @@ var TargetHasOptional;
 })(TargetHasOptional || (TargetHasOptional = {}));
 var SourceHasOptional;
 (function (SourceHasOptional) {
+    // targets
     var c;
     var a;
     var b = { opt: new Base() };
+    // sources
     var d;
     var e;
     var f;

tests/baselines/reference/assignmentCompatWithObjectMembersOptionality2.js

@@ -118,9 +118,11 @@ var Derived2 = (function (_super) {
 }(Derived));
 var TargetHasOptional;
 (function (TargetHasOptional) {
+    // targets
     var c;
     var a;
     var b = { opt: new Base() };
+    // sources
     var d;
     var e;
     var f;
@@ -141,9 +143,11 @@ var TargetHasOptional;
 })(TargetHasOptional || (TargetHasOptional = {}));
 var SourceHasOptional;
 (function (SourceHasOptional) {
+    // targets
     var c;
     var a;
     var b = { opt: new Base() };
+    // sources
     var d;
     var e;
     var f;

tests/baselines/reference/augmentExportEquals1.js

@@ -28,6 +28,8 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    // augmentation for './file1'
+    // should error since './file1' does not have namespace meaning
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {

tests/baselines/reference/augmentExportEquals1_1.js

@@ -25,6 +25,8 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    // augmentation for 'file1'
+    // should error since 'file1' does not have namespace meaning
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {

tests/baselines/reference/augmentExportEquals2.js

@@ -27,6 +27,7 @@ define(["require", "exports"], function (require, exports) {
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    // should error since './file1' does not have namespace meaning
 });
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {

tests/baselines/reference/augmentExportEquals2_1.js

@@ -25,6 +25,7 @@ let a: x.A; // should not work
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    // should error since './file1' does not have namespace meaning
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {

tests/baselines/reference/augmentExportEquals3.js

@@ -38,6 +38,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {

tests/baselines/reference/augmentExportEquals3_1.js

@@ -31,6 +31,7 @@ let b = x.b;
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {

tests/baselines/reference/augmentExportEquals4.js

@@ -42,6 +42,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {

tests/baselines/reference/augmentExportEquals4_1.js

@@ -32,6 +32,7 @@ let b = x.b;
 define(["require", "exports", "file1"], function (require, exports, x) {
     "use strict";
     x.b = 1;
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "file1", "file2"], function (require, exports, x) {

tests/baselines/reference/augmentExportEquals6.js

@@ -54,6 +54,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "./file1"], function (require, exports, x) {
     "use strict";
     x.B.b = 1;
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "./file1", "./file2"], function (require, exports, x) {

tests/baselines/reference/augmentExportEquals6_1.js

@@ -29,6 +29,7 @@ let b = a.a;
 //// [file2.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
+    // OK - './file1' is a namespace
 });
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {

tests/baselines/reference/augmentedTypesInterface.js

@@ -35,6 +35,7 @@ interface i4 {
 
 //// [augmentedTypesInterface.js]
 // interface then interface
+// interface then class
 var i2 = (function () {
     function i2() {
     }
@@ -43,9 +44,11 @@ var i2 = (function () {
     };
     return i2;
 }());
+// interface then enum
 var i3;
 (function (i3) {
     i3[i3["One"] = 0] = "One";
 })(i3 || (i3 = {}));
 ; // error
+// interface then import
 //import i4 = require('');  // error 

tests/baselines/reference/augmentedTypesModules.js

@@ -121,6 +121,7 @@ var m1d;
     m1d.I = I;
 })(m1d || (m1d = {}));
 var m1d = 1; // error
+// module then function
 function m2() { }
 ; // ok since the module is not instantiated
 var m2a;
@@ -156,6 +157,7 @@ var m2g;
     }());
     m2g.C = C;
 })(m2g || (m2g = {}));
+// module then class
 var m3 = (function () {
     function m3() {
     }
@@ -209,6 +211,8 @@ var m3g;
     }());
     m3g.C = C;
 })(m3g || (m3g = {}));
+// module then enum
+// should be errors
 var m4;
 (function (m4) {
 })(m4 || (m4 = {}));

tests/baselines/reference/baseIndexSignatureResolution.js

@@ -42,6 +42,7 @@ var Derived = (function (_super) {
     }
     return Derived;
 }(Base));
+// Note - commmenting "extends Foo" prevents the error
 var x = null;
 var y = x[0];
 /*

tests/baselines/reference/callSignatureAssignabilityInInheritance2.js

@@ -102,3 +102,4 @@ var OtherDerived = (function (_super) {
     }
     return OtherDerived;
 }(Base));
+// S's

tests/baselines/reference/callSignatureAssignabilityInInheritance4.js

@@ -82,3 +82,4 @@ var OtherDerived = (function (_super) {
     }
     return OtherDerived;
 }(Base));
+// S's

tests/baselines/reference/callSignatureAssignabilityInInheritance5.js

@@ -82,3 +82,4 @@ var OtherDerived = (function (_super) {
     }
     return OtherDerived;
 }(Base));
+// S's

tests/baselines/reference/callSignatureAssignabilityInInheritance6.js

@@ -85,3 +85,4 @@ var OtherDerived = (function (_super) {
     }
     return OtherDerived;
 }(Base));
+// S's

tests/baselines/reference/callSignatureWithoutReturnTypeAnnotationInference.js

@@ -198,6 +198,7 @@ function foo11() {
     return M;
 }
 var r11 = foo11();
+// merged declarations
 function foo12() {
     var i2;
     return i2;

tests/baselines/reference/callSignaturesWithParameterInitializers.js

@@ -85,6 +85,7 @@ var C = (function () {
 var c;
 c.foo();
 c.foo(1);
+// these are errors
 var i;
 i();
 i(1);