Fixed closing JSDoc when adding multiple blocks (#49888)

* Fixed closing JSDoc when adding multiple blocks

* Fixed linting errors

* Refactored to use `some`

Co-authored-by: Nathan Shively-Sanders <[email protected]>

* Removed empty lines

Co-authored-by: Armando Aguirre <[email protected]>
Co-authored-by: Nathan Shively-Sanders <[email protected]>

Author: 3 people

src/services/jsDoc.ts

@@ -357,8 +357,12 @@ namespace ts.JsDoc {
         }
 
         const { commentOwner, parameters, hasReturn } = commentOwnerInfo;
-        const commentOwnerJSDoc = hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? lastOrUndefined(commentOwner.jsDoc) : undefined;
-        if (commentOwner.getStart(sourceFile) < position || commentOwnerJSDoc && commentOwnerJSDoc !== existingDocComment) {
+        const commentOwnerJsDoc = hasJSDocNodes(commentOwner) && commentOwner.jsDoc ? commentOwner.jsDoc : undefined;
+        const lastJsDoc = lastOrUndefined(commentOwnerJsDoc);
+        if (commentOwner.getStart(sourceFile) < position
+            || lastJsDoc
+                && existingDocComment
+                && lastJsDoc !== existingDocComment) {
             return undefined;
         }
 
@@ -378,7 +382,11 @@ namespace ts.JsDoc {
         // * if the caret was directly in front of the object, then we add an extra line and indentation.
         const openComment = "/**";
         const closeComment = " */";
-        if (tags) {
+
+        // If any of the existing jsDoc has tags, ignore adding new ones.
+        const hasTag = (commentOwnerJsDoc || []).some(jsDoc => !!jsDoc.tags);
+
+        if (tags && !hasTag) {
             const preamble = openComment + newLine + indentationStr + " * ";
             const endLine = tokenStart === position ? newLine + indentationStr : "";
             const result = preamble + newLine + tags + indentationStr + closeComment + endLine;

tests/cases/fourslash/docCommentTemplateWithMultipleJSDoc.ts

@@ -0,0 +1,7 @@
+/// <reference path='fourslash.ts' />
+
+/////** */
+/////*/**/
+////function foo() {}
+
+verify.docCommentTemplateAt("", 3, "/** */");

tests/cases/fourslash/docCommentTemplateWithMultipleJSDocAndParameters.ts

@@ -0,0 +1,12 @@
+/// <reference path='fourslash.ts' />
+
+/////** */
+/////**
+//// * 
+//// * @param p 
+//// */
+/////** */
+/////*/**/
+////function foo(p) {}
+
+verify.docCommentTemplateAt("", 3, "/** */");