moved fourslash test for PR microsoft#37546 to fourslash native category

review of regex

Author: jeffy-g

src/services/completions.ts

@@ -831,7 +831,8 @@ namespace ts.Completions {
                 //    *         |c|
                 //    */
                 const lineStart = getLineStartPositionForPosition(position, sourceFile);
-                const m = /^(?:[*\s]+|\s*\/\*\*\s+)(@)?$/.exec(
+                // jsdoc tag will be listed if there is more than one whitespace after "*"
+                const m = /^(?:\s*(?:[*\s]+(?=\s))?\s+|\s*\/\*\*\s+)(@)?$/.exec(
                     sourceFile.text.substring(lineStart, position)
                 );
                 if (m) {
@@ -1271,6 +1272,7 @@ namespace ts.Completions {
         function tryGetGlobalSymbols(): boolean {
             const result: GlobalsSearch = tryGetObjectLikeCompletionSymbols()
                 || tryGetImportOrExportClauseCompletionSymbols()
+                || tryGetLocalNamedExportCompletionSymbols()
                 || tryGetConstructorCompletion()
                 || tryGetClassLikeCompletionSymbols()
                 || tryGetJsxCompletionSymbols()
@@ -1881,19 +1883,17 @@ namespace ts.Completions {
          *      export { | };
          *
          * Relevant symbols are stored in the captured 'symbols' variable.
-         *
-         * @returns true if 'symbols' was successfully populated; false otherwise.
          */
         function tryGetImportOrExportClauseCompletionSymbols(): GlobalsSearch {
             // `import { |` or `import { a as 0, | }`
             const namedImportsOrExports = contextToken && (contextToken.kind === SyntaxKind.OpenBraceToken || contextToken.kind === SyntaxKind.CommaToken)
                 ? tryCast(contextToken.parent, isNamedImportsOrExports) : undefined;
             if (!namedImportsOrExports) return GlobalsSearch.Continue;
 
-            // cursor is in an import clause
-            // try to show exported member for imported module
+            // try to show exported member for imported/re-exported module
             const { moduleSpecifier } = namedImportsOrExports.kind === SyntaxKind.NamedImports ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent;
-            const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier!); // TODO: GH#18217
+            if (!moduleSpecifier) return namedImportsOrExports.kind === SyntaxKind.NamedImports ? GlobalsSearch.Fail : GlobalsSearch.Continue;
+            const moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
             if (!moduleSpecifierSymbol) return GlobalsSearch.Fail;
 
             completionKind = CompletionKind.MemberLike;
@@ -1904,6 +1904,36 @@ namespace ts.Completions {
             return GlobalsSearch.Success;
         }
 
+        /**
+         * Adds local declarations for completions in named exports:
+         *
+         *   export { | };
+         *
+         * Does not check for the absence of a module specifier (`export {} from "./other"`)
+         * because `tryGetImportOrExportClauseCompletionSymbols` runs first and handles that,
+         * preventing this function from running.
+         */
+        function tryGetLocalNamedExportCompletionSymbols(): GlobalsSearch {
+            const namedExports = contextToken && (contextToken.kind === SyntaxKind.OpenBraceToken || contextToken.kind === SyntaxKind.CommaToken)
+                ? tryCast(contextToken.parent, isNamedExports)
+                : undefined;
+
+            if (!namedExports) {
+                return GlobalsSearch.Continue;
+            }
+
+            const localsContainer = findAncestor(namedExports, or(isSourceFile, isModuleDeclaration))!;
+            completionKind = CompletionKind.None;
+            isNewIdentifierLocation = false;
+            localsContainer.locals?.forEach((symbol, name) => {
+                symbols.push(symbol);
+                if (localsContainer.symbol?.exports?.has(name)) {
+                    symbolToSortTextMap[getSymbolId(symbol)] = SortText.OptionalMember;
+                }
+            });
+            return GlobalsSearch.Success;
+        }
+
         /**
          * Aggregates relevant symbols for completion in class declaration
          * Relevant symbols are stored in the captured 'symbols' variable.
@@ -2299,7 +2329,7 @@ namespace ts.Completions {
             }
         }
 
-        // Set SortText to OptionalMember if it is an optinoal member
+        // Set SortText to OptionalMember if it is an optional member
         function setSortTextToOptionalMember() {
             symbols.forEach(m => {
                 if (m.flags & SymbolFlags.Optional) {

tests/cases/fourslash/completionsGetCompletionData_hasDocComment37546.ts

@@ -0,0 +1,71 @@
+/// <reference path="./fourslash.ts"/>
+
+//
+// fourslash test: src/services/completions.ts#getCompletionData (#37546)
+//
+
+/////**
+//// +/*1*/
+//// */
+////function a0(s: string) {}
+////
+
+/**
+ *
+ */
+const jsDocTagNames = [
+    "abstract",        "access",          "alias",           "argument",        "async",           "augments",        "author",          "borrows",         "callback",        "class",
+    "classdesc",       "constant",        "constructor",     "constructs",      "copyright",       "default",         "deprecated",      "description",     "emits",           "enum",
+    "event",           "example",         "exports",         "extends",         "external",        "field",           "file",            "fileoverview",    "fires",           "function",
+    "generator",       "global",          "hideconstructor", "host",            "ignore",          "implements",      "inheritdoc",      "inner",           "instance",        "interface",
+    "kind",            "lends",           "license",         "listens",         "member",          "memberof",        "method",          "mixes",           "module",          "name",
+    "namespace",       "override",        "package",         "param",           "private",         "property",        "protected",       "public",          "readonly",        "requires",
+    "returns",         "see",             "since",           "static",          "summary",         "template",        "this",            "throws",          "todo",            "tutorial",
+    "type",            "typedef",         "var",             "variation",       "version",         "virtual",         "yields"
+];
+const jsDocTags = jsDocTagNames.map(name => "@" + name);
+
+
+// ℹ️ line 2: [ +|c|]
+verify.completions({
+    marker: "1",
+    exact: [] // or undefined
+});
+
+// ℹ️ line 2: [ +|c|] -> [ +@|c|]
+// before the fix, jsdoc tag names was listed but no longer appears
+edit.insert("@");
+verify.completions({
+    marker: "1",
+    exact: undefined
+});
+
+// ℹ️ line 2: [ +@|c|] -> [ *|c|]
+// before the fix, jsdoc tags was listed but no longer appears
+edit.replaceLine(1, " *");
+// goTo.position({ line: 1, character: 2 });
+verify.completions({
+    // marker: "1", // marker is not available
+    exact: undefined
+});
+
+// ℹ️ line 2: [ *|c|] -> [ *@|c|]
+// this behavior does not by "hasDocComment" section
+edit.insert("@");
+verify.completions({
+    includes: jsDocTagNames
+});
+
+// ℹ️ line 2: [ *@|c|] -> [ * |c|]
+// jsdoc tags are listed when there is more than one whitespace after "*"
+edit.replaceLine(1, " * ");
+verify.completions({
+    includes: jsDocTags
+});
+
+// ℹ️ line 2: [ * |c|] -> [ * @|c|]
+// jsdoc tag names will be listed
+edit.insert("@");
+verify.completions({
+    includes: jsDocTagNames
+});