Update/add baselines for jsdoc/emitter changes

tests/baselines/reference/arrowFunctionErrorSpan.js

@@ -83,7 +83,9 @@ f(// comment 1
 // comment 2
 function () {
     // comment 4
-});
+}
+ // comment 5
+);
 // body is not a block
 f(function (_) { return 1 +
     2; });

tests/baselines/reference/augmentExportEquals1.js

@@ -32,5 +32,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
-});
+    var a;
+}); // should not work

tests/baselines/reference/augmentExportEquals1_1.js

@@ -29,5 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
-});
+    var a;
+}); // should not work

tests/baselines/reference/augmentExportEquals2.js

@@ -31,5 +31,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "./file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
-});
+    var a;
+}); // should not work

tests/baselines/reference/augmentExportEquals2_1.js

@@ -29,5 +29,5 @@ define(["require", "exports"], function (require, exports) {
 //// [file3.js]
 define(["require", "exports", "file2"], function (require, exports) {
     "use strict";
-    var a; // should not work
-});
+    var a;
+}); // should not work

tests/baselines/reference/augmentedTypesExternalModule1.js

@@ -13,4 +13,4 @@ define(["require", "exports"], function (require, exports) {
         c5.prototype.foo = function () { };
         return c5;
     }());
-});
+}); // should be ok everywhere

tests/baselines/reference/blockScopedFunctionDeclarationInStrictModule.js

@@ -14,4 +14,4 @@ define(["require", "exports"], function (require, exports) {
         foo(); // ok
     }
     return foo;
-});
+}); // not ok

tests/baselines/reference/callOverloads1.js

@@ -22,7 +22,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }());
 function F1(a) { return a; }

tests/baselines/reference/callOverloads2.js

@@ -30,7 +30,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }());
 function F1(s) { return s; } // error

tests/baselines/reference/callOverloads3.js

@@ -23,7 +23,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }());
 //class Foo(s: String);

tests/baselines/reference/callOverloads4.js

@@ -23,7 +23,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }());
 var f1 = new Foo("hey");

tests/baselines/reference/callOverloads5.js

@@ -24,7 +24,7 @@ var Foo = (function () {
     function Foo(x) {
         // WScript.Echo("Constructor function has executed");
     }
-    Foo.prototype.bar1 = function (a) { };
+    Foo.prototype.bar1 = function (a) { /*WScript.Echo(a);*/ };
     return Foo;
 }());
 //class Foo(s: String);

tests/baselines/reference/collisionArgumentsFunction.js

