typescript 5.3.0-dev.20230921 → 5.3.0-dev.20230922

package/lib/tsserver.js

@@ -103,6 +103,7 @@ __export(server_exports, {
   InternalEmitFlags: () => InternalEmitFlags,
   InternalSymbolName: () => InternalSymbolName,
   InvalidatedProjectKind: () => InvalidatedProjectKind,
+  JSDocParsingMode: () => JSDocParsingMode,
   JsDoc: () => ts_JsDoc_exports,
   JsTyping: () => ts_JsTyping_exports,
   JsxEmit: () => JsxEmit,
@@ -2323,7 +2324,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.3";
-var version = `${versionMajorMinor}.0-dev.20230921`;
+var version = `${versionMajorMinor}.0-dev.20230922`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -7417,6 +7418,13 @@ var commentPragmas = {
     kind: 4 /* MultiLine */
   }
 };
+var JSDocParsingMode = /* @__PURE__ */ ((JSDocParsingMode7) => {
+  JSDocParsingMode7[JSDocParsingMode7["ParseAll"] = 0] = "ParseAll";
+  JSDocParsingMode7[JSDocParsingMode7["ParseNone"] = 1] = "ParseNone";
+  JSDocParsingMode7[JSDocParsingMode7["ParseForTypeErrors"] = 2] = "ParseForTypeErrors";
+  JSDocParsingMode7[JSDocParsingMode7["ParseForTypeInfo"] = 3] = "ParseForTypeInfo";
+  return JSDocParsingMode7;
+})(JSDocParsingMode || {});
 
 // src/compiler/sys.ts
 function generateDjb2Hash(data) {
@@ -11204,7 +11212,7 @@ var Diagnostics = {
   Could_not_convert_to_arrow_function: diag(95151, 3 /* Message */, "Could_not_convert_to_arrow_function_95151", "Could not convert to arrow function"),
   Could_not_convert_to_named_function: diag(95152, 3 /* Message */, "Could_not_convert_to_named_function_95152", "Could not convert to named function"),
   Could_not_convert_to_anonymous_function: diag(95153, 3 /* Message */, "Could_not_convert_to_anonymous_function_95153", "Could not convert to anonymous function"),
-  Can_only_convert_string_concatenation: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenation_95154", "Can only convert string concatenation"),
+  Can_only_convert_string_concatenations_and_string_literals: diag(95154, 3 /* Message */, "Can_only_convert_string_concatenations_and_string_literals_95154", "Can only convert string concatenations and string literals"),
   Selection_is_not_a_valid_statement_or_statements: diag(95155, 3 /* Message */, "Selection_is_not_a_valid_statement_or_statements_95155", "Selection is not a valid statement or statements"),
   Add_missing_function_declaration_0: diag(95156, 3 /* Message */, "Add_missing_function_declaration_0_95156", "Add missing function declaration '{0}'"),
   Add_all_missing_function_declarations: diag(95157, 3 /* Message */, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
@@ -11448,7 +11456,7 @@ var unicodeESNextIdentifierStart = [65, 90, 97, 122, 170, 170, 181, 181, 186, 18
 var unicodeESNextIdentifierPart = [48, 57, 65, 90, 95, 95, 97, 122, 170, 170, 181, 181, 183, 183, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 895, 895, 902, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1327, 1329, 1366, 1369, 1369, 1376, 1416, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1519, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2045, 2045, 2048, 2093, 2112, 2139, 2144, 2154, 2208, 2228, 2230, 2237, 2259, 2273, 2275, 2403, 2406, 2415, 2417, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2556, 2556, 2558, 2558, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2809, 2815, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3072, 3084, 3086, 3088, 3090, 3112, 3114, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3162, 3168, 3171, 3174, 3183, 3200, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3328, 3331, 3333, 3340, 3342, 3344, 3346, 3396, 3398, 3400, 3402, 3406, 3412, 3415, 3423, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3558, 3567, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3718, 3722, 3724, 3747, 3749, 3749, 3751, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4969, 4977, 4992, 5007, 5024, 5109, 5112, 5117, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5880, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6e3, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6264, 6272, 6314, 6320, 6389, 6400, 6430, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6618, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6832, 6845, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7296, 7304, 7312, 7354, 7357, 7359, 7376, 7378, 7380, 7418, 7424, 7673, 7675, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8472, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12447, 12449, 12538, 12540, 12543, 12549, 12591, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40943, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42737, 42775, 42783, 42786, 42888, 42891, 42943, 42946, 42950, 42999, 43047, 43072, 43123, 43136, 43205, 43216, 43225, 43232, 43255, 43259, 43259, 43261, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43488, 43518, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43824, 43866, 43868, 43879, 43888, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65071, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500, 65536, 65547, 65549, 65574, 65576, 65594, 65596, 65597, 65599, 65613, 65616, 65629, 65664, 65786, 65856, 65908, 66045, 66045, 66176, 66204, 66208, 66256, 66272, 66272, 66304, 66335, 66349, 66378, 66384, 66426, 66432, 66461, 66464, 66499, 66504, 66511, 66513, 66517, 66560, 66717, 66720, 66729, 66736, 66771, 66776, 66811, 66816, 66855, 66864, 66915, 67072, 67382, 67392, 67413, 67424, 67431, 67584, 67589, 67592, 67592, 67594, 67637, 67639, 67640, 67644, 67644, 67647, 67669, 67680, 67702, 67712, 67742, 67808, 67826, 67828, 67829, 67840, 67861, 67872, 67897, 67968, 68023, 68030, 68031, 68096, 68099, 68101, 68102, 68108, 68115, 68117, 68119, 68121, 68149, 68152, 68154, 68159, 68159, 68192, 68220, 68224, 68252, 68288, 68295, 68297, 68326, 68352, 68405, 68416, 68437, 68448, 68466, 68480, 68497, 68608, 68680, 68736, 68786, 68800, 68850, 68864, 68903, 68912, 68921, 69376, 69404, 69415, 69415, 69424, 69456, 69600, 69622, 69632, 69702, 69734, 69743, 69759, 69818, 69840, 69864, 69872, 69881, 69888, 69940, 69942, 69951, 69956, 69958, 69968, 70003, 70006, 70006, 70016, 70084, 70089, 70092, 70096, 70106, 70108, 70108, 70144, 70161, 70163, 70199, 70206, 70206, 70272, 70278, 70280, 70280, 70282, 70285, 70287, 70301, 70303, 70312, 70320, 70378, 70384, 70393, 70400, 70403, 70405, 70412, 70415, 70416, 70419, 70440, 70442, 70448, 70450, 70451, 70453, 70457, 70459, 70468, 70471, 70472, 70475, 70477, 70480, 70480, 70487, 70487, 70493, 70499, 70502, 70508, 70512, 70516, 70656, 70730, 70736, 70745, 70750, 70751, 70784, 70853, 70855, 70855, 70864, 70873, 71040, 71093, 71096, 71104, 71128, 71133, 71168, 71232, 71236, 71236, 71248, 71257, 71296, 71352, 71360, 71369, 71424, 71450, 71453, 71467, 71472, 71481, 71680, 71738, 71840, 71913, 71935, 71935, 72096, 72103, 72106, 72151, 72154, 72161, 72163, 72164, 72192, 72254, 72263, 72263, 72272, 72345, 72349, 72349, 72384, 72440, 72704, 72712, 72714, 72758, 72760, 72768, 72784, 72793, 72818, 72847, 72850, 72871, 72873, 72886, 72960, 72966, 72968, 72969, 72971, 73014, 73018, 73018, 73020, 73021, 73023, 73031, 73040, 73049, 73056, 73061, 73063, 73064, 73066, 73102, 73104, 73105, 73107, 73112, 73120, 73129, 73440, 73462, 73728, 74649, 74752, 74862, 74880, 75075, 77824, 78894, 82944, 83526, 92160, 92728, 92736, 92766, 92768, 92777, 92880, 92909, 92912, 92916, 92928, 92982, 92992, 92995, 93008, 93017, 93027, 93047, 93053, 93071, 93760, 93823, 93952, 94026, 94031, 94087, 94095, 94111, 94176, 94177, 94179, 94179, 94208, 100343, 100352, 101106, 110592, 110878, 110928, 110930, 110948, 110951, 110960, 111355, 113664, 113770, 113776, 113788, 113792, 113800, 113808, 113817, 113821, 113822, 119141, 119145, 119149, 119154, 119163, 119170, 119173, 119179, 119210, 119213, 119362, 119364, 119808, 119892, 119894, 119964, 119966, 119967, 119970, 119970, 119973, 119974, 119977, 119980, 119982, 119993, 119995, 119995, 119997, 120003, 120005, 120069, 120071, 120074, 120077, 120084, 120086, 120092, 120094, 120121, 120123, 120126, 120128, 120132, 120134, 120134, 120138, 120144, 120146, 120485, 120488, 120512, 120514, 120538, 120540, 120570, 120572, 120596, 120598, 120628, 120630, 120654, 120656, 120686, 120688, 120712, 120714, 120744, 120746, 120770, 120772, 120779, 120782, 120831, 121344, 121398, 121403, 121452, 121461, 121461, 121476, 121476, 121499, 121503, 121505, 121519, 122880, 122886, 122888, 122904, 122907, 122913, 122915, 122916, 122918, 122922, 123136, 123180, 123184, 123197, 123200, 123209, 123214, 123214, 123584, 123641, 124928, 125124, 125136, 125142, 125184, 125259, 125264, 125273, 126464, 126467, 126469, 126495, 126497, 126498, 126500, 126500, 126503, 126503, 126505, 126514, 126516, 126519, 126521, 126521, 126523, 126523, 126530, 126530, 126535, 126535, 126537, 126537, 126539, 126539, 126541, 126543, 126545, 126546, 126548, 126548, 126551, 126551, 126553, 126553, 126555, 126555, 126557, 126557, 126559, 126559, 126561, 126562, 126564, 126564, 126567, 126570, 126572, 126578, 126580, 126583, 126585, 126588, 126590, 126590, 126592, 126601, 126603, 126619, 126625, 126627, 126629, 126633, 126635, 126651, 131072, 173782, 173824, 177972, 177984, 178205, 178208, 183969, 183984, 191456, 194560, 195101, 917760, 917999];
 var commentDirectiveRegExSingleLine = /^\/\/\/?\s*@(ts-expect-error|ts-ignore)/;
 var commentDirectiveRegExMultiLine = /^(?:\/|\*)*\s*@(ts-expect-error|ts-ignore)/;
-var semanticJSDocTagRegEx = /@(?:see|link)/i;
+var jsDocSeeOrLink = /@(?:see|link)/i;
 function lookupInUnicodeMap(code, map2) {
   if (code < map2[0]) {
     return false;
@@ -11955,7 +11963,8 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   var tokenFlags;
   var commentDirectives;
   var inJSDocType = 0;
-  var skipNonSemanticJSDoc = false;
+  var scriptKind = 0 /* Unknown */;
+  var jsDocParsingMode = 0 /* ParseAll */;
   setText(text, start2, length2);
   var scanner2 = {
     getTokenFullStart: () => fullStartPos,
@@ -11999,14 +12008,15 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     setText,
     setScriptTarget,
     setLanguageVariant,
+    setScriptKind,
+    setJSDocParsingMode,
     setOnError,
     resetTokenState,
     setTextPos: resetTokenState,
     setInJSDocType,
     tryScan,
     lookAhead,
-    scanRange,
-    setSkipNonSemanticJSDoc
+    scanRange
   };
   if (Debug.isDebugging) {
     Object.defineProperty(scanner2, "__debugShowCurrentPositionInText", {
@@ -12794,7 +12804,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
                 tokenFlags |= 1 /* PrecedingLineBreak */;
               }
             }
-            if (isJSDoc2 && (!skipNonSemanticJSDoc || semanticJSDocTagRegEx.test(text.slice(fullStartPos, pos)))) {
+            if (isJSDoc2 && shouldParseJSDoc()) {
               tokenFlags |= 2 /* PrecedingJSDocComment */;
             }
             commentDirectives = appendIfCommentDirective(commentDirectives, text.slice(lastLineStart, pos), commentDirectiveRegExMultiLine, lastLineStart);
@@ -13053,6 +13063,21 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
       }
     }
   }
+  function shouldParseJSDoc() {
+    switch (jsDocParsingMode) {
+      case 0 /* ParseAll */:
+        return true;
+      case 1 /* ParseNone */:
+        return false;
+    }
+    if (scriptKind !== 3 /* TS */ && scriptKind !== 4 /* TSX */) {
+      return true;
+    }
+    if (jsDocParsingMode === 3 /* ParseForTypeInfo */) {
+      return false;
+    }
+    return jsDocSeeOrLink.test(text.slice(fullStartPos, pos));
+  }
   function reScanInvalidIdentifier() {
     Debug.assert(token === 0 /* Unknown */, "'reScanInvalidIdentifier' should only be called when the current token is 'SyntaxKind.Unknown'.");
     pos = tokenStart = fullStartPos;
@@ -13467,8 +13492,11 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
   function setLanguageVariant(variant) {
     languageVariant = variant;
   }
-  function setSkipNonSemanticJSDoc(skip) {
-    skipNonSemanticJSDoc = skip;
+  function setScriptKind(kind) {
+    scriptKind = kind;
+  }
+  function setJSDocParsingMode(kind) {
+    jsDocParsingMode = kind;
   }
   function resetTokenState(position) {
     Debug.assert(position >= 0);
@@ -30639,7 +30667,7 @@ function gatherPossibleChildren(node) {
 function setExternalModuleIndicator(sourceFile) {
   sourceFile.externalModuleIndicator = isFileProbablyExternalModule(sourceFile);
 }
-function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind, skipNonSemanticJSDoc) {
+function createSourceFile(fileName, sourceText, languageVersionOrOptions, setParentNodes = false, scriptKind) {
   var _a, _b, _c, _d;
   (_a = tracing) == null ? void 0 : _a.push(
     tracing.Phase.Parse,
@@ -30654,7 +30682,8 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
   const {
     languageVersion,
     setExternalModuleIndicator: overrideSetExternalModuleIndicator,
-    impliedNodeFormat: format
+    impliedNodeFormat: format,
+    jsDocParsingMode
   } = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions : { languageVersion: languageVersionOrOptions };
   if (languageVersion === 100 /* JSON */) {
     result = Parser.parseSourceFile(
@@ -30666,7 +30695,7 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
       setParentNodes,
       6 /* JSON */,
       noop,
-      skipNonSemanticJSDoc
+      jsDocParsingMode
     );
   } else {
     const setIndicator = format === void 0 ? overrideSetExternalModuleIndicator : (file) => {
@@ -30682,7 +30711,7 @@ function createSourceFile(fileName, sourceText, languageVersionOrOptions, setPar
       setParentNodes,
       scriptKind,
       setIndicator,
-      skipNonSemanticJSDoc
+      jsDocParsingMode
     );
   }
   (_c = perfLogger) == null ? void 0 : _c.logStopParseSourceFile();
@@ -30816,7 +30845,7 @@ var Parser;
   var contextFlags;
   var topLevel = true;
   var parseErrorBeforeNextFinishedNode = false;
-  function parseSourceFile(fileName2, sourceText2, languageVersion2, syntaxCursor2, setParentNodes = false, scriptKind2, setExternalModuleIndicatorOverride, skipNonSemanticJSDoc) {
+  function parseSourceFile(fileName2, sourceText2, languageVersion2, syntaxCursor2, setParentNodes = false, scriptKind2, setExternalModuleIndicatorOverride, jsDocParsingMode = 0 /* ParseAll */) {
     var _a;
     scriptKind2 = ensureScriptKind(fileName2, scriptKind2);
     if (scriptKind2 === 6 /* JSON */) {
@@ -30838,9 +30867,8 @@ var Parser;
       result2.pragmas = emptyMap;
       return result2;
     }
-    skipNonSemanticJSDoc = !!skipNonSemanticJSDoc && scriptKind2 !== 1 /* JS */ && scriptKind2 !== 2 /* JSX */;
-    initializeState(fileName2, sourceText2, languageVersion2, syntaxCursor2, scriptKind2, skipNonSemanticJSDoc);
-    const result = parseSourceFileWorker(languageVersion2, setParentNodes, scriptKind2, setExternalModuleIndicatorOverride || setExternalModuleIndicator, skipNonSemanticJSDoc);
+    initializeState(fileName2, sourceText2, languageVersion2, syntaxCursor2, scriptKind2, jsDocParsingMode);
+    const result = parseSourceFileWorker(languageVersion2, setParentNodes, scriptKind2, setExternalModuleIndicatorOverride || setExternalModuleIndicator, jsDocParsingMode);
     clearState();
     return result;
   }
@@ -30853,8 +30881,7 @@ var Parser;
       /*syntaxCursor*/
       void 0,
       1 /* JS */,
-      /*skipNonSemanticJSDoc*/
-      false
+      0 /* ParseAll */
     );
     nextToken();
     const entityName = parseEntityName(
@@ -30867,15 +30894,7 @@ var Parser;
   }
   Parser2.parseIsolatedEntityName = parseIsolatedEntityName2;
   function parseJsonText2(fileName2, sourceText2, languageVersion2 = 2 /* ES2015 */, syntaxCursor2, setParentNodes = false) {
-    initializeState(
-      fileName2,
-      sourceText2,
-      languageVersion2,
-      syntaxCursor2,
-      6 /* JSON */,
-      /*skipNonSemanticJSDoc*/
-      false
-    );
+    initializeState(fileName2, sourceText2, languageVersion2, syntaxCursor2, 6 /* JSON */, 0 /* ParseAll */);
     sourceFlags = contextFlags;
     nextToken();
     const pos = getNodePos();
@@ -30956,7 +30975,7 @@ var Parser;
     return result;
   }
   Parser2.parseJsonText = parseJsonText2;
-  function initializeState(_fileName, _sourceText, _languageVersion, _syntaxCursor, _scriptKind, _skipNonSemanticJSDoc) {
+  function initializeState(_fileName, _sourceText, _languageVersion, _syntaxCursor, _scriptKind, _jsDocParsingMode) {
     NodeConstructor2 = objectAllocator.getNodeConstructor();
     TokenConstructor2 = objectAllocator.getTokenConstructor();
     IdentifierConstructor2 = objectAllocator.getIdentifierConstructor();
@@ -30992,13 +31011,15 @@ var Parser;
     scanner2.setOnError(scanError);
     scanner2.setScriptTarget(languageVersion);
     scanner2.setLanguageVariant(languageVariant);
-    scanner2.setSkipNonSemanticJSDoc(_skipNonSemanticJSDoc);
+    scanner2.setScriptKind(scriptKind);
+    scanner2.setJSDocParsingMode(_jsDocParsingMode);
   }
   function clearState() {
     scanner2.clearCommentDirectives();
     scanner2.setText("");
     scanner2.setOnError(void 0);
-    scanner2.setSkipNonSemanticJSDoc(false);
+    scanner2.setScriptKind(0 /* Unknown */);
+    scanner2.setJSDocParsingMode(0 /* ParseAll */);
     sourceText = void 0;
     languageVersion = void 0;
     syntaxCursor = void 0;
@@ -31012,7 +31033,7 @@ var Parser;
     notParenthesizedArrow = void 0;
     topLevel = true;
   }
-  function parseSourceFileWorker(languageVersion2, setParentNodes, scriptKind2, setExternalModuleIndicator2, skipNonSemanticJSDoc) {
+  function parseSourceFileWorker(languageVersion2, setParentNodes, scriptKind2, setExternalModuleIndicator2, jsDocParsingMode) {
     const isDeclarationFile = isDeclarationFileName(fileName);
     if (isDeclarationFile) {
       contextFlags |= 33554432 /* Ambient */;
@@ -31031,7 +31052,7 @@ var Parser;
     sourceFile.identifierCount = identifierCount;
     sourceFile.identifiers = identifiers;
     sourceFile.parseDiagnostics = attachFileToDiagnostics(parseDiagnostics, sourceFile);
-    sourceFile.skipNonSemanticJSDoc = skipNonSemanticJSDoc;
+    sourceFile.jsDocParsingMode = jsDocParsingMode;
     if (jsDocDiagnostics) {
       sourceFile.jsDocDiagnostics = attachFileToDiagnostics(jsDocDiagnostics, sourceFile);
     }
@@ -36466,8 +36487,7 @@ var Parser;
         /*syntaxCursor*/
         void 0,
         1 /* JS */,
-        /*skipNonSemanticJSDoc*/
-        false
+        0 /* ParseAll */
       );
       scanner2.setText(content, start2, length2);
       currentToken = scanner2.scan();
@@ -36532,8 +36552,7 @@ var Parser;
         /*syntaxCursor*/
         void 0,
         1 /* JS */,
-        /*skipNonSemanticJSDoc*/
-        false
+        0 /* ParseAll */
       );
       const jsDoc = doInsideOfContext(16777216 /* JSDoc */, () => parseJSDocCommentWorker(start2, length2));
       const sourceFile = { languageVariant: 0 /* Standard */, text: content };
@@ -37490,7 +37509,7 @@ var IncrementalParser;
         true,
         sourceFile.scriptKind,
         sourceFile.setExternalModuleIndicator,
-        sourceFile.skipNonSemanticJSDoc
+        sourceFile.jsDocParsingMode
       );
     }
     const incrementalSourceFile = sourceFile;
@@ -37515,7 +37534,7 @@ var IncrementalParser;
       true,
       sourceFile.scriptKind,
       sourceFile.setExternalModuleIndicator,
-      sourceFile.skipNonSemanticJSDoc
+      sourceFile.jsDocParsingMode
     );
     result.commentDirectives = getNewCommentDirectives(
       sourceFile.commentDirectives,
@@ -42771,7 +42790,9 @@ function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
           extensionsToExtensionsArray(extensions),
           /*excludes*/
           void 0,
-          [changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target))]
+          [
+            isDeclarationFileName(target) ? target.replace("*", "**/*") : changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target))
+          ]
         ).forEach((entry) => {
           entrypoints = appendIfUnique(entrypoints, {
             path: entry,
@@ -57899,7 +57920,28 @@ function createTypeChecker(host) {
           }
         }
       }
-      links[resolutionKind] = combineSymbolTables(earlySymbols, lateSymbols) || emptySymbols;
+      let resolved = combineSymbolTables(earlySymbols, lateSymbols);
+      if (symbol.flags & 33554432 /* Transient */ && links.cjsExportMerged && symbol.declarations) {
+        for (const decl of symbol.declarations) {
+          const original = getSymbolLinks(decl.symbol)[resolutionKind];
+          if (!resolved) {
+            resolved = original;
+            continue;
+          }
+          if (!original)
+            continue;
+          original.forEach((s, name) => {
+            const existing = resolved.get(name);
+            if (!existing)
+              resolved.set(name, s);
+            else if (existing === s)
+              return;
+            else
+              resolved.set(name, mergeSymbol(existing, s));
+          });
+        }
+      }
+      links[resolutionKind] = resolved || emptySymbols;
     }
     return links[resolutionKind];
   }
@@ -119744,7 +119786,7 @@ function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, ge
 function createCompilerHost(options, setParentNodes) {
   return createCompilerHostWorker(options, setParentNodes);
 }
-function createGetSourceFile(readFile, getCompilerOptions, setParentNodes, skipNonSemanticJSDocParsing) {
+function createGetSourceFile(readFile, getCompilerOptions, setParentNodes) {
   return (fileName, languageVersionOrOptions, onError) => {
     let text;
     try {
@@ -119758,15 +119800,7 @@ function createGetSourceFile(readFile, getCompilerOptions, setParentNodes, skipN
       }
       text = "";
     }
-    return text !== void 0 ? createSourceFile(
-      fileName,
-      text,
-      languageVersionOrOptions,
-      setParentNodes,
-      /*scriptKind*/
-      void 0,
-      skipNonSemanticJSDocParsing
-    ) : void 0;
+    return text !== void 0 ? createSourceFile(fileName, text, languageVersionOrOptions, setParentNodes) : void 0;
   };
 }
 function createWriteFileMeasuringIO(actualWriteFile, createDirectory, directoryExists) {
@@ -119790,7 +119824,7 @@ function createWriteFileMeasuringIO(actualWriteFile, createDirectory, directoryE
     }
   };
 }
-function createCompilerHostWorker(options, setParentNodes, skipNonSemanticJSDocParsing, system = sys) {
+function createCompilerHostWorker(options, setParentNodes, system = sys) {
   const existingDirectories = /* @__PURE__ */ new Map();
   const getCanonicalFileName = createGetCanonicalFileName(system.useCaseSensitiveFileNames);
   function directoryExists(directoryPath) {
@@ -119809,7 +119843,7 @@ function createCompilerHostWorker(options, setParentNodes, skipNonSemanticJSDocP
   const newLine = getNewLineCharacter(options);
   const realpath = system.realpath && ((path) => system.realpath(path));
   const compilerHost = {
-    getSourceFile: createGetSourceFile((fileName) => compilerHost.readFile(fileName), () => options, setParentNodes, skipNonSemanticJSDocParsing),
+    getSourceFile: createGetSourceFile((fileName) => compilerHost.readFile(fileName), () => options, setParentNodes),
     getDefaultLibLocation,
     getDefaultLibFileName: (options2) => combinePaths(getDefaultLibLocation(), getDefaultLibFileName(options2)),
     writeFile: createWriteFileMeasuringIO(
@@ -122195,7 +122229,7 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
     const result = getImpliedNodeFormatForFileWorker(getNormalizedAbsolutePath(fileName, currentDirectory), moduleResolutionCache2 == null ? void 0 : moduleResolutionCache2.getPackageJsonInfoCache(), host2, options2);
     const languageVersion = getEmitScriptTarget(options2);
     const setExternalModuleIndicator2 = getSetExternalModuleIndicator(options2);
-    return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2 } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2 };
+    return typeof result === "object" ? { ...result, languageVersion, setExternalModuleIndicator: setExternalModuleIndicator2, jsDocParsingMode: host2.jsDocParsingMode } : { languageVersion, impliedNodeFormat: result, setExternalModuleIndicator: setExternalModuleIndicator2, jsDocParsingMode: host2.jsDocParsingMode };
   }
   function findSourceFileWorker(fileName, isDefaultLib, ignoreNoDefaultLib, reason, packageId) {
     var _a2;
@@ -126940,8 +126974,7 @@ function createCompilerHostFromProgramHost(host, getCompilerOptions, directorySt
       (fileName, encoding) => !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding),
       getCompilerOptions,
       /*setParentNodes*/
-      void 0,
-      host.skipNonSemanticJSDocParsing
+      void 0
     ),
     getDefaultLibLocation: maybeBind(host, host.getDefaultLibLocation),
     getDefaultLibFileName: (options) => host.getDefaultLibFileName(options),
@@ -126963,7 +126996,8 @@ function createCompilerHostFromProgramHost(host, getCompilerOptions, directorySt
     getEnvironmentVariable: maybeBind(host, host.getEnvironmentVariable) || (() => ""),
     createHash: maybeBind(host, host.createHash),
     readDirectory: maybeBind(host, host.readDirectory),
-    storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit
+    storeFilesChangingSignatureDuringEmit: host.storeFilesChangingSignatureDuringEmit,
+    jsDocParsingMode: host.jsDocParsingMode
   };
   return compilerHost;
 }
@@ -127127,12 +127161,11 @@ function readBuilderProgram(compilerOptions, host) {
     return void 0;
   return createBuilderProgramUsingProgramBuildInfo(buildInfo, buildInfoPath, host);
 }
-function createIncrementalCompilerHost(options, system = sys, skipNonSemanticJSDocParsing) {
+function createIncrementalCompilerHost(options, system = sys) {
   const host = createCompilerHostWorker(
     options,
     /*setParentNodes*/
     void 0,
-    skipNonSemanticJSDocParsing,
     system
   );
   host.createHash = maybeBind(system, system.createHash);
@@ -135056,10 +135089,10 @@ var DocumentHighlights;
 function isDocumentRegistryEntry(entry) {
   return !!entry.sourceFile;
 }
-function createDocumentRegistry(useCaseSensitiveFileNames2, currentDirectory) {
-  return createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory);
+function createDocumentRegistry(useCaseSensitiveFileNames2, currentDirectory, jsDocParsingMode) {
+  return createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory, jsDocParsingMode);
 }
-function createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory = "", externalCache) {
+function createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory = "", jsDocParsingMode, externalCache) {
   const buckets = /* @__PURE__ */ new Map();
   const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames2);
   function reportStats() {
@@ -135143,9 +135176,11 @@ function createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirec
     const sourceFileOptions = typeof languageVersionOrOptions === "object" ? languageVersionOrOptions : {
       languageVersion: scriptTarget,
       impliedNodeFormat: host && getImpliedNodeFormatForFile(path, (_d = (_c = (_b = (_a = host.getCompilerHost) == null ? void 0 : _a.call(host)) == null ? void 0 : _b.getModuleResolutionCache) == null ? void 0 : _c.call(_b)) == null ? void 0 : _d.getPackageJsonInfoCache(), host, compilationSettings),
-      setExternalModuleIndicator: getSetExternalModuleIndicator(compilationSettings)
+      setExternalModuleIndicator: getSetExternalModuleIndicator(compilationSettings),
+      jsDocParsingMode
     };
     sourceFileOptions.languageVersion = scriptTarget;
+    Debug.assertEqual(jsDocParsingMode, sourceFileOptions.jsDocParsingMode);
     const oldBucketCount = buckets.size;
     const keyWithMode = getDocumentRegistryBucketKeyWithMode(key, sourceFileOptions.impliedNodeFormat);
     const bucket = getOrUpdate(buckets, keyWithMode, () => /* @__PURE__ */ new Map());
@@ -136566,7 +136601,8 @@ function transpileModule(input, transpileOptions) {
         compilerHost,
         options
       ),
-      setExternalModuleIndicator: getSetExternalModuleIndicator(options)
+      setExternalModuleIndicator: getSetExternalModuleIndicator(options),
+      jsDocParsingMode: 1 /* ParseNone */
     }
   );
   if (transpileOptions.moduleName) {
@@ -140647,12 +140683,16 @@ function getRefactorActionsToConvertToTemplateString(context) {
   const { file, startPosition } = context;
   const node = getNodeOrParentOfParentheses(file, startPosition);
   const maybeBinary = getParentBinaryExpression(node);
+  const nodeIsStringLiteral = isStringLiteral(maybeBinary);
   const refactorInfo = { name: refactorName10, description: refactorDescription6, actions: [] };
-  if (isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation) {
+  if (nodeIsStringLiteral && context.triggerReason !== "invoked") {
+    return emptyArray;
+  }
+  if (isExpressionNode(maybeBinary) && (nodeIsStringLiteral || isBinaryExpression(maybeBinary) && treeToArray(maybeBinary).isValidConcatenation)) {
     refactorInfo.actions.push(convertStringAction);
     return [refactorInfo];
   } else if (context.preferences.provideRefactorNotApplicableReason) {
-    refactorInfo.actions.push({ ...convertStringAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenation) });
+    refactorInfo.actions.push({ ...convertStringAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Can_only_convert_string_concatenations_and_string_literals) });
     return [refactorInfo];
   }
   return emptyArray;
@@ -143757,7 +143797,9 @@ var SyntaxTreeCache = class {
           this.host,
           this.host.getCompilationSettings()
         ),
-        setExternalModuleIndicator: getSetExternalModuleIndicator(this.host.getCompilationSettings())
+        setExternalModuleIndicator: getSetExternalModuleIndicator(this.host.getCompilationSettings()),
+        // These files are used to produce syntax-based highlighting, which reads JSDoc, so we must use ParseAll.
+        jsDocParsingMode: 0 /* ParseAll */
       };
       sourceFile = createLanguageServiceSourceFile(
         fileName,
@@ -143817,7 +143859,8 @@ function updateLanguageServiceSourceFile(sourceFile, scriptSnapshot, version2, t
   const options = {
     languageVersion: sourceFile.languageVersion,
     impliedNodeFormat: sourceFile.impliedNodeFormat,
-    setExternalModuleIndicator: sourceFile.setExternalModuleIndicator
+    setExternalModuleIndicator: sourceFile.setExternalModuleIndicator,
+    jsDocParsingMode: sourceFile.jsDocParsingMode
   };
   return createLanguageServiceSourceFile(
     sourceFile.fileName,
@@ -144019,7 +144062,8 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       resolveTypeReferenceDirectiveReferences: maybeBind(host, host.resolveTypeReferenceDirectiveReferences),
       resolveLibrary: maybeBind(host, host.resolveLibrary),
       useSourceOfProjectReferenceRedirect: maybeBind(host, host.useSourceOfProjectReferenceRedirect),
-      getParsedCommandLine
+      getParsedCommandLine,
+      jsDocParsingMode: host.jsDocParsingMode
     };
     const originalGetSourceFile = compilerHost.getSourceFile;
     const { getSourceFileWithCache } = changeCompilerHostLikeToUseCache(
@@ -145263,6 +145307,9 @@ var LanguageServiceShimHostAdapter = class {
         return map(typeDirectiveNames, (name) => getProperty(typeDirectivesForFile, isString(name) ? name : toFileNameLowerCase(name.fileName)));
       };
     }
+    if ("jsDocParsingMode" in this.shimHost) {
+      this.jsDocParsingMode = this.shimHost.jsDocParsingMode;
+    }
   }
   log(s) {
     if (this.loggingEnabled) {
@@ -161075,8 +161122,9 @@ function convertStringLiteralCompletions(completion, contextToken, sourceFile, h
       return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan, entries };
     }
     case 2 /* Types */: {
+      const quoteChar = contextToken.kind === 15 /* NoSubstitutionTemplateLiteral */ ? 96 /* backtick */ : startsWith(getTextOfNode(contextToken), "'") ? 39 /* singleQuote */ : 34 /* doubleQuote */;
       const entries = completion.types.map((type) => ({
-        name: type.value,
+        name: escapeString(type.value, quoteChar),
         kindModifiers: "" /* none */,
         kind: "string" /* string */,
         sortText: SortText.LocationPriority,
@@ -169273,7 +169321,7 @@ var changesToText;
     const sourceFile = createSourceFile(
       "any file name",
       nonFormattedText,
-      99 /* ESNext */,
+      { languageVersion: 99 /* ESNext */, jsDocParsingMode: 1 /* ParseNone */ },
       /*setParentNodes*/
       true,
       scriptKind
@@ -172558,6 +172606,7 @@ __export(ts_exports2, {
   InternalEmitFlags: () => InternalEmitFlags,
   InternalSymbolName: () => InternalSymbolName,
   InvalidatedProjectKind: () => InvalidatedProjectKind,
+  JSDocParsingMode: () => JSDocParsingMode,
   JsDoc: () => ts_JsDoc_exports,
   JsTyping: () => ts_JsTyping_exports,
   JsxEmit: () => JsxEmit,
@@ -176521,6 +176570,7 @@ var Project3 = class _Project {
     this.directoryStructureHost = directoryStructureHost;
     this.currentDirectory = this.projectService.getNormalizedAbsolutePath(currentDirectory);
     this.getCanonicalFileName = this.projectService.toCanonicalFileName;
+    this.jsDocParsingMode = this.projectService.jsDocParsingMode;
     this.cancellationToken = new ThrottledCancellationToken(this.projectService.cancellationToken, this.projectService.throttleWaitMilliseconds);
     if (!this.compilerOptions) {
       this.compilerOptions = getDefaultCompilerOptions2();
@@ -179087,6 +179137,7 @@ var _ProjectService = class _ProjectService {
     this.allowLocalPluginLoads = !!opts.allowLocalPluginLoads;
     this.typesMapLocation = opts.typesMapLocation === void 0 ? combinePaths(getDirectoryPath(this.getExecutingFilePath()), "typesMap.json") : opts.typesMapLocation;
     this.session = opts.session;
+    this.jsDocParsingMode = opts.jsDocParsingMode;
     if (opts.serverMode !== void 0) {
       this.serverMode = opts.serverMode;
     } else {
@@ -179112,7 +179163,7 @@ var _ProjectService = class _ProjectService {
       hostInfo: "Unknown host",
       extraFileExtensions: []
     };
-    this.documentRegistry = createDocumentRegistryInternal(this.host.useCaseSensitiveFileNames, this.currentDirectory, this);
+    this.documentRegistry = createDocumentRegistryInternal(this.host.useCaseSensitiveFileNames, this.currentDirectory, this.jsDocParsingMode, this);
     const watchLogLevel = this.logger.hasLevel(3 /* verbose */) ? 2 /* Verbose */ : this.logger.loggingEnabled() ? 1 /* TriggerOnly */ : 0 /* None */;
     const log = watchLogLevel !== 0 /* None */ ? (s) => this.logger.info(s) : noop;
     this.packageJsonCache = createPackageJsonCache(this);
@@ -187123,6 +187174,7 @@ start(initializeNodeSystem(), require("os").platform());
   InternalEmitFlags,
   InternalSymbolName,
   InvalidatedProjectKind,
+  JSDocParsingMode,
   JsDoc,
   JsTyping,
   JsxEmit,