@typescript-deploys/pr-build 5.1.0-pr-54121-5 → 5.1.0-pr-54112-28

package/lib/tsc.js

@@ -18,7 +18,7 @@ and limitations under the License.
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230503`;
+var version = `${versionMajorMinor}.0-insiders.20230505`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -7450,6 +7450,7 @@ var Diagnostics = {
   You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
   Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
   Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export: diag(8038, 1 /* Error */, "Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export_8038", "Decorators may not appear after 'export' or 'export default' if they also appear before 'export'."),
+  A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag: diag(8039, 1 /* Error */, "A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag_8039", "A JSDoc '@template' tag may not follow a '@typedef', '@callback', or '@overload' tag"),
   Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
   Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
   JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -27168,8 +27169,13 @@ var Parser;
         return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
       case 14 /* JsxChildren */:
         return true;
+      case 25 /* JSDocComment */:
+        return true;
+      case 26 /* Count */:
+        return Debug.fail("ParsingContext.Count used as a context");
+      default:
+        Debug.assertNever(parsingContext2, "Non-exhaustive case in 'isListElement'.");
     }
-    return Debug.fail("Non-exhaustive case in 'isListElement'.");
   }
   function isValidHeritageClauseObjectLiteral() {
     Debug.assert(token() === 19 /* OpenBraceToken */);
@@ -27263,7 +27269,8 @@ var Parser;
     return false;
   }
   function isInSomeParsingContext() {
-    for (let kind = 0; kind < 25 /* Count */; kind++) {
+    Debug.assert(parsingContext, "Missing parsing context");
+    for (let kind = 0; kind < 26 /* Count */; kind++) {
       if (parsingContext & 1 << kind) {
         if (isListElement(
           kind,
@@ -27522,7 +27529,9 @@ var Parser;
         return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
       case 24 /* AssertEntries */:
         return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
-      case 25 /* Count */:
+      case 25 /* JSDocComment */:
+        return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
+      case 26 /* Count */:
         return Debug.fail("ParsingContext.Count used as a context");
       default:
         Debug.assertNever(context);
@@ -31654,7 +31663,8 @@ var Parser;
     ParsingContext2[ParsingContext2["HeritageClauses"] = 22] = "HeritageClauses";
     ParsingContext2[ParsingContext2["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
     ParsingContext2[ParsingContext2["AssertEntries"] = 24] = "AssertEntries";
-    ParsingContext2[ParsingContext2["Count"] = 25] = "Count";
+    ParsingContext2[ParsingContext2["JSDocComment"] = 25] = "JSDocComment";
+    ParsingContext2[ParsingContext2["Count"] = 26] = "Count";
   })(ParsingContext || (ParsingContext = {}));
   let Tristate;
   ((Tristate2) => {
@@ -31776,6 +31786,8 @@ var Parser;
       PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
     })(PropertyLikeParse || (PropertyLikeParse = {}));
     function parseJSDocCommentWorker(start = 0, length2) {
+      const saveParsingContext = parsingContext;
+      parsingContext |= 1 << 25 /* JSDocComment */;
       const content = sourceText;
       const end = length2 === void 0 ? content.length : start + length2;
       length2 = end - start;
@@ -31792,7 +31804,10 @@ var Parser;
       let commentsPos;
       let comments = [];
       const parts = [];
-      return scanner.scanRange(start + 3, length2 - 5, () => {
+      const result = scanner.scanRange(start + 3, length2 - 5, doJSDocScan);
+      parsingContext = saveParsingContext;
+      return result;
+      function doJSDocScan() {
         let state = 1 /* SawAsterisk */;
         let margin;
         let indent2 = start - (content.lastIndexOf("\n", start) + 1) + 4;
@@ -31888,7 +31903,7 @@ var Parser;
           Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
         const tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
         return finishNode(factory2.createJSDocComment(parts.length ? createNodeArray(parts, start, commentsPos) : trimmedComments.length ? trimmedComments : void 0, tagsArray), start, end);
-      });
+      }
       function removeLeadingNewlines(comments2) {
         while (comments2.length && (comments2[0] === "\n" || comments2[0] === "\r")) {
           comments2.shift();
@@ -32247,8 +32262,8 @@ var Parser;
           typeExpression = nestedTypeLiteral;
           isNameFirst = true;
         }
-        const result = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
-        return finishNode(result, start2);
+        const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
+        return finishNode(result2, start2);
       }
       function parseNestedTypeLiteral(typeExpression, name, target, indent2) {
         if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
@@ -32258,6 +32273,8 @@ var Parser;
           while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent2, name))) {
             if (child.kind === 347 /* JSDocParameterTag */ || child.kind === 354 /* JSDocPropertyTag */) {
               children = append(children, child);
+            } else if (child.kind === 351 /* JSDocTemplateTag */) {
+              parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
             }
           }
           if (children) {
@@ -32396,6 +32413,9 @@ var Parser;
           let jsDocPropertyTags;
           let hasChildren = false;
           while (child = tryParse(() => parseChildPropertyTag(indent2))) {
+            if (child.kind === 351 /* JSDocTemplateTag */) {
+              break;
+            }
             hasChildren = true;
             if (child.kind === 350 /* JSDocTypeTag */) {
               if (childTypeTag) {
@@ -32455,6 +32475,10 @@ var Parser;
         let child;
         let parameters;
         while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent2))) {
+          if (child.kind === 351 /* JSDocTemplateTag */) {
+            parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
+            break;
+          }
           parameters = append(parameters, child);
         }
         return createNodeArray(parameters || [], pos);
@@ -32549,7 +32573,7 @@ var Parser;
         const start2 = scanner.getTokenFullStart();
         nextTokenJSDoc();
         const tagName = parseJSDocIdentifierName();
-        skipWhitespace();
+        const indentText = skipWhitespaceOrAsterisk();
         let t;
         switch (tagName.escapedText) {
           case "type":
@@ -32563,6 +32587,8 @@ var Parser;
           case "param":
             t = 2 /* Parameter */ | 4 /* CallbackParameter */;
             break;
+          case "template":
+            return parseTemplateTag(start2, tagName, indent2, indentText);
           default:
             return false;
         }
@@ -32650,9 +32676,9 @@ var Parser;
         const end2 = scanner.getTokenEnd();
         const originalKeywordKind = token();
         const text = internIdentifier(scanner.getTokenValue());
-        const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
+        const result2 = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
         nextTokenJSDoc();
-        return result;
+        return result2;
       }
     }
   })(JSDocParser = Parser2.JSDocParser || (Parser2.JSDocParser = {}));
@@ -42861,7 +42887,13 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getCandidateSignaturesForStringLiteralCompletions,
+    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+      call,
+      candidatesOutArray,
+      /*argumentCount*/
+      void 0,
+      32 /* IsForStringLiteralArgumentCompletions */
+    )),
     getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
@@ -43060,44 +43092,17 @@ function createTypeChecker(host) {
     isTypeParameterPossiblyReferenced,
     typeHasCallOrConstructSignatures
   };
-  function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-    const candidatesSet = /* @__PURE__ */ new Set();
-    const candidates = [];
-    runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    candidates.length = 0;
-    runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    return arrayFrom(candidatesSet);
-  }
   function runWithoutResolvedSignatureCaching(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
+    const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
     if (containingCall) {
-      const links = getNodeLinks(containingCall);
-      const containingCallResolvedSignature = links.resolvedSignature;
-      links.resolvedSignature = void 0;
-      const result = fn();
-      links.resolvedSignature = containingCallResolvedSignature;
-      return result;
-    } else {
-      return fn();
+      getNodeLinks(containingCall).resolvedSignature = void 0;
+    }
+    const result = fn();
+    if (containingCall) {
+      getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
     }
+    return result;
   }
   function runWithInferenceBlockedFromSourceNode(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
@@ -53974,7 +53979,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {

package/lib/tsserver.js

@@ -2303,7 +2303,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230503`;
+var version = `${versionMajorMinor}.0-insiders.20230505`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -10957,6 +10957,7 @@ var Diagnostics = {
   You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
   Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
   Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export: diag(8038, 1 /* Error */, "Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export_8038", "Decorators may not appear after 'export' or 'export default' if they also appear before 'export'."),
+  A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag: diag(8039, 1 /* Error */, "A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag_8039", "A JSDoc '@template' tag may not follow a '@typedef', '@callback', or '@overload' tag"),
   Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
   Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
   JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -31552,8 +31553,13 @@ var Parser;
         return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
       case 14 /* JsxChildren */:
         return true;
+      case 25 /* JSDocComment */:
+        return true;
+      case 26 /* Count */:
+        return Debug.fail("ParsingContext.Count used as a context");
+      default:
+        Debug.assertNever(parsingContext2, "Non-exhaustive case in 'isListElement'.");
     }
