regex: more restrictive in terms of jsdoc format

fourslash test
microsoft · Apr 10, 2020 · b355a34 · b355a34
1 parent 8138a86
commit b355a34
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/services/completions.ts b/src/services/completions.ts
@@ -884,7 +884,7 @@ namespace ts.Completions {
                 /*/
                 const lineStart = getLineStartPositionForPosition(position, sourceFile);
                 // jsdoc tag will be listed if there is more than one whitespace after "*"
-                const match = /^(?:\s*\/\*\*|[*\s]+(?=\s))?\s+(@)?$/.exec(
+                const match = /^(?:\s*\/\*\*|\s+\*)?\s+(@)?$/.exec(
                     sourceFile.text.substring(lineStart, position)
                 );
                 if (match) {

diff --git a/tests/cases/fourslash/completionsJsdocTag.ts b/tests/cases/fourslash/completionsJsdocTag.ts
@@ -5,11 +5,6 @@
 //// * /**/
 //// */
 
-// cannot run fourslash test these cases because it doesn't recognize the marker
-//** /*invalidMarker1*/*/
-//
-//**    /*invalidMarker2*/*/
-//
 
 // 1x - jsdoc tags are listed when there is more than one whitespace after "*"
 /////**
@@ -162,12 +157,11 @@ test.markerNames().forEach(marker => {
             // case 70:
                 completionOpt = { marker, includes: [
                     "@abstract", "@access",
-                    // "@link"
                 ]};
                 break;
 
             // 3x - jsdoc tag names will be listed
-            case 30: case 31: case 32: case 33: case 34: case 35:
+            case 30: case 31: case 32: case 33: case 34: case 35: case 36:
 
             // 4x - jsdoc tag name completions should not occur
             // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -180,7 +174,7 @@ test.markerNames().forEach(marker => {
                 completionOpt = {
                     marker,
                     triggerCharacter: "@",
-                    includes: ["abstract", "access"]
+                    includes: ["package", "param"]
                 };
                 break;