fix: #778 - Fixes error being thrown when inserting after a jsdoc and…

… the jsdoc is the last member or statement.

Closes #778.

packages/ts-morph/src/compiler/ast/class/base/ClassLikeDeclarationBase.ts

@@ -670,7 +670,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
                 structures,
                 expectedKind: SyntaxKind.Constructor,
                 write: (writer, info) => {
-                    if (!isAmbient && info.previousMember != null)
+                    if (!isAmbient && info.previousMember != null && !Node.isCommentNode(info.previousMember))
                         writer.blankLineIfLastNot();
                     else
                         writer.newLineIfLastNot();
@@ -705,7 +705,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
                 structures,
                 expectedKind: SyntaxKind.GetAccessor,
                 write: (writer, info) => {
-                    if (info.previousMember != null)
+                    if (info.previousMember != null && !Node.isCommentNode(info.previousMember))
                         writer.blankLineIfLastNot();
                     else
                         writer.newLineIfLastNot();
@@ -740,7 +740,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
                 structures,
                 expectedKind: SyntaxKind.SetAccessor,
                 write: (writer, info) => {
-                    if (info.previousMember != null)
+                    if (info.previousMember != null && !Node.isCommentNode(info.previousMember))
                         writer.blankLineIfLastNot();
                     else
                         writer.newLineIfLastNot();
@@ -808,7 +808,7 @@ export function ClassLikeDeclarationBaseSpecific<T extends Constructor<ClassLike
             return insertChildren<MethodDeclaration>(this, {
                 index,
                 write: (writer, info) => {
-                    if (!isAmbient && info.previousMember != null)
+                    if (!isAmbient && info.previousMember != null && !Node.isCommentNode(info.previousMember))
                         writer.blankLineIfLastNot();
                     else
                         writer.newLineIfLastNot();

packages/ts-morph/src/compiler/ast/statement/StatementedNode.ts

@@ -990,7 +990,7 @@ export function StatementedNode<T extends Constructor<StatementedNodeExtensionTy
             writeStructures: () => void,
             opts: StandardWriteOptions = {}
         ) {
-            if (info.previousMember != null && (opts.previousNewLine == null || !opts.previousNewLine(info.previousMember)))
+            if (info.previousMember != null && (opts.previousNewLine == null || !opts.previousNewLine(info.previousMember)) && !Node.isCommentNode(info.previousMember))
                 writer.blankLine();
             else if (!info.isStartOfFile)
                 writer.newLineIfLastNot();

packages/ts-morph/src/manipulation/manipulations/insertion.ts

@@ -308,6 +308,7 @@ export function insertIntoBracesOrSourceFileWithGetChildren<TNode extends Node>(
     const startChildren = opts.getIndexedChildren();
     const parentSyntaxList = opts.parent.getChildSyntaxListOrThrow();
     const index = verifyAndGetIndex(opts.index, startChildren.length);
+    const previousJsDocCount = getPreviousJsDocCount(); // the inserting node will take ownership
 
     insertIntoBracesOrSourceFile({
         parent: opts.parent,
@@ -316,7 +317,7 @@ export function insertIntoBracesOrSourceFileWithGetChildren<TNode extends Node>(
         write: opts.write
     });
 
-    return getRangeWithoutCommentsFromArray<TNode>(opts.getIndexedChildren(), opts.index, opts.structures.length, opts.expectedKind);
+    return getRangeWithoutCommentsFromArray<TNode>(opts.getIndexedChildren(), opts.index - previousJsDocCount, opts.structures.length, opts.expectedKind);
 
     function getChildIndex() {
         if (index === 0)
@@ -325,6 +326,25 @@ export function insertIntoBracesOrSourceFileWithGetChildren<TNode extends Node>(
         // get the previous member in order to get the implementation signature + 1
         return startChildren[index - 1].getChildIndex() + 1;
     }
+
+    function getPreviousJsDocCount() {
+        let commentCount = 0;
+        let count = 0;
+        for (let i = index - 1; i >= 0; i--) {
+            const node = startChildren[i];
+            if (Node.isCommentNode(node)) {
+                commentCount++;
+
+                if (node.getText().startsWith("/**"))
+                    count = commentCount;
+            }
+            else {
+                break;
+            }
+        }
+
+        return count;
+    }
 }
 
 export interface InsertIntoBracesOrSourceFileWithGetChildrenWithCommentsOptions {

packages/ts-morph/src/tests/issues/654tests.ts

@@ -1,6 +1,7 @@
 import { SyntaxKind } from "@ts-morph/common";
 import { expect } from "chai";
 import { getInfoFromText } from "../compiler/testHelpers";
+
 describe("tests for issue #654", () => {
     it("should add a new property where there exists a comment", () => {
         const { sourceFile } = getInfoFromText("const ole = {\n    foo: 'foo',\n    // c\n    bar: 'bar'\n}");

packages/ts-morph/src/tests/issues/745tests.ts

@@ -12,7 +12,7 @@ describe("tests for issue #45", () => {
             statements: "console.log('test');"
         });
 
-        expect(sourceFile.getFullText()).to.equal("class Foo {\n//\n\n    constructor() {\n        console.log('test');\n    }\n}");
+        expect(sourceFile.getFullText()).to.equal("class Foo {\n//\n    constructor() {\n        console.log('test');\n    }\n}");
     });
 
     it("should not error when there is a comment on the close brace token", () => {
@@ -25,6 +25,6 @@ describe("tests for issue #45", () => {
             statements: "console.log('test');"
         });
 
-        expect(sourceFile.getFullText()).to.equal("class Foo {\n//\n\n    constructor() {\n        console.log('test');\n    }\n\n/*b*/}");
+        expect(sourceFile.getFullText()).to.equal("class Foo {\n//\n    constructor() {\n        console.log('test');\n    }\n\n/*b*/}");
     });
 });

packages/ts-morph/src/tests/issues/778tests.ts

@@ -0,0 +1,64 @@
+import { expect } from "chai";
+import { getInfoFromText } from "../compiler/testHelpers";
+
+describe("tests for issue #654", () => {
+    it("should add a new member where there exists a js doc comment before at the end of the class", () => {
+        const { sourceFile } = getInfoFromText(`
+class Foo {
+    /**
+     *
+     */
+}`);
+        const classDec = sourceFile.getClassOrThrow("Foo");
+        classDec.addConstructor({});
+        expect(sourceFile.getFullText()).to.equal(`
+class Foo {
+    /**
+     *
+     */
+    constructor() {
+    }
+}`);
+    });
+
+    it("should add a new member where there exists multiple comments and js docs at the end of the class", () => {
+        const { sourceFile } = getInfoFromText(`
+class Foo {
+    // asdf
+    /** test */
+    // test
+    /** test */
+}`);
+        const classDec = sourceFile.getClassOrThrow("Foo");
+        classDec.addConstructor({});
+        expect(sourceFile.getFullText()).to.equal(`
+class Foo {
+    // asdf
+    /** test */
+    // test
+    /** test */
+    constructor() {
+    }
+}`);
+    });
+
+    it("should add a new source file statement where there exists multiple comments and js docs before at the end of the file", () => {
+        const { sourceFile } = getInfoFromText(`
+// asdf
+/** test */
+// test
+/** test */
+// test
+`);
+        sourceFile.addFunction({ name: "test" });
+        expect(sourceFile.getFullText()).to.equal(`
+// asdf
+/** test */
+// test
+/** test */
+// test
+function test() {
+}
+`);
+    });
+});