Merge branch 'master' into dev

dsherret · Sep 1, 2019 · a093b23 · a093b23
2 parents 702dd43 + 0661508
commit a093b23
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/compiler/ast/doc/JSDoc.ts b/src/compiler/ast/doc/JSDoc.ts
@@ -39,7 +39,7 @@ export class JSDoc extends JSDocBase<ts.JSDoc> {
 
         return innerTextWithStars.split(/\n/).map(line => {
             const starPos = line.indexOf("*");
-            if (starPos === -1)
+            if (starPos === -1 || line.substring(0, starPos).trim() !== "")
                 return line;
             const substringStart = line[starPos + 1] === " " ? starPos + 2 : starPos + 1;
             return line.substring(substringStart);

diff --git a/src/tests/compiler/ast/doc/jsDocTests.ts b/src/tests/compiler/ast/doc/jsDocTests.ts
@@ -134,6 +134,11 @@ describe(nameof(JSDoc), () => {
         it("should return the correct inner text when using slash r slash n", () => {
             doTest("/**\r\n * Description\r\n * @param - Test\r\n */function identifier() {}", "Description\r\n@param - Test");
         });
+
+        it("should not modify content's stars", () => {
+            doTest("/** Performs `counter *= 2`.*/function identifier() {}", "Performs `counter *= 2`.");
+            doTest("/**\nPerforms `counter *= 2`.\n*/function identifier() {}", "Performs `counter *= 2`.");
+        });
     });
 
     describe(nameof<JSDoc>(n => n.set), () => {