-    return Debug.fail("Non-exhaustive case in 'isListElement'.");
   }
   function isValidHeritageClauseObjectLiteral() {
     Debug.assert(token() === 19 /* OpenBraceToken */);
@@ -31647,7 +31653,8 @@ var Parser;
     return false;
   }
   function isInSomeParsingContext() {
-    for (let kind = 0; kind < 25 /* Count */; kind++) {
+    Debug.assert(parsingContext, "Missing parsing context");
+    for (let kind = 0; kind < 26 /* Count */; kind++) {
       if (parsingContext & 1 << kind) {
         if (isListElement2(
           kind,
@@ -31906,7 +31913,9 @@ var Parser;
         return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
       case 24 /* AssertEntries */:
         return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
-      case 25 /* Count */:
+      case 25 /* JSDocComment */:
+        return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
+      case 26 /* Count */:
         return Debug.fail("ParsingContext.Count used as a context");
       default:
         Debug.assertNever(context);
@@ -36038,7 +36047,8 @@ var Parser;
     ParsingContext2[ParsingContext2["HeritageClauses"] = 22] = "HeritageClauses";
     ParsingContext2[ParsingContext2["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
     ParsingContext2[ParsingContext2["AssertEntries"] = 24] = "AssertEntries";
-    ParsingContext2[ParsingContext2["Count"] = 25] = "Count";
+    ParsingContext2[ParsingContext2["JSDocComment"] = 25] = "JSDocComment";
+    ParsingContext2[ParsingContext2["Count"] = 26] = "Count";
   })(ParsingContext || (ParsingContext = {}));
   let Tristate;
   ((Tristate2) => {
@@ -36160,6 +36170,8 @@ var Parser;
       PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
     })(PropertyLikeParse || (PropertyLikeParse = {}));
     function parseJSDocCommentWorker(start2 = 0, length2) {
+      const saveParsingContext = parsingContext;
+      parsingContext |= 1 << 25 /* JSDocComment */;
       const content = sourceText;
       const end = length2 === void 0 ? content.length : start2 + length2;
       length2 = end - start2;
@@ -36176,7 +36188,10 @@ var Parser;
       let commentsPos;
       let comments = [];
       const parts = [];
-      return scanner2.scanRange(start2 + 3, length2 - 5, () => {
+      const result = scanner2.scanRange(start2 + 3, length2 - 5, doJSDocScan);
+      parsingContext = saveParsingContext;
+      return result;
+      function doJSDocScan() {
         let state = 1 /* SawAsterisk */;
         let margin;
         let indent3 = start2 - (content.lastIndexOf("\n", start2) + 1) + 4;
@@ -36272,7 +36287,7 @@ var Parser;
           Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
         const tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
         return finishNode(factory2.createJSDocComment(parts.length ? createNodeArray(parts, start2, commentsPos) : trimmedComments.length ? trimmedComments : void 0, tagsArray), start2, end);
-      });
+      }
       function removeLeadingNewlines(comments2) {
         while (comments2.length && (comments2[0] === "\n" || comments2[0] === "\r")) {
           comments2.shift();
@@ -36631,8 +36646,8 @@ var Parser;
           typeExpression = nestedTypeLiteral;
           isNameFirst = true;
         }
-        const result = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
-        return finishNode(result, start3);
+        const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
+        return finishNode(result2, start3);
       }
       function parseNestedTypeLiteral(typeExpression, name, target, indent3) {
         if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
@@ -36642,6 +36657,8 @@ var Parser;
           while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent3, name))) {
             if (child.kind === 347 /* JSDocParameterTag */ || child.kind === 354 /* JSDocPropertyTag */) {
               children = append(children, child);
+            } else if (child.kind === 351 /* JSDocTemplateTag */) {
+              parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
             }
           }
           if (children) {
@@ -36780,6 +36797,9 @@ var Parser;
           let jsDocPropertyTags;
           let hasChildren = false;
           while (child = tryParse(() => parseChildPropertyTag(indent3))) {
+            if (child.kind === 351 /* JSDocTemplateTag */) {
+              break;
+            }
             hasChildren = true;
             if (child.kind === 350 /* JSDocTypeTag */) {
               if (childTypeTag) {
@@ -36839,6 +36859,10 @@ var Parser;
         let child;
         let parameters;
         while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent3))) {
+          if (child.kind === 351 /* JSDocTemplateTag */) {
+            parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
+            break;
+          }
           parameters = append(parameters, child);
         }
         return createNodeArray(parameters || [], pos);
@@ -36933,7 +36957,7 @@ var Parser;
         const start3 = scanner2.getTokenFullStart();
         nextTokenJSDoc();
         const tagName = parseJSDocIdentifierName();
-        skipWhitespace();
+        const indentText = skipWhitespaceOrAsterisk();
         let t;
         switch (tagName.escapedText) {
           case "type":
@@ -36947,6 +36971,8 @@ var Parser;
           case "param":
             t = 2 /* Parameter */ | 4 /* CallbackParameter */;
             break;
+          case "template":
+            return parseTemplateTag(start3, tagName, indent3, indentText);
           default:
             return false;
         }
@@ -37034,9 +37060,9 @@ var Parser;
         const end2 = scanner2.getTokenEnd();
         const originalKeywordKind = token();
         const text = internIdentifier(scanner2.getTokenValue());
-        const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start3, end2);
+        const result2 = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start3, end2);
         nextTokenJSDoc();
-        return result;
+        return result2;
       }
     }
   })(JSDocParser = Parser2.JSDocParser || (Parser2.JSDocParser = {}));