@@ -90,3 +90,4 @@ function f42(i) {
 function f4NoError(arguments) {
     var arguments; // No error
 }
+ // no codegen no error

tests/baselines/reference/collisionRestParameterFunction.js

@@ -63,3 +63,4 @@ function f4(_i) {
 }
 function f4NoError(_i) {
 }
+ // no codegen no error

tests/baselines/reference/collisionThisExpressionAndParameter.js

@@ -167,3 +167,4 @@ function f3(_this) {
     var _this = this;
     (function (x) { console.log(_this.x); });
 }
+ // no code gen - no error

tests/baselines/reference/commentInEmptyParameterList1.js

@@ -3,5 +3,5 @@ function foo(/** nothing */) {
 }
 
 //// [commentInEmptyParameterList1.js]
-function foo() {
+function foo( /** nothing */) {
 }

tests/baselines/reference/commentOnParenthesizedExpressionOpenParen1.js

@@ -7,4 +7,4 @@ var f: () => any;
 //// [commentOnParenthesizedExpressionOpenParen1.js]
 var j;
 var f;
-(j = f());
+(/* Preserve */ j = f());

tests/baselines/reference/commentsArgumentsOfCallExpression2.js

@@ -14,7 +14,7 @@ foo(
 function foo(/*c1*/ x, /*d1*/ y, /*e1*/ w) { }
 var a, b;
 foo(/*c2*/ 1, /*d2*/ 1 + 2, /*e1*/ a + b);
-foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + b);
+foo(/*c3*/ function () { }, /*d2*/ function () { }, /*e2*/ a + /*e3*/ b);
 foo(/*c3*/ function () { }, /*d3*/ function () { }, /*e3*/ (a + b));
 foo(
 /*c4*/ function () { }, 

tests/baselines/reference/commentsFunction.js

@@ -74,8 +74,8 @@ var fooFunc = function FooFunctionValue(/** fooFunctionValue param */ b) {
     return b;
 };
 /// lamdaFoo var comment
-var lambdaFoo = function (/**param a*/ a, /**param b*/ b) { return a + b; };
-var lambddaNoVarComment = function (/**param a*/ a, /**param b*/ b) { return a * b; };
+var lambdaFoo = /** this is lambda comment*/ function (/**param a*/ a, /**param b*/ b) { return a + b; };
+var lambddaNoVarComment = /** this is lambda multiplication*/ function (/**param a*/ a, /**param b*/ b) { return a * b; };
 lambdaFoo(10, 20);
 lambddaNoVarComment(10, 20);
 function blah(a /* multiline trailing comment

tests/baselines/reference/commentsVarDecl.js

@@ -64,13 +64,13 @@ x = myVariable;
 /** jsdocstyle comment - only this comment should be in .d.ts file*/
 var n = 30;
 /** var deckaration with comment on type as well*/
-var y = 20;
+var y = /** value comment */ 20;
 /// var deckaration with comment on type as well
 var yy = 
 /// value comment
 20;
 /** comment2 */
-var z = function (x, y) { return x + y; };
+var z = /** lambda comment */ function (x, y) { return x + y; };
 var z2;
 var x2 = z2;
 var n4;
@@ -98,6 +98,6 @@ declare var y: number;
 declare var yy: number;
 /** comment2 */
 declare var z: (x: number, y: number) => number;
-declare var z2: (x: number) => string;
+declare var z2: /** type comment*/ (x: number) => string;
 declare var x2: (x: number) => string;
 declare var n4: (x: number) => string;

tests/baselines/reference/computedPropertyNames48_ES5.js

@@ -34,5 +34,5 @@ extractIndexer((_b = {},
 extractIndexer((_c = {},
     _c["" || 0] = "",
     _c
-)); // Should return any (widened form of undefined)
-var _a, _b, _c;
+));
+var _a, _b, _c; // Should return any (widened form of undefined)

tests/baselines/reference/constructorOverloads1.js

@@ -25,8 +25,8 @@ f1.bar2();
 var Foo = (function () {
     function Foo(x) {
     }
-    Foo.prototype.bar1 = function () { };
-    Foo.prototype.bar2 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
+    Foo.prototype.bar2 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }());
 var f1 = new Foo("hey");

tests/baselines/reference/constructorOverloads2.js

@@ -34,7 +34,7 @@ var __extends = (this && this.__extends) || function (d, b) {
 var FooBase = (function () {
     function FooBase(x) {
     }
-    FooBase.prototype.bar1 = function () { };
+    FooBase.prototype.bar1 = function () { /*WScript.Echo("base bar1");*/ };
     return FooBase;
 }());
 var Foo = (function (_super) {
@@ -42,7 +42,7 @@ var Foo = (function (_super) {
     function Foo(x, y) {
         _super.call(this, x);
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("bar1");*/ };
     return Foo;
 }(FooBase));
 var f1 = new Foo("hey");

tests/baselines/reference/constructorOverloads3.js

@@ -32,7 +32,7 @@ var Foo = (function (_super) {
     __extends(Foo, _super);
     function Foo(x, y) {
     }
-    Foo.prototype.bar1 = function () { };
+    Foo.prototype.bar1 = function () { /*WScript.Echo("Yo");*/ };
     return Foo;
 }(FooBase));
 var f1 = new Foo("hey");

tests/baselines/reference/contextuallyTypingRestParameters.js

@@ -9,9 +9,9 @@ var x: (...y: string[]) => void = function (.../*3*/y) {
 
 //// [contextuallyTypingRestParameters.js]
 var x = function () {
-    var y = [];
+    var /*3*/ y = [];
     for (var _i = 0; _i < arguments.length; _i++) {
-        y[_i - 0] = arguments[_i];
+        /*3*/ y[_i - 0] = arguments[_i];
     }
     var t = y;
     var x2 = t; // This should be error

tests/baselines/reference/declFileObjectLiteralWithAccessors.js

@@ -12,7 +12,7 @@ var /*2*/x = point.x;
 point./*3*/x = 30;
 
 //// [declFileObjectLiteralWithAccessors.js]
-function makePoint(x) {
+function /*1*/ makePoint(x) {
     return {
         b: 10,
         get x() { return x; },
@@ -22,7 +22,7 @@ function makePoint(x) {
 ;
 var /*4*/ point = makePoint(2);
 var /*2*/ x = point.x;
-point.x = 30;
+point./*3*/ x = 30;
 
 
 //// [declFileObjectLiteralWithAccessors.d.ts]

tests/baselines/reference/declFileObjectLiteralWithOnlyGetter.js

@@ -10,14 +10,14 @@ var /*2*/x = point./*3*/x;
 
 
 //// [declFileObjectLiteralWithOnlyGetter.js]
-function makePoint(x) {
+function /*1*/ makePoint(x) {
     return {
         get x() { return x; },
     };
 }
 ;
 var /*4*/ point = makePoint(2);
-var /*2*/ x = point.x;
+var /*2*/ x = point./*3*/ x;
 
 
 //// [declFileObjectLiteralWithOnlyGetter.d.ts]

tests/baselines/reference/declFileObjectLiteralWithOnlySetter.js

@@ -10,7 +10,7 @@ var /*3*/point = makePoint(2);
 point./*2*/x = 30;
 
 //// [declFileObjectLiteralWithOnlySetter.js]
-function makePoint(x) {
+function /*1*/ makePoint(x) {
     return {
         b: 10,
         set x(a) { this.b = a; }
@@ -18,7 +18,7 @@ function makePoint(x) {
 }
 ;
 var /*3*/ point = makePoint(2);
-point.x = 30;
+point./*2*/ x = 30;
 
 
 //// [declFileObjectLiteralWithOnlySetter.d.ts]

tests/baselines/reference/errorSupression1.js

@@ -18,4 +18,4 @@ var Foo = (function () {
 var baz = Foo.b;
 // Foo.b won't bind. 
 baz.concat("y");
-// So we don't want an error on 'concat'. 
+ // So we don't want an error on 'concat'.

tests/baselines/reference/es6ImportDefaultBindingWithExport.js

@@ -21,7 +21,7 @@ define(["require", "exports"], function (require, exports) {
 define(["require", "exports", "server"], function (require, exports, server_1) {
     "use strict";
     exports.x = server_1.default;
-});
+}); // non referenced
 
 
 //// [server.d.ts]

tests/baselines/reference/es6ImportNameSpaceImportDts.js

@@ -22,6 +22,7 @@ exports.c = c;
 "use strict";
 var nameSpaceBinding = require("./server");
 exports.x = new nameSpaceBinding.c();
+ // unreferenced
 
 
 //// [server.d.ts]

tests/baselines/reference/es6ImportNameSpaceImportNoNamedExports.js

@@ -14,3 +14,4 @@ var a = 10;
 module.exports = a;
 //// [es6ImportNameSpaceImportNoNamedExports_1.js]
 "use strict";
+ // error

tests/baselines/reference/es6ImportNamedImportIdentifiersParsing.js

@@ -7,3 +7,4 @@ import { default as yield } from "somemodule"; // no error
 import { default as default } from "somemodule"; // default as is ok, error of default binding name
 
 //// [es6ImportNamedImportIdentifiersParsing.js]
+ // default as is ok, error of default binding name

tests/baselines/reference/es6modulekindWithES5Target10.js

@@ -8,3 +8,4 @@ namespace N {
 export = N; // Error
 
 //// [es6modulekindWithES5Target10.js]
+ // Error

tests/baselines/reference/exportSpecifierReferencingOuterDeclaration4.js

@@ -12,3 +12,4 @@ export declare function bar(): X.bar; // error
 //// [exportSpecifierReferencingOuterDeclaration2_A.js]
 //// [exportSpecifierReferencingOuterDeclaration2_B.js]
 "use strict";
+ // error

tests/baselines/reference/genericConstraint3.js

@@ -4,3 +4,4 @@ interface A<T, U extends C<T>> { x: U; }
 interface B extends A<{}, { x: {} }> { } // Should not produce an error
 
 //// [genericConstraint3.js]
+ // Should not produce an error

tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases.js

@@ -28,3 +28,4 @@ interface G extends A, B, C, E { } // should only report one error
 interface H extends A, F { } // Should report no error at all because error is internal to F
 
 //// [inheritedMembersAndIndexSignaturesFromDifferentBases.js]
+ // Should report no error at all because error is internal to F

tests/baselines/reference/inheritedMembersAndIndexSignaturesFromDifferentBases2.js

@@ -10,3 +10,4 @@ interface B {
 interface C extends B, A<string> { } // Should succeed
 
 //// [inheritedMembersAndIndexSignaturesFromDifferentBases2.js]
+ // Should succeed

tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes.js

@@ -29,3 +29,4 @@ interface D2 {
 interface E2 extends A2, D2 { } // error
 
 //// [inheritedStringIndexersFromDifferentBaseTypes.js]
+ // error

tests/baselines/reference/inheritedStringIndexersFromDifferentBaseTypes2.js

@@ -25,3 +25,4 @@ interface F extends A, D {
 } // ok because we overrode D's number index signature
 
 //// [inheritedStringIndexersFromDifferentBaseTypes2.js]
+ // ok because we overrode D's number index signature

tests/baselines/reference/jsxInvalidEsprimaTestSuite.js

@@ -62,7 +62,7 @@ a['foo'] > ;
 <a><a />;
 <a b=>;
 var x = <div>one</div><div>two</div>;;
-var x = <div>one</div> /* intervening comment */ /* intervening comment */ <div>two</div>;;
+var x = <div>one</div>/* intervening comment */  /* intervening comment */ <div>two</div>;;
 <a>{"str"}}</a>;
 <span className="a"/> id="b" />;
 <div className/>>;
@@ -76,4 +76,4 @@ var x = <div>one</div> /* intervening comment */ /* intervening comment */ <div>
 <a b=>;
 <a b={ < }>;
 <a>}</a>;
-<a /> /*hai*//*hai*/asdf/>;</></></></>;
+<a />/*hai*/ /*hai*/asdf/>;</></></></>;

tests/baselines/reference/nonConflictingRecursiveBaseTypeMembers.js

@@ -10,3 +10,4 @@ interface B<T> {
 interface C<T> extends A<T>, B<T> { } // Should not be an error
 
 //// [nonConflictingRecursiveBaseTypeMembers.js]
+ // Should not be an error

tests/baselines/reference/objectTypesWithOptionalProperties2.js

@@ -42,6 +42,5 @@ var C2 = (function () {
     return C2;
 }());
 var b = {
-    x: function () { }, 1: // error
-     // error
+    x: function () { }, 1:  // error
 };

tests/baselines/reference/parseRegularExpressionMixedWithComments.js

@@ -8,7 +8,7 @@ var regex5 = /**// asdf/**/ /;
 
 //// [parseRegularExpressionMixedWithComments.js]
 var regex1 = / asdf /;
-var regex2 = / asdf /;
+var regex2 = /**/ / asdf /;
 var regex3 = 1;
-var regex4 = Math.pow(/ /, /asdf /);
-var regex5 = Math.pow(/ asdf/, / /);
+var regex4 = /**/ Math.pow(/ /, /asdf /);
+var regex5 = /**/ Math.pow(/ asdf/, / /);

tests/baselines/reference/parserGreaterThanTokenAmbiguity10.js

@@ -6,5 +6,6 @@
 
 //// [parserGreaterThanTokenAmbiguity10.js]
 1
+ // before
     >>>
         2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity13.js

@@ -2,5 +2,5 @@
 1 >>/**/= 2;
 
 //// [parserGreaterThanTokenAmbiguity13.js]
-1 >> ; /**/
+1 >> /**/ ;
 2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity15.js

@@ -6,5 +6,6 @@
 
 //// [parserGreaterThanTokenAmbiguity15.js]
 1
+ // before
     >>=
         2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity18.js

@@ -2,5 +2,5 @@
 1 >>>/**/= 2;
 
 //// [parserGreaterThanTokenAmbiguity18.js]
-1 >>> ; /**/
+1 >>> /**/ ;
 2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity20.js

@@ -6,5 +6,6 @@
 
 //// [parserGreaterThanTokenAmbiguity20.js]
 1
+ // Before
     >>>=
         2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity3.js

@@ -2,4 +2,4 @@
 1 >/**/> 2;
 
 //// [parserGreaterThanTokenAmbiguity3.js]
-1 >  /**/ > 2;
+1 > /**/  /**/ > 2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity5.js

@@ -6,5 +6,6 @@
 
 //// [parserGreaterThanTokenAmbiguity5.js]
 1
+ // before
     >>
         2;

tests/baselines/reference/parserGreaterThanTokenAmbiguity8.js

@@ -2,4 +2,4 @@
 1 >>/**/> 2;
 
 //// [parserGreaterThanTokenAmbiguity8.js]
-1 >>  /**/ > 2;
+1 >> /**/  /**/ > 2;

tests/baselines/reference/parserSkippedTokens5.js

@@ -2,4 +2,4 @@
 \ /*foo*/ ;
 
 //// [parserSkippedTokens5.js]
-;
+/*foo*/ ;

tests/baselines/reference/parserSkippedTokens7.js

@@ -2,3 +2,4 @@
 /*foo*/ \ /*bar*/
 
 //// [parserSkippedTokens7.js]
+ /*bar*/

tests/baselines/reference/parserSkippedTokens8.js

@@ -3,4 +3,4 @@
 /*foo*/ \ /*bar*/
 
 //// [parserSkippedTokens8.js]
-;
+; /*bar*/

tests/baselines/reference/parserSkippedTokens9.js

@@ -4,3 +4,4 @@
 
 //// [parserSkippedTokens9.js]
 ; // existing trivia
+ /*bar*/

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType1.js

@@ -29,4 +29,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType1_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType2.js

@@ -33,4 +33,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType2_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType3.js

@@ -37,4 +37,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType3_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType4.js

@@ -31,4 +31,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType4_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType5.js

@@ -40,4 +40,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType5_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType6.js

@@ -49,4 +49,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType6_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/recursiveExportAssignmentAndFindAliasedType7.js

@@ -51,4 +51,4 @@ define(["require", "exports"], function (require, exports) {
 //// [recursiveExportAssignmentAndFindAliasedType7_moduleA.js]
 define(["require", "exports"], function (require, exports) {
     "use strict";
-});
+}); // This should result in type ClassB

tests/baselines/reference/returns.js

@@ -0,0 +1,16 @@
+//// [returns.js]
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+    return "";
+}
+
+
+//// [dummy.js]
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+    return "";
+}

tests/baselines/reference/returns.symbols

@@ -0,0 +1,10 @@
+=== tests/cases/conformance/jsdoc/returns.js ===
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+>f : Symbol(f, Decl(returns.js, 0, 0))
+
+    return "";
+}
+

tests/baselines/reference/returns.types

@@ -0,0 +1,11 @@
+=== tests/cases/conformance/jsdoc/returns.js ===
+/**
+ * @returns {string} This comment is not currently exposed
+ */
+function f() {
+>f : () => string
+
+    return "";
+>"" : string
+}
+

tests/baselines/reference/thisInInvalidContextsExternalModule.js

@@ -107,4 +107,4 @@ var SomeEnum;
     SomeEnum[SomeEnum["A"] = this] = "A";
     SomeEnum[SomeEnum["B"] = this.spaaaace] = "B"; // Also should not be allowed
 })(SomeEnum || (SomeEnum = {}));
-module.exports = this;
+module.exports = this; // Should be an error

tests/baselines/reference/tsxParseTests2.js

@@ -8,4 +8,4 @@ var x = </**/div></div>;
 
 
 //// [file.jsx]
-var x = <div></div>;
+var x = </**/ div></div>;

tests/baselines/reference/typeAliasDoesntMakeModuleInstantiated.js

@@ -11,3 +11,4 @@ declare module m {
 declare var m: m.IStatic; // Should be ok to have var 'm' as module is non instantiated
 
 //// [typeAliasDoesntMakeModuleInstantiated.js]
+ // Should be ok to have var 'm' as module is non instantiated

tests/cases/fourslash/commentsClassMembers.ts

@@ -8,11 +8,11 @@
 ////    public p/*3*/2(/** number to add*/b: number) {
 ////        return this./*4*/p1 + /*5*/b;
 ////    }
-////    /** getter property*/
+////    /** getter property 1*/
 ////    public get p/*6*/3() {
 ////        return this./*7*/p/*8q*/2(/*8*/this./*9*/p1);
 ////    }
-////    /** setter property*/
+////    /** setter property 1*/
 ////    public set p/*10*/3(/** this is value*/value: number) {
 ////        this./*11*/p1 = this./*12*/p/*13q*/2(/*13*/value);
 ////    }
@@ -22,11 +22,11 @@
 ////    private p/*15*/p2(/** number to add*/b: number) {
 ////        return this./*16*/p1 + /*17*/b;
 ////    }
-////    /** getter property*/
+////    /** getter property 2*/
 ////    private get p/*18*/p3() {
 ////        return this./*19*/p/*20q*/p2(/*20*/this./*21*/pp1);
 ////    }
-////    /** setter property*/
+////    /** setter property 2*/
 ////    private set p/*22*/p3( /** this is value*/value: number) {
 ////        this./*23*/pp1 = this./*24*/p/*25q*/p2(/*25*/value);
 ////    }
@@ -43,7 +43,7 @@
 ////    static get s/*32*/3() {
 ////        return /*33*/c1./*34*/s/*35q*/2(/*35*/c1./*36*/s1);
 ////    }
-////    /** setter property*/
+////    /** setter property 3*/
 ////    static set s/*37*/3( /** this is value*/value: number) {
 ////        /*38*/c1./*39*/s1 = /*40*/c1./*41*/s/*42q*/2(/*42*/value);
 ////    }
@@ -131,7 +131,6 @@
 ////        th/*116*/is./*114*/a = /*115*/a + 2 + bb/*117*/bb;
 ////    }
 ////}
-
 goTo.marker('1');
 verify.quickInfoIs("class c1", "This is comment for c1");
 
@@ -144,10 +143,10 @@ verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
 goTo.marker('4');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -159,15 +158,15 @@ goTo.marker('5');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
 
 goTo.marker('6');
-verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.p3: number", "getter property 1\nsetter property 1");
 
 goTo.marker('7');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -184,10 +183,10 @@ verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
 goTo.marker('9');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -196,15 +195,15 @@ verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "")
 verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('10');
-verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.p3: number", "getter property 1\nsetter property 1");
 
 goTo.marker('11');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -215,10 +214,10 @@ verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 goTo.marker('12');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -242,10 +241,10 @@ verify.quickInfoIs("(method) c1.pp2(b: number): number", "sum with property");
 goTo.marker('16');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -257,15 +256,15 @@ goTo.marker('17');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
 
 goTo.marker('18');
-verify.quickInfoIs("(property) c1.pp3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.pp3: number", "getter property 2\nsetter property 2");
 
 goTo.marker('19');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -282,10 +281,10 @@ verify.quickInfoIs("(method) c1.pp2(b: number): number", "sum with property");
 goTo.marker('21');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -294,15 +293,15 @@ verify.memberListContains("nc_pp2", "(method) c1.nc_pp2(b: number): number", "")
 verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 
 goTo.marker('22');
-verify.quickInfoIs("(property) c1.pp3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.pp3: number", "getter property 2\nsetter property 2");
 
 goTo.marker('23');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -313,10 +312,10 @@ verify.memberListContains("nc_pp3", "(property) c1.nc_pp3: number", "");
 goTo.marker('24');
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("pp1", "(property) c1.pp1: number", "pp1 is property of c1");
 verify.memberListContains("pp2", "(method) c1.pp2(b: number): number", "sum with property");
-verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property\nsetter property");
+verify.memberListContains("pp3", "(property) c1.pp3: number", "getter property 2\nsetter property 2");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -346,7 +345,7 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 goTo.marker('30');
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
@@ -355,7 +354,7 @@ goTo.marker('31');
 verify.completionListContains("b", "(parameter) b: number", "number to add");
 
 goTo.marker('32');
-verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
+verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property 3");
 
 goTo.marker('33');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
@@ -363,7 +362,7 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 goTo.marker('34');
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
@@ -378,13 +377,13 @@ verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with propert
 goTo.marker('36');
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
 
 goTo.marker('37');
-verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
+verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property 3");
 
 goTo.marker('38');
 verify.completionListContains("c1", "class c1", "This is comment for c1");
@@ -392,7 +391,7 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 goTo.marker('39');
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
@@ -403,7 +402,7 @@ verify.completionListContains("c1", "class c1", "This is comment for c1");
 goTo.marker('41');
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
@@ -514,7 +513,7 @@ goTo.marker('67');
 verify.quickInfoIs("(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p1", "(property) c1.p1: number", "p1 is property of c1");
 verify.memberListContains("p2", "(method) c1.p2(b: number): number", "sum with property");
-verify.memberListContains("p3", "(property) c1.p3: number", "getter property\nsetter property");
+verify.memberListContains("p3", "(property) c1.p3: number", "getter property 1\nsetter property 1");
 verify.memberListContains("nc_p1", "(property) c1.nc_p1: number", "");
 verify.memberListContains("nc_p2", "(method) c1.nc_p2(b: number): number", "");
 verify.memberListContains("nc_p3", "(property) c1.nc_p3: number", "");
@@ -537,9 +536,9 @@ verify.quickInfoIs("(method) c1.p2(b: number): number", "sum with property");
 goTo.marker('72');
 verify.quickInfoIs("var i1_prop: number", "");
 goTo.marker('73');
-verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.p3: number", "getter property 1\nsetter property 1");
 goTo.marker('74');
-verify.quickInfoIs("(property) c1.p3: number", "getter property\nsetter property");
+verify.quickInfoIs("(property) c1.p3: number", "getter property 1\nsetter property 1");
 goTo.marker('75');
 verify.quickInfoIs("var i1_prop: number", "");
 
@@ -584,7 +583,7 @@ goTo.marker('88');
 verify.quickInfoIs("(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s1", "(property) c1.s1: number", "s1 is static property of c1");
 verify.memberListContains("s2", "(method) c1.s2(b: number): number", "static sum with property");
-verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property");
+verify.memberListContains("s3", "(property) c1.s3: number", "static getter property\nsetter property 3");
 verify.memberListContains("nc_s1", "(property) c1.nc_s1: number", "");
 verify.memberListContains("nc_s2", "(method) c1.nc_s2(b: number): number", "");
 verify.memberListContains("nc_s3", "(property) c1.nc_s3: number", "");
@@ -607,9 +606,9 @@ verify.quickInfoIs("(method) c1.s2(b: number): number", "static sum with propert
 goTo.marker('93');
 verify.quickInfoIs("var i1_s_prop: number", "");
 goTo.marker('94');
-verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
+verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property 3");
 goTo.marker('95');
-verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property");
+verify.quickInfoIs("(property) c1.s3: number", "static getter property\nsetter property 3");
 goTo.marker('96');
 verify.quickInfoIs("var i1_s_prop: number", "");
 
@@ -686,8 +685,8 @@ goTo.marker('113');
 verify.quickInfoIs("(property) cProperties.nc_p1: number", "");
 
 goTo.marker('114');
-verify.memberListContains("a", "(property) cWithConstructorProperty.a: number", "more info about a");
-verify.quickInfoIs("(property) cWithConstructorProperty.a: number", "more info about a");
+verify.memberListContains("a", "(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
+verify.quickInfoIs("(property) cWithConstructorProperty.a: number", "this is first parameter a\nmore info about a");
 
 goTo.marker('115');
 verify.completionListContains("a", "(parameter) a: number", "this is first parameter a\nmore info about a");

tests/cases/fourslash/commentsCommentParsing.ts

@@ -48,7 +48,7 @@
 ////}
 ////jsDocMi/*7q*/xedComments2(/*7*/);
 ////
-/////** jsdoc comment */ /*** another jsDocComment*/
+/////** jsdoc comment */ /*** malformed jsDocComment*/
 /////// Triple slash comment
 ////function jsDocMixedComments3() {
 ////}
@@ -238,9 +238,9 @@ goTo.marker('7q');
 verify.quickInfoIs("function jsDocMixedComments2(): void", "jsdoc comment \nanother jsDocComment");
 
 goTo.marker('8');
-verify.currentSignatureHelpDocCommentIs("jsdoc comment \n* another jsDocComment");
+verify.currentSignatureHelpDocCommentIs("jsdoc comment ");
 goTo.marker('8q');
-verify.quickInfoIs("function jsDocMixedComments3(): void", "jsdoc comment \n* another jsDocComment");
+verify.quickInfoIs("function jsDocMixedComments3(): void", "jsdoc comment ");
 
 goTo.marker('9');
 verify.currentSignatureHelpDocCommentIs("jsdoc comment \nanother jsDocComment");
@@ -295,33 +295,33 @@ verify.completionListContains("a", "(parameter) a: number", "first number");
 verify.completionListContains("b", "(parameter) b: number", "second number");
 
 goTo.marker('19');
-verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
+verify.currentSignatureHelpDocCommentIs("This is multiplication function");
 verify.currentParameterHelpArgumentDocCommentIs("first number");
 goTo.marker('19q');
-verify.quickInfoIs("function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
+verify.quickInfoIs("function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function");
 goTo.marker('19aq');
 verify.quickInfoIs("(parameter) a: number", "first number");
 
 goTo.marker('20');
-verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
+verify.currentSignatureHelpDocCommentIs("This is multiplication function");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('20aq');
 verify.quickInfoIs("(parameter) b: number", "");
 
 goTo.marker('21');
-verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
-verify.currentParameterHelpArgumentDocCommentIs("{");
+verify.currentSignatureHelpDocCommentIs("This is multiplication function");
+verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('21aq');
-verify.quickInfoIs("(parameter) c: number", "{");
+verify.quickInfoIs("(parameter) c: number", "");
 
 goTo.marker('22');
-verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
+verify.currentSignatureHelpDocCommentIs("This is multiplication function");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('22aq');
 verify.quickInfoIs("(parameter) d: any", "");
 
 goTo.marker('23');
-verify.currentSignatureHelpDocCommentIs("This is multiplication function\n@anotherTag\n@anotherTag");
+verify.currentSignatureHelpDocCommentIs("This is multiplication function");
 verify.currentParameterHelpArgumentDocCommentIs("LastParam ");
 goTo.marker('23aq');
 verify.quickInfoIs("(parameter) e: any", "LastParam ");
@@ -347,65 +347,65 @@ goTo.marker('26aq');
 verify.quickInfoIs("(parameter) b: string", "");
 
 goTo.marker('27');
-verify.completionListContains("multiply", "function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function\n@anotherTag\n@anotherTag");
+verify.completionListContains("multiply", "function multiply(a: number, b: number, c?: number, d?: any, e?: any): void", "This is multiplication function");
 verify.completionListContains("f1", "function f1(a: number): any (+1 overload)", "fn f1 with number");
 
 goTo.marker('28');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('28q');
-verify.quickInfoIs("function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function");
+verify.quickInfoIs("function subtract(a: number, b: number, c?: () => string, d?: () => string, e?: () => string, f?: () => string): void", "This is subtract function{()=>string; } } f this is optional param f");
 goTo.marker('28aq');
 verify.quickInfoIs("(parameter) a: number", "");
 
 goTo.marker('29');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
 verify.currentParameterHelpArgumentDocCommentIs("this is about b");
 goTo.marker('29aq');
 verify.quickInfoIs("(parameter) b: number", "this is about b");
 
 goTo.marker('30');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
 verify.currentParameterHelpArgumentDocCommentIs("this is optional param c");
 goTo.marker('30aq');
 verify.quickInfoIs("(parameter) c: () => string", "this is optional param c");
 
 goTo.marker('31');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
-verify.currentParameterHelpArgumentDocCommentIs("");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
+verify.currentParameterHelpArgumentDocCommentIs("this is optional param d");
 goTo.marker('31aq');
-verify.quickInfoIs("(parameter) d: () => string", "");
+verify.quickInfoIs("(parameter) d: () => string", "this is optional param d");
 
 goTo.marker('32');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
 verify.currentParameterHelpArgumentDocCommentIs("this is optional param e");
 goTo.marker('32aq');
 verify.quickInfoIs("(parameter) e: () => string", "this is optional param e");
 
 goTo.marker('33');
-verify.currentSignatureHelpDocCommentIs("This is subtract function");
+verify.currentSignatureHelpDocCommentIs("This is subtract function{()=>string; } } f this is optional param f");
 verify.currentParameterHelpArgumentDocCommentIs("");
 goTo.marker('33aq');
 verify.quickInfoIs("(parameter) f: () => string", "");
 
 goTo.marker('34');
-verify.currentSignatureHelpDocCommentIs("this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
+verify.currentSignatureHelpDocCommentIs("this is square function");
 verify.currentParameterHelpArgumentDocCommentIs("this is input number");
 goTo.marker('34q');
-verify.quickInfoIs("function square(a: number): number", "this is square function\n@paramTag { number } a this is input number of paramTag\n@returnType { number } it is return type");
+verify.quickInfoIs("function square(a: number): number", "this is square function");
 goTo.marker('34aq');
 verify.quickInfoIs("(parameter) a: number", "this is input number");
 
 goTo.marker('35');
-verify.currentSignatureHelpDocCommentIs("this is divide function\n@paramTag { number } g this is optional param g");
+verify.currentSignatureHelpDocCommentIs("this is divide function");
 verify.currentParameterHelpArgumentDocCommentIs("this is a");
 goTo.marker('35q');
-verify.quickInfoIs("function divide(a: number, b: number): void", "this is divide function\n@paramTag { number } g this is optional param g");
+verify.quickInfoIs("function divide(a: number, b: number): void", "this is divide function");
 goTo.marker('35aq');
 verify.quickInfoIs("(parameter) a: number", "this is a");
 
 goTo.marker('36');
-verify.currentSignatureHelpDocCommentIs("this is divide function\n@paramTag { number } g this is optional param g");
+verify.currentSignatureHelpDocCommentIs("this is divide function");
 verify.currentParameterHelpArgumentDocCommentIs("this is b");
 goTo.marker('36aq');
 verify.quickInfoIs("(parameter) b: number", "this is b");
@@ -492,4 +492,4 @@ goTo.marker('49aq');
 verify.quickInfoIs("(parameter) c: any", "this is info about b\nnot aligned text about parameter will eat only one space");
 
 goTo.marker('50');
-verify.quickInfoIs("class NoQuickInfoClass", "");
+verify.quickInfoIs("class NoQuickInfoClass", "");

tests/cases/fourslash/commentsFunctionExpression.ts

@@ -64,25 +64,25 @@ verify.quickInfoIs('function anotherFunc(a: number): string', '');
 goTo.marker('8');
 verify.quickInfoIs('(local var) lambdaVar: (b: string) => string', 'documentation\ninner docs ');
 goTo.marker('9');
-verify.quickInfoIs('(parameter) b: string', '{string} inner parameter ');
+verify.quickInfoIs('(parameter) b: string', 'inner parameter ');
 goTo.marker('10');
 verify.quickInfoIs('(local var) localVar: string', '');
 goTo.marker('11');
 verify.quickInfoIs('(local var) localVar: string', '');
 goTo.marker('12');
-verify.quickInfoIs('(parameter) b: string', '{string} inner parameter ');
+verify.quickInfoIs('(parameter) b: string', 'inner parameter ');
 goTo.marker('13');
 verify.quickInfoIs('(local var) lambdaVar: (b: string) => string', 'documentation\ninner docs ');
 
 goTo.marker('14');
-verify.quickInfoIs("var assigned: (s: string) => number", "On variable\n@returns the parameter's length\nSummary on expression\n@returns return on expression");
+verify.quickInfoIs("var assigned: (s: string) => number", "On variable\nSummary on expression");
 goTo.marker('15');
 verify.completionListContains('s', '(parameter) s: string', "the first parameter!\nparam on expression\nOn parameter ");
 goTo.marker('16');
-verify.quickInfoIs("var assigned: (s: string) => number", "On variable\n@returns the parameter's length\nSummary on expression\n@returns return on expression");
+verify.quickInfoIs("var assigned: (s: string) => number", "On variable\nSummary on expression");
 goTo.marker('17');
-verify.completionListContains("assigned", "var assigned: (s: string) => number", "On variable\n@returns the parameter's length\nSummary on expression\n@returns return on expression");
+verify.completionListContains("assigned", "var assigned: (s: string) => number", "On variable\nSummary on expression");
 goTo.marker('18');
-verify.currentSignatureHelpDocCommentIs("On variable\n@returns the parameter's length\nSummary on expression\n@returns return on expression");
+verify.currentSignatureHelpDocCommentIs("On variable\nSummary on expression");
 verify.currentParameterHelpArgumentDocCommentIs("the first parameter!\nparam on expression\nOn parameter ");
 

tests/cases/fourslash/commentsLinePreservation.ts

@@ -116,7 +116,7 @@ goTo.marker('c');
 verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n\nThis is fourth Line");
 
 goTo.marker('d');
-verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n@random tag This should be third line");
+verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line");
 goTo.marker('1');
 verify.quickInfoIs(undefined, "");
 
@@ -126,17 +126,17 @@ goTo.marker('2');
 verify.quickInfoIs(undefined, "");
 
 goTo.marker('f');
-verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n@random tag This should be third line");
+verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line");
 goTo.marker('3');
 verify.quickInfoIs(undefined, "first line of param\n\nparam information third line");
 
 goTo.marker('g');
-verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n@random tag This should be third line");
+verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line");
 goTo.marker('4');
 verify.quickInfoIs(undefined, "param information first line");
 
 goTo.marker('h');
-verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n@random tag This should be third line");
+verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line");
 goTo.marker('5');
 verify.quickInfoIs(undefined, "param information first line\n\nparam information third line");
 
@@ -151,7 +151,7 @@ goTo.marker('7');
 verify.quickInfoIs(undefined, "param information first line\n\nparam information third line");
 
 goTo.marker('k');
-verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line\n@randomtag \n\n random information first line\n\n random information third line");
+verify.quickInfoIs(undefined, "This is firstLine\nThis is second Line");
 goTo.marker('8');
 verify.quickInfoIs(undefined, "hello   ");
 

tests/cases/fourslash/commentsModules.ts

@@ -129,8 +129,8 @@ verify.memberListContains("c", "constructor m1.m2.c(): m1.m2.c", "");
 verify.memberListContains("i", "var m1.m2.i: m1.m2.c", "i");
 
 goTo.marker('9');
-verify.completionListContains("m2", "namespace m2", "");
-verify.quickInfoIs("namespace m2", "");
+verify.completionListContains("m2", "namespace m2", "namespace comment of m2.m3");
+verify.quickInfoIs("namespace m2", "namespace comment of m2.m3");
 
 goTo.marker('10');
 verify.memberListContains("m3", "namespace m2.m3");
@@ -141,12 +141,12 @@ verify.quickInfoIs("constructor m2.m3.c(): m2.m3.c", "");
 verify.memberListContains("c", "constructor m2.m3.c(): m2.m3.c", "");
 
 goTo.marker('12');
-verify.completionListContains("m3", "namespace m3", "");
-verify.quickInfoIs("namespace m3", "");
+verify.completionListContains("m3", "namespace m3", "namespace comment of m3.m4.m5");
+verify.quickInfoIs("namespace m3", "namespace comment of m3.m4.m5");
 
 goTo.marker('13');
-verify.memberListContains("m4", "namespace m3.m4", "");
-verify.quickInfoIs("namespace m3.m4", "");
+verify.memberListContains("m4", "namespace m3.m4", "namespace comment of m3.m4.m5");
+verify.quickInfoIs("namespace m3.m4", "namespace comment of m3.m4.m5");
 
 goTo.marker('14');
 verify.memberListContains("m5", "namespace m3.m4.m5");
@@ -157,12 +157,12 @@ verify.quickInfoIs("constructor m3.m4.m5.c(): m3.m4.m5.c", "");
 verify.memberListContains("c", "constructor m3.m4.m5.c(): m3.m4.m5.c", "");
 
 goTo.marker('16');
-verify.completionListContains("m4", "namespace m4", "");
-verify.quickInfoIs("namespace m4", "");
+verify.completionListContains("m4", "namespace m4", "namespace comment of m4.m5.m6");
+verify.quickInfoIs("namespace m4", "namespace comment of m4.m5.m6");
 
 goTo.marker('17');
-verify.memberListContains("m5", "namespace m4.m5", "");
-verify.quickInfoIs("namespace m4.m5", "");
+verify.memberListContains("m5", "namespace m4.m5", "namespace comment of m4.m5.m6");
+verify.quickInfoIs("namespace m4.m5", "namespace comment of m4.m5.m6");
 
 goTo.marker('18');
 verify.memberListContains("m6", "namespace m4.m5.m6");
@@ -178,11 +178,11 @@ verify.quickInfoIs("constructor m4.m5.m6.m7.c(): m4.m5.m6.m7.c", "");
 
 goTo.marker('21');
 verify.completionListContains("m5", "namespace m5");
-verify.quickInfoIs("namespace m5", "");
+verify.quickInfoIs("namespace m5", "namespace comment of m5.m6.m7");
 
 goTo.marker('22');
 verify.memberListContains("m6", "namespace m5.m6");
-verify.quickInfoIs("namespace m5.m6", "");
+verify.quickInfoIs("namespace m5.m6", "namespace comment of m5.m6.m7");
 
 goTo.marker('23');
 verify.memberListContains("m7", "namespace m5.m6.m7");
@@ -248,4 +248,4 @@ goTo.marker('39');
 verify.quickInfoIs("(method) complexM.m2.c.foo2(): complexM.m1.c", "");
 
 goTo.marker('40');
-verify.quickInfoIs("(method) complexM.m1.c.foo(): number", "");
+verify.quickInfoIs("(method) complexM.m1.c.foo(): number", "");

tests/cases/fourslash/getJavaScriptQuickInfo1.ts

@@ -6,4 +6,4 @@
 ////var /**/v;
 
 goTo.marker();
-verify.quickInfoIs('var v: new (p1: number) => string');
+verify.quickInfoIs('var v: new (arg1: number) => string');

tests/cases/fourslash/getJavaScriptQuickInfo7.ts

@@ -19,4 +19,4 @@
 goTo.marker();
 verify.quickInfoExists();
 verify.quickInfoIs('function a1(p: any): number',
-                   'This is a very cool function that is very nice.\n@returns something');
+                   'This is a very cool function that is very nice.');