@@ -47290,7 +47316,7 @@ function createTypeChecker(host) {
   var externalHelpersModule;
   var Symbol47 = objectAllocator.getSymbolConstructor();
   var Type27 = objectAllocator.getTypeConstructor();
-  var Signature14 = objectAllocator.getSignatureConstructor();
+  var Signature15 = objectAllocator.getSignatureConstructor();
   var typeCount = 0;
   var symbolCount = 0;
   var totalInstantiationCount = 0;
@@ -47511,7 +47537,13 @@ function createTypeChecker(host) {
     getTypeOfPropertyOfContextualType,
     getFullyQualifiedName,
     getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-    getCandidateSignaturesForStringLiteralCompletions,
+    getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+      call,
+      candidatesOutArray,
+      /*argumentCount*/
+      void 0,
+      32 /* IsForStringLiteralArgumentCompletions */
+    )),
     getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
     getExpandedParameters,
     hasEffectiveRestParameter,
@@ -47710,44 +47742,17 @@ function createTypeChecker(host) {
     isTypeParameterPossiblyReferenced,
     typeHasCallOrConstructSignatures
   };
-  function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-    const candidatesSet = /* @__PURE__ */ new Set();
-    const candidates = [];
-    runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    candidates.length = 0;
-    runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-      call,
-      candidates,
-      /*argumentCount*/
-      void 0,
-      32 /* IsForStringLiteralArgumentCompletions */
-    ));
-    for (const candidate of candidates) {
-      candidatesSet.add(candidate);
-    }
-    return arrayFrom(candidatesSet);
-  }
   function runWithoutResolvedSignatureCaching(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
+    const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
     if (containingCall) {
-      const links = getNodeLinks(containingCall);
-      const containingCallResolvedSignature = links.resolvedSignature;
-      links.resolvedSignature = void 0;
-      const result = fn();
-      links.resolvedSignature = containingCallResolvedSignature;
-      return result;
-    } else {
-      return fn();
+      getNodeLinks(containingCall).resolvedSignature = void 0;
     }
+    const result = fn();
+    if (containingCall) {
+      getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+    }
+    return result;
   }
   function runWithInferenceBlockedFromSourceNode(node, fn) {
     const containingCall = findAncestor(node, isCallLikeExpression);
@@ -57351,7 +57356,7 @@ function createTypeChecker(host) {
     resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
   }
   function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-    const sig = new Signature14(checker, flags);
+    const sig = new Signature15(checker, flags);
     sig.declaration = declaration;
     sig.typeParameters = typeParameters;
     sig.parameters = parameters;
@@ -58624,7 +58629,7 @@ function createTypeChecker(host) {
       } else if (type !== firstType) {
         checkFlags |= 64 /* HasNonUniformType */;
       }
-      if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+      if (isLiteralType(type) || isPatternLiteralType(type)) {
         checkFlags |= 128 /* HasLiteralType */;
       }
       if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -158661,8 +158666,9 @@ function getAlreadyUsedTypesInStringLiteralUnion(union, current) {
 function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
   let isNewIdentifier = false;
   const uniques = /* @__PURE__ */ new Map();
+  const candidates = [];
   const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-  const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+  checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
   const types = flatMap(candidates, (candidate) => {
     if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
       return;

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230503`;
+      version = `${versionMajorMinor}.0-insiders.20230505`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8764,6 +8764,7 @@ ${lanes.join("\n")}
         You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
         Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export: diag(8038, 1 /* Error */, "Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export_8038", "Decorators may not appear after 'export' or 'export default' if they also appear before 'export'."),
+        A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag: diag(8039, 1 /* Error */, "A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag_8039", "A JSDoc '@template' tag may not follow a '@typedef', '@callback', or '@overload' tag"),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -29649,8 +29650,13 @@ ${lanes.join("\n")}
               return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
             case 14 /* JsxChildren */:
               return true;
+            case 25 /* JSDocComment */:
+              return true;
+            case 26 /* Count */:
+              return Debug.fail("ParsingContext.Count used as a context");
+            default:
+              Debug.assertNever(parsingContext2, "Non-exhaustive case in 'isListElement'.");
           }
-          return Debug.fail("Non-exhaustive case in 'isListElement'.");
         }
         function isValidHeritageClauseObjectLiteral() {
           Debug.assert(token() === 19 /* OpenBraceToken */);
@@ -29744,7 +29750,8 @@ ${lanes.join("\n")}
           return false;
         }
         function isInSomeParsingContext() {
-          for (let kind = 0; kind < 25 /* Count */; kind++) {
+          Debug.assert(parsingContext, "Missing parsing context");
+          for (let kind = 0; kind < 26 /* Count */; kind++) {
             if (parsingContext & 1 << kind) {
               if (isListElement2(
                 kind,
@@ -30003,7 +30010,9 @@ ${lanes.join("\n")}
               return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
             case 24 /* AssertEntries */:
               return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
-            case 25 /* Count */:
+            case 25 /* JSDocComment */:
+              return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
+            case 26 /* Count */:
               return Debug.fail("ParsingContext.Count used as a context");
             default:
               Debug.assertNever(context);
@@ -34135,7 +34144,8 @@ ${lanes.join("\n")}
           ParsingContext2[ParsingContext2["HeritageClauses"] = 22] = "HeritageClauses";
           ParsingContext2[ParsingContext2["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
           ParsingContext2[ParsingContext2["AssertEntries"] = 24] = "AssertEntries";
-          ParsingContext2[ParsingContext2["Count"] = 25] = "Count";
+          ParsingContext2[ParsingContext2["JSDocComment"] = 25] = "JSDocComment";
+          ParsingContext2[ParsingContext2["Count"] = 26] = "Count";
         })(ParsingContext || (ParsingContext = {}));
         let Tristate;
         ((Tristate2) => {
@@ -34257,6 +34267,8 @@ ${lanes.join("\n")}
             PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
           })(PropertyLikeParse || (PropertyLikeParse = {}));
           function parseJSDocCommentWorker(start = 0, length2) {
+            const saveParsingContext = parsingContext;
+            parsingContext |= 1 << 25 /* JSDocComment */;
             const content = sourceText;
             const end = length2 === void 0 ? content.length : start + length2;
             length2 = end - start;
@@ -34273,7 +34285,10 @@ ${lanes.join("\n")}
             let commentsPos;
             let comments = [];
             const parts = [];
-            return scanner2.scanRange(start + 3, length2 - 5, () => {
+            const result = scanner2.scanRange(start + 3, length2 - 5, doJSDocScan);
+            parsingContext = saveParsingContext;
+            return result;
+            function doJSDocScan() {
               let state = 1 /* SawAsterisk */;
               let margin;
               let indent3 = start - (content.lastIndexOf("\n", start) + 1) + 4;
@@ -34369,7 +34384,7 @@ ${lanes.join("\n")}
                 Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
               const tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
               return finishNode(factory2.createJSDocComment(parts.length ? createNodeArray(parts, start, commentsPos) : trimmedComments.length ? trimmedComments : void 0, tagsArray), start, end);
-            });
+            }
             function removeLeadingNewlines(comments2) {
               while (comments2.length && (comments2[0] === "\n" || comments2[0] === "\r")) {
                 comments2.shift();
@@ -34728,8 +34743,8 @@ ${lanes.join("\n")}
                 typeExpression = nestedTypeLiteral;
                 isNameFirst = true;
               }
-              const result = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
-              return finishNode(result, start2);
+              const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
+              return finishNode(result2, start2);
             }
             function parseNestedTypeLiteral(typeExpression, name, target, indent3) {
               if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
@@ -34739,6 +34754,8 @@ ${lanes.join("\n")}
                 while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent3, name))) {
                   if (child.kind === 347 /* JSDocParameterTag */ || child.kind === 354 /* JSDocPropertyTag */) {
                     children = append(children, child);
+                  } else if (child.kind === 351 /* JSDocTemplateTag */) {
+                    parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
                   }
                 }
                 if (children) {
@@ -34877,6 +34894,9 @@ ${lanes.join("\n")}
                 let jsDocPropertyTags;
                 let hasChildren = false;
                 while (child = tryParse(() => parseChildPropertyTag(indent3))) {
+                  if (child.kind === 351 /* JSDocTemplateTag */) {
+                    break;
+                  }
                   hasChildren = true;
                   if (child.kind === 350 /* JSDocTypeTag */) {
                     if (childTypeTag) {
@@ -34936,6 +34956,10 @@ ${lanes.join("\n")}
               let child;
               let parameters;
               while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent3))) {
+                if (child.kind === 351 /* JSDocTemplateTag */) {
+                  parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
+                  break;
+                }
                 parameters = append(parameters, child);
               }
               return createNodeArray(parameters || [], pos);
@@ -35030,7 +35054,7 @@ ${lanes.join("\n")}
               const start2 = scanner2.getTokenFullStart();
               nextTokenJSDoc();
               const tagName = parseJSDocIdentifierName();
-              skipWhitespace();
+              const indentText = skipWhitespaceOrAsterisk();
               let t;
               switch (tagName.escapedText) {
                 case "type":
@@ -35044,6 +35068,8 @@ ${lanes.join("\n")}
                 case "param":
                   t = 2 /* Parameter */ | 4 /* CallbackParameter */;
                   break;
+                case "template":
+                  return parseTemplateTag(start2, tagName, indent3, indentText);
                 default:
                   return false;
               }
@@ -35131,9 +35157,9 @@ ${lanes.join("\n")}
               const end2 = scanner2.getTokenEnd();
               const originalKeywordKind = token();
               const text = internIdentifier(scanner2.getTokenValue());
-              const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
+              const result2 = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
               nextTokenJSDoc();
-              return result;
+              return result2;
             }
           }
         })(JSDocParser = Parser2.JSDocParser || (Parser2.JSDocParser = {}));
@@ -45082,7 +45108,7 @@ ${lanes.join("\n")}
     var externalHelpersModule;
     var Symbol47 = objectAllocator.getSymbolConstructor();
     var Type27 = objectAllocator.getTypeConstructor();
-    var Signature14 = objectAllocator.getSignatureConstructor();
+    var Signature15 = objectAllocator.getSignatureConstructor();
     var typeCount = 0;
     var symbolCount = 0;
     var totalInstantiationCount = 0;
@@ -45303,7 +45329,13 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getCandidateSignaturesForStringLiteralCompletions,
+      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+        call,
+        candidatesOutArray,
+        /*argumentCount*/
+        void 0,
+        32 /* IsForStringLiteralArgumentCompletions */
+      )),
       getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
@@ -45502,44 +45534,17 @@ ${lanes.join("\n")}
       isTypeParameterPossiblyReferenced,
       typeHasCallOrConstructSignatures
     };
-    function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-      const candidatesSet = /* @__PURE__ */ new Set();
-      const candidates = [];
-      runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      candidates.length = 0;
-      runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      return arrayFrom(candidatesSet);
-    }
     function runWithoutResolvedSignatureCaching(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
+      const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
       if (containingCall) {
-        const links = getNodeLinks(containingCall);
-        const containingCallResolvedSignature = links.resolvedSignature;
-        links.resolvedSignature = void 0;
-        const result = fn();
-        links.resolvedSignature = containingCallResolvedSignature;
-        return result;
-      } else {
-        return fn();
+        getNodeLinks(containingCall).resolvedSignature = void 0;
       }
+      const result = fn();
+      if (containingCall) {
+        getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+      }
+      return result;
     }
     function runWithInferenceBlockedFromSourceNode(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
@@ -55143,7 +55148,7 @@ ${lanes.join("\n")}
       resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
     }
     function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-      const sig = new Signature14(checker, flags);
+      const sig = new Signature15(checker, flags);
       sig.declaration = declaration;
       sig.typeParameters = typeParameters;
       sig.parameters = parameters;
@@ -56416,7 +56421,7 @@ ${lanes.join("\n")}
         } else if (type !== firstType) {
           checkFlags |= 64 /* HasNonUniformType */;
         }
-        if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+        if (isLiteralType(type) || isPatternLiteralType(type)) {
           checkFlags |= 128 /* HasLiteralType */;
         }
         if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -157937,8 +157942,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
     let isNewIdentifier = false;
     const uniques = /* @__PURE__ */ new Map();
+    const candidates = [];
     const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-    const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/lib/typescript.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.1";
-      version = `${versionMajorMinor}.0-insiders.20230503`;
+      version = `${versionMajorMinor}.0-insiders.20230505`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -8764,6 +8764,7 @@ ${lanes.join("\n")}
         You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
         Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export: diag(8038, 1 /* Error */, "Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export_8038", "Decorators may not appear after 'export' or 'export default' if they also appear before 'export'."),
+        A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag: diag(8039, 1 /* Error */, "A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag_8039", "A JSDoc '@template' tag may not follow a '@typedef', '@callback', or '@overload' tag"),
         Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
         Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
         JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -29649,8 +29650,13 @@ ${lanes.join("\n")}
               return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
             case 14 /* JsxChildren */:
               return true;
+            case 25 /* JSDocComment */:
+              return true;
+            case 26 /* Count */:
+              return Debug.fail("ParsingContext.Count used as a context");
+            default:
+              Debug.assertNever(parsingContext2, "Non-exhaustive case in 'isListElement'.");
           }
-          return Debug.fail("Non-exhaustive case in 'isListElement'.");
         }
         function isValidHeritageClauseObjectLiteral() {
           Debug.assert(token() === 19 /* OpenBraceToken */);
@@ -29744,7 +29750,8 @@ ${lanes.join("\n")}
           return false;
         }
         function isInSomeParsingContext() {
-          for (let kind = 0; kind < 25 /* Count */; kind++) {
+          Debug.assert(parsingContext, "Missing parsing context");
+          for (let kind = 0; kind < 26 /* Count */; kind++) {
             if (parsingContext & 1 << kind) {
               if (isListElement2(
                 kind,
@@ -30003,7 +30010,9 @@ ${lanes.join("\n")}
               return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
             case 24 /* AssertEntries */:
               return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
-            case 25 /* Count */:
+            case 25 /* JSDocComment */:
+              return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
+            case 26 /* Count */:
               return Debug.fail("ParsingContext.Count used as a context");
             default:
               Debug.assertNever(context);
@@ -34135,7 +34144,8 @@ ${lanes.join("\n")}
           ParsingContext2[ParsingContext2["HeritageClauses"] = 22] = "HeritageClauses";
           ParsingContext2[ParsingContext2["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
           ParsingContext2[ParsingContext2["AssertEntries"] = 24] = "AssertEntries";
-          ParsingContext2[ParsingContext2["Count"] = 25] = "Count";
+          ParsingContext2[ParsingContext2["JSDocComment"] = 25] = "JSDocComment";
+          ParsingContext2[ParsingContext2["Count"] = 26] = "Count";
         })(ParsingContext || (ParsingContext = {}));
         let Tristate;
         ((Tristate2) => {
@@ -34257,6 +34267,8 @@ ${lanes.join("\n")}
             PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
           })(PropertyLikeParse || (PropertyLikeParse = {}));
           function parseJSDocCommentWorker(start = 0, length2) {
+            const saveParsingContext = parsingContext;
+            parsingContext |= 1 << 25 /* JSDocComment */;
             const content = sourceText;
             const end = length2 === void 0 ? content.length : start + length2;
             length2 = end - start;
@@ -34273,7 +34285,10 @@ ${lanes.join("\n")}
             let commentsPos;
             let comments = [];
             const parts = [];
-            return scanner2.scanRange(start + 3, length2 - 5, () => {
+            const result = scanner2.scanRange(start + 3, length2 - 5, doJSDocScan);
+            parsingContext = saveParsingContext;
+            return result;
+            function doJSDocScan() {
               let state = 1 /* SawAsterisk */;
               let margin;
               let indent2 = start - (content.lastIndexOf("\n", start) + 1) + 4;
@@ -34369,7 +34384,7 @@ ${lanes.join("\n")}
                 Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
               const tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
               return finishNode(factory2.createJSDocComment(parts.length ? createNodeArray(parts, start, commentsPos) : trimmedComments.length ? trimmedComments : void 0, tagsArray), start, end);
-            });
+            }
             function removeLeadingNewlines(comments2) {
               while (comments2.length && (comments2[0] === "\n" || comments2[0] === "\r")) {
                 comments2.shift();
@@ -34728,8 +34743,8 @@ ${lanes.join("\n")}
                 typeExpression = nestedTypeLiteral;
                 isNameFirst = true;
               }
-              const result = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
-              return finishNode(result, start2);
+              const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
+              return finishNode(result2, start2);
             }
             function parseNestedTypeLiteral(typeExpression, name, target, indent2) {
               if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
@@ -34739,6 +34754,8 @@ ${lanes.join("\n")}
                 while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent2, name))) {
                   if (child.kind === 347 /* JSDocParameterTag */ || child.kind === 354 /* JSDocPropertyTag */) {
                     children = append(children, child);
+                  } else if (child.kind === 351 /* JSDocTemplateTag */) {
+                    parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
                   }
                 }
                 if (children) {
@@ -34877,6 +34894,9 @@ ${lanes.join("\n")}
                 let jsDocPropertyTags;
                 let hasChildren = false;
                 while (child = tryParse(() => parseChildPropertyTag(indent2))) {
+                  if (child.kind === 351 /* JSDocTemplateTag */) {
+                    break;
+                  }
                   hasChildren = true;
                   if (child.kind === 350 /* JSDocTypeTag */) {
                     if (childTypeTag) {
@@ -34936,6 +34956,10 @@ ${lanes.join("\n")}
               let child;
               let parameters;
               while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent2))) {
+                if (child.kind === 351 /* JSDocTemplateTag */) {
+                  parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
+                  break;
+                }
                 parameters = append(parameters, child);
               }
               return createNodeArray(parameters || [], pos);
@@ -35030,7 +35054,7 @@ ${lanes.join("\n")}
               const start2 = scanner2.getTokenFullStart();
               nextTokenJSDoc();
               const tagName = parseJSDocIdentifierName();
-              skipWhitespace();
+              const indentText = skipWhitespaceOrAsterisk();
               let t;
               switch (tagName.escapedText) {
                 case "type":
@@ -35044,6 +35068,8 @@ ${lanes.join("\n")}
                 case "param":
                   t = 2 /* Parameter */ | 4 /* CallbackParameter */;
                   break;
+                case "template":
+                  return parseTemplateTag(start2, tagName, indent2, indentText);
                 default:
                   return false;
               }
@@ -35131,9 +35157,9 @@ ${lanes.join("\n")}
               const end2 = scanner2.getTokenEnd();
               const originalKeywordKind = token();
               const text = internIdentifier(scanner2.getTokenValue());
-              const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
+              const result2 = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
               nextTokenJSDoc();
-              return result;
+              return result2;
             }
           }
         })(JSDocParser = Parser2.JSDocParser || (Parser2.JSDocParser = {}));
@@ -45082,7 +45108,7 @@ ${lanes.join("\n")}
     var externalHelpersModule;
     var Symbol47 = objectAllocator.getSymbolConstructor();
     var Type27 = objectAllocator.getTypeConstructor();
-    var Signature14 = objectAllocator.getSignatureConstructor();
+    var Signature15 = objectAllocator.getSignatureConstructor();
     var typeCount = 0;
     var symbolCount = 0;
     var totalInstantiationCount = 0;
@@ -45303,7 +45329,13 @@ ${lanes.join("\n")}
       getTypeOfPropertyOfContextualType,
       getFullyQualifiedName,
       getResolvedSignature: (node, candidatesOutArray, argumentCount) => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */),
-      getCandidateSignaturesForStringLiteralCompletions,
+      getResolvedSignatureForStringLiteralCompletions: (call, editingArgument, candidatesOutArray) => runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
+        call,
+        candidatesOutArray,
+        /*argumentCount*/
+        void 0,
+        32 /* IsForStringLiteralArgumentCompletions */
+      )),
       getResolvedSignatureForSignatureHelp: (node, candidatesOutArray, argumentCount) => runWithoutResolvedSignatureCaching(node, () => getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 16 /* IsForSignatureHelp */)),
       getExpandedParameters,
       hasEffectiveRestParameter,
@@ -45502,44 +45534,17 @@ ${lanes.join("\n")}
       isTypeParameterPossiblyReferenced,
       typeHasCallOrConstructSignatures
     };
-    function getCandidateSignaturesForStringLiteralCompletions(call, editingArgument) {
-      const candidatesSet = /* @__PURE__ */ new Set();
-      const candidates = [];
-      runWithInferenceBlockedFromSourceNode(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      candidates.length = 0;
-      runWithoutResolvedSignatureCaching(editingArgument, () => getResolvedSignatureWorker(
-        call,
-        candidates,
-        /*argumentCount*/
-        void 0,
-        32 /* IsForStringLiteralArgumentCompletions */
-      ));
-      for (const candidate of candidates) {
-        candidatesSet.add(candidate);
-      }
-      return arrayFrom(candidatesSet);
-    }
     function runWithoutResolvedSignatureCaching(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
+      const containingCallResolvedSignature = containingCall && getNodeLinks(containingCall).resolvedSignature;
       if (containingCall) {
-        const links = getNodeLinks(containingCall);
-        const containingCallResolvedSignature = links.resolvedSignature;
-        links.resolvedSignature = void 0;
-        const result = fn();
-        links.resolvedSignature = containingCallResolvedSignature;
-        return result;
-      } else {
-        return fn();
+        getNodeLinks(containingCall).resolvedSignature = void 0;
       }
+      const result = fn();
+      if (containingCall) {
+        getNodeLinks(containingCall).resolvedSignature = containingCallResolvedSignature;
+      }
+      return result;
     }
     function runWithInferenceBlockedFromSourceNode(node, fn) {
       const containingCall = findAncestor(node, isCallLikeExpression);
@@ -55143,7 +55148,7 @@ ${lanes.join("\n")}
       resolveObjectTypeMembers(type, source, typeParameters, paddedTypeArguments);
     }
     function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, resolvedTypePredicate, minArgumentCount, flags) {
-      const sig = new Signature14(checker, flags);
+      const sig = new Signature15(checker, flags);
       sig.declaration = declaration;
       sig.typeParameters = typeParameters;
       sig.parameters = parameters;
@@ -56416,7 +56421,7 @@ ${lanes.join("\n")}
         } else if (type !== firstType) {
           checkFlags |= 64 /* HasNonUniformType */;
         }
-        if (isLiteralType(type) || isPatternLiteralType(type) || type === uniqueLiteralType) {
+        if (isLiteralType(type) || isPatternLiteralType(type)) {
           checkFlags |= 128 /* HasLiteralType */;
         }
         if (type.flags & 131072 /* Never */ && type !== uniqueLiteralType) {
@@ -157952,8 +157957,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
   function getStringLiteralCompletionsFromSignature(call, arg, argumentInfo, checker) {
     let isNewIdentifier = false;
     const uniques = /* @__PURE__ */ new Map();
+    const candidates = [];
     const editingArgument = isJsxOpeningLikeElement(call) ? Debug.checkDefined(findAncestor(arg.parent, isJsxAttribute)) : arg;
-    const candidates = checker.getCandidateSignaturesForStringLiteralCompletions(call, editingArgument);
+    checker.getResolvedSignatureForStringLiteralCompletions(call, editingArgument, candidates);
     const types = flatMap(candidates, (candidate) => {
       if (!signatureHasRestParameter(candidate) && argumentInfo.argumentCount > candidate.parameters.length)
         return;

package/lib/typingsInstaller.js

@@ -54,7 +54,7 @@ var path = __toESM(require("path"));
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.1";
-var version = `${versionMajorMinor}.0-insiders.20230503`;
+var version = `${versionMajorMinor}.0-insiders.20230505`;
 
 // src/compiler/core.ts
 var emptyArray = [];
@@ -6824,6 +6824,7 @@ var Diagnostics = {
   You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
   Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
   Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export: diag(8038, 1 /* Error */, "Decorators_may_not_appear_after_export_or_export_default_if_they_also_appear_before_export_8038", "Decorators may not appear after 'export' or 'export default' if they also appear before 'export'."),
+  A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag: diag(8039, 1 /* Error */, "A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag_8039", "A JSDoc '@template' tag may not follow a '@typedef', '@callback', or '@overload' tag"),
   Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9005, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_An_explicit_type_annotation_may_unblock_9005", "Declaration emit for this file requires using private name '{0}'. An explicit type annotation may unblock declaration emit."),
   Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotation_may_unblock_declaration_emit: diag(9006, 1 /* Error */, "Declaration_emit_for_this_file_requires_using_private_name_0_from_module_1_An_explicit_type_annotati_9006", "Declaration emit for this file requires using private name '{0}' from module '{1}'. An explicit type annotation may unblock declaration emit."),
   JSX_attributes_must_only_be_assigned_a_non_empty_expression: diag(17e3, 1 /* Error */, "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", "JSX attributes must only be assigned a non-empty 'expression'."),
@@ -19204,8 +19205,13 @@ var Parser;
         return tokenIsIdentifierOrKeyword(token()) || token() === 19 /* OpenBraceToken */;
       case 14 /* JsxChildren */:
         return true;
+      case 25 /* JSDocComment */:
+        return true;
+      case 26 /* Count */:
+        return Debug.fail("ParsingContext.Count used as a context");
+      default:
+        Debug.assertNever(parsingContext2, "Non-exhaustive case in 'isListElement'.");
     }
-    return Debug.fail("Non-exhaustive case in 'isListElement'.");
   }
   function isValidHeritageClauseObjectLiteral() {
     Debug.assert(token() === 19 /* OpenBraceToken */);
@@ -19299,7 +19305,8 @@ var Parser;
     return false;
   }
   function isInSomeParsingContext() {
-    for (let kind = 0; kind < 25 /* Count */; kind++) {
+    Debug.assert(parsingContext, "Missing parsing context");
+    for (let kind = 0; kind < 26 /* Count */; kind++) {
       if (parsingContext & 1 << kind) {
         if (isListElement(
           kind,
@@ -19558,7 +19565,9 @@ var Parser;
         return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
       case 24 /* AssertEntries */:
         return parseErrorAtCurrentToken(Diagnostics.Identifier_or_string_literal_expected);
-      case 25 /* Count */:
+      case 25 /* JSDocComment */:
+        return parseErrorAtCurrentToken(Diagnostics.Identifier_expected);
+      case 26 /* Count */:
         return Debug.fail("ParsingContext.Count used as a context");
       default:
         Debug.assertNever(context);
@@ -23690,7 +23699,8 @@ var Parser;
     ParsingContext2[ParsingContext2["HeritageClauses"] = 22] = "HeritageClauses";
     ParsingContext2[ParsingContext2["ImportOrExportSpecifiers"] = 23] = "ImportOrExportSpecifiers";
     ParsingContext2[ParsingContext2["AssertEntries"] = 24] = "AssertEntries";
-    ParsingContext2[ParsingContext2["Count"] = 25] = "Count";
+    ParsingContext2[ParsingContext2["JSDocComment"] = 25] = "JSDocComment";
+    ParsingContext2[ParsingContext2["Count"] = 26] = "Count";
   })(ParsingContext || (ParsingContext = {}));
   let Tristate;
   ((Tristate2) => {
@@ -23812,6 +23822,8 @@ var Parser;
       PropertyLikeParse2[PropertyLikeParse2["CallbackParameter"] = 4] = "CallbackParameter";
     })(PropertyLikeParse || (PropertyLikeParse = {}));
     function parseJSDocCommentWorker(start = 0, length2) {
+      const saveParsingContext = parsingContext;
+      parsingContext |= 1 << 25 /* JSDocComment */;
       const content = sourceText;
       const end = length2 === void 0 ? content.length : start + length2;
       length2 = end - start;
@@ -23828,7 +23840,10 @@ var Parser;
       let commentsPos;
       let comments = [];
       const parts = [];
-      return scanner.scanRange(start + 3, length2 - 5, () => {
+      const result = scanner.scanRange(start + 3, length2 - 5, doJSDocScan);
+      parsingContext = saveParsingContext;
+      return result;
+      function doJSDocScan() {
         let state = 1 /* SawAsterisk */;
         let margin;
         let indent2 = start - (content.lastIndexOf("\n", start) + 1) + 4;
@@ -23924,7 +23939,7 @@ var Parser;
           Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
         const tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
         return finishNode(factory2.createJSDocComment(parts.length ? createNodeArray(parts, start, commentsPos) : trimmedComments.length ? trimmedComments : void 0, tagsArray), start, end);
-      });
+      }
       function removeLeadingNewlines(comments2) {
         while (comments2.length && (comments2[0] === "\n" || comments2[0] === "\r")) {
           comments2.shift();
@@ -24283,8 +24298,8 @@ var Parser;
           typeExpression = nestedTypeLiteral;
           isNameFirst = true;
         }
-        const result = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
-        return finishNode(result, start2);
+        const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
+        return finishNode(result2, start2);
       }
       function parseNestedTypeLiteral(typeExpression, name, target, indent2) {
         if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
@@ -24294,6 +24309,8 @@ var Parser;
           while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent2, name))) {
             if (child.kind === 347 /* JSDocParameterTag */ || child.kind === 354 /* JSDocPropertyTag */) {
               children = append(children, child);
+            } else if (child.kind === 351 /* JSDocTemplateTag */) {
+              parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
             }
           }
           if (children) {
@@ -24432,6 +24449,9 @@ var Parser;
           let jsDocPropertyTags;
           let hasChildren = false;
           while (child = tryParse(() => parseChildPropertyTag(indent2))) {
+            if (child.kind === 351 /* JSDocTemplateTag */) {
+              break;
+            }
             hasChildren = true;
             if (child.kind === 350 /* JSDocTypeTag */) {
               if (childTypeTag) {
@@ -24491,6 +24511,10 @@ var Parser;
         let child;
         let parameters;
         while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent2))) {
+          if (child.kind === 351 /* JSDocTemplateTag */) {
+            parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
+            break;
+          }
           parameters = append(parameters, child);
         }
         return createNodeArray(parameters || [], pos);
@@ -24585,7 +24609,7 @@ var Parser;
         const start2 = scanner.getTokenFullStart();
         nextTokenJSDoc();
         const tagName = parseJSDocIdentifierName();
-        skipWhitespace();
+        const indentText = skipWhitespaceOrAsterisk();
         let t;
         switch (tagName.escapedText) {
           case "type":
@@ -24599,6 +24623,8 @@ var Parser;
           case "param":
             t = 2 /* Parameter */ | 4 /* CallbackParameter */;
             break;
+          case "template":
+            return parseTemplateTag(start2, tagName, indent2, indentText);
           default:
             return false;
         }
@@ -24686,9 +24712,9 @@ var Parser;
         const end2 = scanner.getTokenEnd();
         const originalKeywordKind = token();
         const text = internIdentifier(scanner.getTokenValue());
-        const result = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
+        const result2 = finishNode(factoryCreateIdentifier(text, originalKeywordKind), start2, end2);
         nextTokenJSDoc();
-        return result;
+        return result2;
       }
     }
   })(JSDocParser = Parser2.JSDocParser || (Parser2.JSDocParser = {}));

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.1.0-pr-54121-5",
+  "version": "5.1.0-pr-54112-28",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [
@@ -116,5 +116,5 @@
     "node": "14.21.1",
     "npm": "8.19.3"
   },
-  "gitHead": "6fb2754a018b2bb92b34162d004fa87c6818f514"
+  "gitHead": "407cd798b1bc232d5fc9c0da289dea07741c9a51"
 }