@typescript-deploys/pr-build 5.5.0-pr-55267-144 → 5.5.0-pr-58321-7

package/lib/tsc.js

@@ -8109,14 +8109,11 @@ var charToRegExpFlag = new Map(Object.entries({
   y: 128 /* Sticky */
 }));
 var regExpFlagToFirstAvailableLanguageVersion = /* @__PURE__ */ new Map([
-  [1 /* HasIndices */, 9 /* ES2022 */],
-  [2 /* Global */, 0 /* ES3 */],
-  [4 /* IgnoreCase */, 0 /* ES3 */],
-  [8 /* Multiline */, 0 /* ES3 */],
-  [16 /* DotAll */, 5 /* ES2018 */],
-  [32 /* Unicode */, 2 /* ES2015 */],
-  [64 /* UnicodeSets */, 99 /* ESNext */],
-  [128 /* Sticky */, 2 /* ES2015 */]
+  [1 /* HasIndices */, 9 /* RegularExpressionFlagsHasIndices */],
+  [16 /* DotAll */, 5 /* RegularExpressionFlagsDotAll */],
+  [32 /* Unicode */, 2 /* RegularExpressionFlagsUnicode */],
+  [64 /* UnicodeSets */, 99 /* RegularExpressionFlagsUnicodeSets */],
+  [128 /* Sticky */, 2 /* RegularExpressionFlagsSticky */]
 ]);
 var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 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, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6e3, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 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, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43e3, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500];
 var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 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, 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, 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, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 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, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 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, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 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, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 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, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 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, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 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, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43e3, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 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, 65062, 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];
@@ -9839,10 +9836,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, p, 1);
           } else {
             regExpFlags |= flag;
-            const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
-            if (languageVersion < availableFrom) {
-              error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, p, 1, getNameOfScriptTarget(availableFrom));
-            }
+            checkRegularExpressionFlagAvailable(flag, p);
           }
         }
         p++;
@@ -10074,10 +10068,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error(Diagnostics.This_regular_expression_flag_cannot_be_toggled_within_a_subpattern, pos, 1);
           } else {
             currFlags |= flag;
-            const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
-            if (languageVersion < availableFrom) {
-              error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos, 1, getNameOfScriptTarget(availableFrom));
-            }
+            checkRegularExpressionFlagAvailable(flag, pos);
           }
           pos++;
         }
@@ -10684,6 +10675,12 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         }
       });
     }
+    function checkRegularExpressionFlagAvailable(flag, pos2) {
+      const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
+      if (availableFrom && languageVersion < availableFrom) {
+        error(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos2, 1, getNameOfScriptTarget(availableFrom));
+      }
+    }
   }
   function appendIfCommentDirective(commentDirectives2, text2, commentDirectiveRegEx, lineStart) {
     const type = getDirectiveFromComment(text2.trimStart(), commentDirectiveRegEx);
@@ -73181,11 +73178,19 @@ function createTypeChecker(host) {
     const mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
     const sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
     applyToParameterTypes(sourceSignature, signature, (source, target) => {
-      inferTypes(context.inferences, source, target);
+      inferTypes(
+        context.inferences,
+        source,
+        target,
+        /*priority*/
+        void 0,
+        /*contravariant*/
+        strictFunctionTypes
+      );
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context.inferences, source, target);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));

package/lib/typescript.js

@@ -1894,7 +1894,6 @@ __export(typescript_exports, {
   loadWithModeAwareCache: () => loadWithModeAwareCache,
   makeIdentifierFromModuleName: () => makeIdentifierFromModuleName,
   makeImport: () => makeImport,
-  makeImportIfNecessary: () => makeImportIfNecessary,
   makeStringLiteral: () => makeStringLiteral,
   mangleScopedPackageName: () => mangleScopedPackageName,
   map: () => map,
@@ -7285,12 +7284,15 @@ var LanguageFeatureMinimumTarget = /* @__PURE__ */ ((LanguageFeatureMinimumTarge
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ArrowFunctions"] = 2 /* ES2015 */] = "ArrowFunctions";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["BlockScopedVariables"] = 2 /* ES2015 */] = "BlockScopedVariables";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ObjectAssign"] = 2 /* ES2015 */] = "ObjectAssign";
+  LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["RegularExpressionFlagsUnicode"] = 2 /* ES2015 */] = "RegularExpressionFlagsUnicode";
+  LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["RegularExpressionFlagsSticky"] = 2 /* ES2015 */] = "RegularExpressionFlagsSticky";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["Exponentiation"] = 3 /* ES2016 */] = "Exponentiation";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["AsyncFunctions"] = 4 /* ES2017 */] = "AsyncFunctions";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ForAwaitOf"] = 5 /* ES2018 */] = "ForAwaitOf";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["AsyncGenerators"] = 5 /* ES2018 */] = "AsyncGenerators";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["AsyncIteration"] = 5 /* ES2018 */] = "AsyncIteration";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ObjectSpreadRest"] = 5 /* ES2018 */] = "ObjectSpreadRest";
+  LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["RegularExpressionFlagsDotAll"] = 5 /* ES2018 */] = "RegularExpressionFlagsDotAll";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["BindinglessCatch"] = 6 /* ES2019 */] = "BindinglessCatch";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["BigInt"] = 7 /* ES2020 */] = "BigInt";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["NullishCoalesce"] = 7 /* ES2020 */] = "NullishCoalesce";
@@ -7299,9 +7301,11 @@ var LanguageFeatureMinimumTarget = /* @__PURE__ */ ((LanguageFeatureMinimumTarge
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["TopLevelAwait"] = 9 /* ES2022 */] = "TopLevelAwait";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ClassFields"] = 9 /* ES2022 */] = "ClassFields";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["PrivateNamesAndClassStaticBlocks"] = 9 /* ES2022 */] = "PrivateNamesAndClassStaticBlocks";
+  LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["RegularExpressionFlagsHasIndices"] = 9 /* ES2022 */] = "RegularExpressionFlagsHasIndices";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ShebangComments"] = 99 /* ESNext */] = "ShebangComments";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["UsingAndAwaitUsing"] = 99 /* ESNext */] = "UsingAndAwaitUsing";
   LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["ClassAndClassElementDecorators"] = 99 /* ESNext */] = "ClassAndClassElementDecorators";
+  LanguageFeatureMinimumTarget2[LanguageFeatureMinimumTarget2["RegularExpressionFlagsUnicodeSets"] = 99 /* ESNext */] = "RegularExpressionFlagsUnicodeSets";
   return LanguageFeatureMinimumTarget2;
 })(LanguageFeatureMinimumTarget || {});
 var ExternalEmitHelpers = /* @__PURE__ */ ((ExternalEmitHelpers2) => {
@@ -11716,14 +11720,11 @@ var charToRegExpFlag = new Map(Object.entries({
   y: 128 /* Sticky */
 }));
 var regExpFlagToFirstAvailableLanguageVersion = /* @__PURE__ */ new Map([
-  [1 /* HasIndices */, 9 /* ES2022 */],
-  [2 /* Global */, 0 /* ES3 */],
-  [4 /* IgnoreCase */, 0 /* ES3 */],
-  [8 /* Multiline */, 0 /* ES3 */],
-  [16 /* DotAll */, 5 /* ES2018 */],
-  [32 /* Unicode */, 2 /* ES2015 */],
-  [64 /* UnicodeSets */, 99 /* ESNext */],
-  [128 /* Sticky */, 2 /* ES2015 */]
+  [1 /* HasIndices */, 9 /* RegularExpressionFlagsHasIndices */],
+  [16 /* DotAll */, 5 /* RegularExpressionFlagsDotAll */],
+  [32 /* Unicode */, 2 /* RegularExpressionFlagsUnicode */],
+  [64 /* UnicodeSets */, 99 /* RegularExpressionFlagsUnicodeSets */],
+  [128 /* Sticky */, 2 /* RegularExpressionFlagsSticky */]
 ]);
 var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 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, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6e3, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 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, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43e3, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500];
 var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 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, 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, 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, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 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, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 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, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 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, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 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, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 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, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 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, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43e3, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 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, 65062, 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];
@@ -13470,10 +13471,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error2(Diagnostics.The_Unicode_u_flag_and_the_Unicode_Sets_v_flag_cannot_be_set_simultaneously, p, 1);
           } else {
             regExpFlags |= flag;
-            const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
-            if (languageVersion < availableFrom) {
-              error2(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, p, 1, getNameOfScriptTarget(availableFrom));
-            }
+            checkRegularExpressionFlagAvailable(flag, p);
           }
         }
         p++;
@@ -13705,10 +13703,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
             error2(Diagnostics.This_regular_expression_flag_cannot_be_toggled_within_a_subpattern, pos, 1);
           } else {
             currFlags |= flag;
-            const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
-            if (languageVersion < availableFrom) {
-              error2(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos, 1, getNameOfScriptTarget(availableFrom));
-            }
+            checkRegularExpressionFlagAvailable(flag, pos);
           }
           pos++;
         }
@@ -14315,6 +14310,12 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         }
       });
     }
+    function checkRegularExpressionFlagAvailable(flag, pos2) {
+      const availableFrom = regExpFlagToFirstAvailableLanguageVersion.get(flag);
+      if (availableFrom && languageVersion < availableFrom) {
+        error2(Diagnostics.This_regular_expression_flag_is_only_available_when_targeting_0_or_later, pos2, 1, getNameOfScriptTarget(availableFrom));
+      }
+    }
   }
   function appendIfCommentDirective(commentDirectives2, text2, commentDirectiveRegEx, lineStart) {
     const type = getDirectiveFromComment(text2.trimStart(), commentDirectiveRegEx);
@@ -78006,11 +78007,19 @@ function createTypeChecker(host) {
     const mapper = inferenceContext && (restType && restType.flags & 262144 /* TypeParameter */ ? inferenceContext.nonFixingMapper : inferenceContext.mapper);
     const sourceSignature = mapper ? instantiateSignature(contextualSignature, mapper) : contextualSignature;
     applyToParameterTypes(sourceSignature, signature, (source, target) => {
-      inferTypes(context.inferences, source, target);
+      inferTypes(
+        context.inferences,
+        source,
+        target,
+        /*priority*/
+        void 0,
+        /*contravariant*/
+        strictFunctionTypes
+      );
     });
     if (!inferenceContext) {
       applyToReturnTypes(contextualSignature, signature, (source, target) => {
-        inferTypes(context.inferences, source, target, 128 /* ReturnType */);
+        inferTypes(context.inferences, source, target);
       });
     }
     return getSignatureInstantiation(signature, getInferredTypes(context), isInJSFile(contextualSignature.declaration));
@@ -137095,9 +137104,6 @@ function getModuleSpecifierResolverHost(program, host) {
 function moduleResolutionUsesNodeModules(moduleResolution) {
   return moduleResolution === 2 /* Node10 */ || moduleResolution >= 3 /* Node16 */ && moduleResolution <= 99 /* NodeNext */ || moduleResolution === 100 /* Bundler */;
 }
-function makeImportIfNecessary(defaultImport, namedImports, moduleSpecifier, quotePreference) {
-  return defaultImport || namedImports && namedImports.length ? makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference) : void 0;
-}
 function makeImport(defaultImport, namedImports, moduleSpecifier, quotePreference, isTypeOnly) {
   return factory.createImportDeclaration(
     /*modifiers*/
@@ -137111,10 +137117,10 @@ function makeImport(defaultImport, namedImports, moduleSpecifier, quotePreferenc
 function makeStringLiteral(text, quotePreference) {
   return factory.createStringLiteral(text, quotePreference === 0 /* Single */);
 }
-var QuotePreference = /* @__PURE__ */ ((QuotePreference7) => {
-  QuotePreference7[QuotePreference7["Single"] = 0] = "Single";
-  QuotePreference7[QuotePreference7["Double"] = 1] = "Double";
-  return QuotePreference7;
+var QuotePreference = /* @__PURE__ */ ((QuotePreference6) => {
+  QuotePreference6[QuotePreference6["Single"] = 0] = "Single";
+  QuotePreference6[QuotePreference6["Double"] = 1] = "Double";
+  return QuotePreference6;
 })(QuotePreference || {});
 function quotePreferenceFromString(str, sourceFile) {
   return isStringDoubleQuoted(str, sourceFile) ? 1 /* Double */ : 0 /* Single */;
@@ -142697,16 +142703,16 @@ function cleanText(text) {
 var ts_refactor_exports = {};
 __export(ts_refactor_exports, {
   addExportToChanges: () => addExportToChanges,
-  addExports: () => addExports,
+  addImportsForMovedSymbols: () => addImportsForMovedSymbols,
   addNewFileToTsconfig: () => addNewFileToTsconfig,
   addOrRemoveBracesToArrowFunction: () => ts_refactor_addOrRemoveBracesToArrowFunction_exports,
+  addTargetFileImports: () => addTargetFileImports,
   containsJsx: () => containsJsx,
   convertArrowFunctionOrFunctionExpression: () => ts_refactor_convertArrowFunctionOrFunctionExpression_exports,
   convertParamsToDestructuredObject: () => ts_refactor_convertParamsToDestructuredObject_exports,
   convertStringOrTemplateLiteral: () => ts_refactor_convertStringOrTemplateLiteral_exports,
   convertToOptionalChainExpression: () => ts_refactor_convertToOptionalChainExpression_exports,
   createNewFileName: () => createNewFileName,
-  createOldFileImportsFromTargetFile: () => createOldFileImportsFromTargetFile,
   deleteMovedStatements: () => deleteMovedStatements,
   deleteUnusedImports: () => deleteUnusedImports,
   deleteUnusedOldImports: () => deleteUnusedOldImports,
@@ -142717,13 +142723,13 @@ __export(ts_refactor_exports, {
   generateGetAccessorAndSetAccessor: () => ts_refactor_generateGetAccessorAndSetAccessor_exports,
   getApplicableRefactors: () => getApplicableRefactors,
   getEditsForRefactor: () => getEditsForRefactor,
+  getNewStatementsAndRemoveFromOldFile: () => getNewStatementsAndRemoveFromOldFile,
   getStatementsToMove: () => getStatementsToMove,
   getTopLevelDeclarationStatement: () => getTopLevelDeclarationStatement,
   getUsageInfo: () => getUsageInfo,
   inferFunctionReturnType: () => ts_refactor_inferFunctionReturnType_exports,
   isRefactorErrorInfo: () => isRefactorErrorInfo,
   isTopLevelDeclaration: () => isTopLevelDeclaration,
-  makeImportOrRequire: () => makeImportOrRequire,
   moduleSpecifierFromImport: () => moduleSpecifierFromImport,
   nameOfTopLevelDeclaration: () => nameOfTopLevelDeclaration,
   refactorKindBeginsWith: () => refactorKindBeginsWith,
@@ -143595,282 +143601,12 @@ function getExpandedSelectionNode(firstType, enclosingNode) {
   }) ?? firstType;
 }
 
-// src/services/refactors/helpers.ts
-function isRefactorErrorInfo(info) {
-  return info.error !== void 0;
-}
-function refactorKindBeginsWith(known, requested) {
-  if (!requested)
-    return true;
-  return known.substr(0, requested.length) === requested;
-}
-
-// src/services/refactors/inlineVariable.ts
-var refactorName4 = "Inline variable";
-var refactorDescription = getLocaleSpecificMessage(Diagnostics.Inline_variable);
-var inlineVariableAction = {
-  name: refactorName4,
-  description: refactorDescription,
-  kind: "refactor.inline.variable"
-};
-registerRefactor(refactorName4, {
-  kinds: [inlineVariableAction.kind],
-  getAvailableActions(context) {
-    const {
-      file,
-      program,
-      preferences,
-      startPosition,
-      triggerReason
-    } = context;
-    const info = getInliningInfo(file, startPosition, triggerReason === "invoked", program);
-    if (!info) {
-      return emptyArray;
-    }
-    if (!ts_refactor_exports.isRefactorErrorInfo(info)) {
-      return [{
-        name: refactorName4,
-        description: refactorDescription,
-        actions: [inlineVariableAction]
-      }];
-    }
-    if (preferences.provideRefactorNotApplicableReason) {
-      return [{
-        name: refactorName4,
-        description: refactorDescription,
-        actions: [{
-          ...inlineVariableAction,
-          notApplicableReason: info.error
-        }]
-      }];
-    }
-    return emptyArray;
-  },
-  getEditsForAction(context, actionName2) {
-    Debug.assert(actionName2 === refactorName4, "Unexpected refactor invoked");
-    const { file, program, startPosition } = context;
-    const info = getInliningInfo(
-      file,
-      startPosition,
-      /*tryWithReferenceToken*/
-      true,
-      program
-    );
-    if (!info || ts_refactor_exports.isRefactorErrorInfo(info)) {
-      return void 0;
-    }
-    const { references, declaration, replacement } = info;
-    const edits = ts_textChanges_exports.ChangeTracker.with(context, (tracker) => {
-      for (const node of references) {
-        tracker.replaceNode(file, node, getReplacementExpression(node, replacement));
-      }
-      tracker.delete(file, declaration);
-    });
-    return { edits };
-  }
-});
-function getInliningInfo(file, startPosition, tryWithReferenceToken, program) {
-  var _a, _b;
-  const checker = program.getTypeChecker();
-  const token = getTouchingPropertyName(file, startPosition);
-  const parent2 = token.parent;
-  if (!isIdentifier(token)) {
-    return void 0;
-  }
-  if (isInitializedVariable(parent2) && isVariableDeclarationInVariableStatement(parent2) && isIdentifier(parent2.name)) {
-    if (((_a = checker.getMergedSymbol(parent2.symbol).declarations) == null ? void 0 : _a.length) !== 1) {
-      return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
-    }
-    if (isDeclarationExported(parent2)) {
-      return void 0;
-    }
-    const references = getReferenceNodes(parent2, checker, file);
-    return references && { references, declaration: parent2, replacement: parent2.initializer };
-  }
-  if (tryWithReferenceToken) {
-    let definition = checker.resolveName(
-      token.text,
-      token,
-      111551 /* Value */,
-      /*excludeGlobals*/
-      false
-    );
-    definition = definition && checker.getMergedSymbol(definition);
-    if (((_b = definition == null ? void 0 : definition.declarations) == null ? void 0 : _b.length) !== 1) {
-      return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
-    }
-    const declaration = definition.declarations[0];
-    if (!isInitializedVariable(declaration) || !isVariableDeclarationInVariableStatement(declaration) || !isIdentifier(declaration.name)) {
-      return void 0;
-    }
-    if (isDeclarationExported(declaration)) {
-      return void 0;
-    }
-    const references = getReferenceNodes(declaration, checker, file);
-    return references && { references, declaration, replacement: declaration.initializer };
-  }
-  return { error: getLocaleSpecificMessage(Diagnostics.Could_not_find_variable_to_inline) };
-}
-function isDeclarationExported(declaration) {
-  const variableStatement = cast(declaration.parent.parent, isVariableStatement);
-  return some(variableStatement.modifiers, isExportModifier);
-}
-function getReferenceNodes(declaration, checker, file) {
-  const references = [];
-  const cannotInline = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(declaration.name, checker, file, (ref) => {
-    if (ts_FindAllReferences_exports.isWriteAccessForReference(ref) && !isShorthandPropertyAssignment(ref.parent)) {
-      return true;
-    }
-    if (isExportSpecifier(ref.parent) || isExportAssignment(ref.parent)) {
-      return true;
-    }
-    if (isTypeQueryNode(ref.parent)) {
-      return true;
-    }
-    if (textRangeContainsPositionInclusive(declaration, ref.pos)) {
-      return true;
-    }
-    references.push(ref);
-  });
-  return references.length === 0 || cannotInline ? void 0 : references;
-}
-function getReplacementExpression(reference, replacement) {
-  replacement = getSynthesizedDeepClone(replacement);
-  const { parent: parent2 } = reference;
-  if (isExpression(parent2) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent2) || needsParentheses(parent2))) {
-    return factory.createParenthesizedExpression(replacement);
-  }
-  if (isFunctionLike(replacement) && (isCallLikeExpression(parent2) || isPropertyAccessExpression(parent2))) {
-    return factory.createParenthesizedExpression(replacement);
-  }
-  if (isPropertyAccessExpression(parent2) && (isNumericLiteral(replacement) || isObjectLiteralExpression(replacement))) {
-    return factory.createParenthesizedExpression(replacement);
-  }
-  if (isIdentifier(reference) && isShorthandPropertyAssignment(parent2)) {
-    return factory.createPropertyAssignment(reference, replacement);
-  }
-  return replacement;
-}
-
-// src/services/refactors/moveToNewFile.ts
-var refactorName5 = "Move to a new file";
-var description = getLocaleSpecificMessage(Diagnostics.Move_to_a_new_file);
-var moveToNewFileAction = {
-  name: refactorName5,
-  description,
-  kind: "refactor.move.newFile"
-};
-registerRefactor(refactorName5, {
-  kinds: [moveToNewFileAction.kind],
-  getAvailableActions: function getRefactorActionsToMoveToNewFile(context) {
-    const statements = getStatementsToMove(context);
-    if (context.preferences.allowTextChangesInNewFiles && statements) {
-      const file = context.file;
-      const affectedTextRange = {
-        start: { line: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).line, offset: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).character },
-        end: { line: getLineAndCharacterOfPosition(file, last(statements.all).end).line, offset: getLineAndCharacterOfPosition(file, last(statements.all).end).character }
-      };
-      return [{ name: refactorName5, description, actions: [{ ...moveToNewFileAction, range: affectedTextRange }] }];
-    }
-    if (context.preferences.provideRefactorNotApplicableReason) {
-      return [{ name: refactorName5, description, actions: [{ ...moveToNewFileAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_statement_or_statements) }] }];
-    }
-    return emptyArray;
-  },
-  getEditsForAction: function getRefactorEditsToMoveToNewFile(context, actionName2) {
-    Debug.assert(actionName2 === refactorName5, "Wrong refactor invoked");
-    const statements = Debug.checkDefined(getStatementsToMove(context));
-    const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context.file, context.program, statements, t, context.host, context.preferences));
-    return { edits, renameFilename: void 0, renameLocation: void 0 };
-  }
-});
-function doChange3(oldFile, program, toMove, changes, host, preferences) {
-  const checker = program.getTypeChecker();
-  const usage = getUsageInfo(oldFile, toMove.all, checker);
-  const newFilename = createNewFileName(oldFile, program, host, toMove);
-  changes.createNewFile(oldFile, newFilename, getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences));
-  addNewFileToTsconfig(program, changes, oldFile.fileName, newFilename, hostGetCanonicalFileName(host));
-}
-function getNewStatementsAndRemoveFromOldFile(oldFile, usage, changes, toMove, program, host, newFilename, preferences) {
-  const checker = program.getTypeChecker();
-  const prologueDirectives = takeWhile(oldFile.statements, isPrologueDirective);
-  if (oldFile.externalModuleIndicator === void 0 && oldFile.commonJsModuleIndicator === void 0 && usage.oldImportsNeededByTargetFile.size === 0) {
-    deleteMovedStatements(oldFile, toMove.ranges, changes);
-    return [...prologueDirectives, ...toMove.all];
-  }
-  const useEsModuleSyntax = !fileShouldUseJavaScriptRequire(newFilename, program, host, !!oldFile.commonJsModuleIndicator);
-  const quotePreference = getQuotePreference(oldFile, preferences);
-  const importsFromNewFile = createOldFileImportsFromTargetFile(oldFile, usage.oldFileImportsFromTargetFile, newFilename, program, host, useEsModuleSyntax, quotePreference);
-  if (importsFromNewFile) {
-    insertImports(
-      changes,
-      oldFile,
-      importsFromNewFile,
-      /*blankLineBetween*/
-      true,
-      preferences
-    );
-  }
-  deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
-  deleteMovedStatements(oldFile, toMove.ranges, changes);
-  updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, newFilename, quotePreference);
-  const imports = getNewFileImportsAndAddExportInOldFile(oldFile, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference);
-  const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromTargetFile, useEsModuleSyntax);
-  if (imports.length && body.length) {
-    return [
-      ...prologueDirectives,
-      ...imports,
-      4 /* NewLineTrivia */,
-      ...body
-    ];
-  }
-  return [
-    ...prologueDirectives,
-    ...imports,
-    ...body
-  ];
-}
-function getNewFileImportsAndAddExportInOldFile(oldFile, importsToCopy, newFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference) {
-  const copiedOldImports = [];
-  for (const oldStatement of oldFile.statements) {
-    forEachImportInStatement(oldStatement, (i) => {
-      append(copiedOldImports, filterImport(i, moduleSpecifierFromImport(i), (name) => importsToCopy.has(checker.getSymbolAtLocation(name))));
-    });
-  }
-  let oldFileDefault;
-  const oldFileNamedImports = [];
-  const markSeenTop = nodeSeenTracker();
-  newFileImportsFromOldFile.forEach((symbol) => {
-    if (!symbol.declarations) {
-      return;
-    }
-    for (const decl of symbol.declarations) {
-      if (!isTopLevelDeclaration(decl))
-        continue;
-      const name = nameOfTopLevelDeclaration(decl);
-      if (!name)
-        continue;
-      const top = getTopLevelDeclarationStatement(decl);
-      if (markSeenTop(top)) {
-        addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax);
-      }
-      if (hasSyntacticModifier(decl, 2048 /* Default */)) {
-        oldFileDefault = name;
-      } else {
-        oldFileNamedImports.push(name.text);
-      }
-    }
-  });
-  append(copiedOldImports, makeImportOrRequire(oldFile, oldFileDefault, oldFileNamedImports, getBaseFileName(oldFile.fileName), program, host, useEsModuleSyntax, quotePreference));
-  return copiedOldImports;
-}
-
 // src/services/refactors/moveToFile.ts
 var refactorNameForMoveToFile = "Move to file";
-var description2 = getLocaleSpecificMessage(Diagnostics.Move_to_file);
+var description = getLocaleSpecificMessage(Diagnostics.Move_to_file);
 var moveToFileAction = {
   name: "Move to file",
-  description: description2,
+  description,
   kind: "refactor.move.file"
 };
 registerRefactor(refactorNameForMoveToFile, {
@@ -143893,10 +143629,10 @@ registerRefactor(refactorNameForMoveToFile, {
         start: { line: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).line, offset: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).character },
         end: { line: getLineAndCharacterOfPosition(file, last(statements.all).end).line, offset: getLineAndCharacterOfPosition(file, last(statements.all).end).character }
       };
-      return [{ name: refactorNameForMoveToFile, description: description2, actions: [{ ...moveToFileAction, range: affectedTextRange }] }];
+      return [{ name: refactorNameForMoveToFile, description, actions: [{ ...moveToFileAction, range: affectedTextRange }] }];
     }
     if (context.preferences.provideRefactorNotApplicableReason) {
-      return [{ name: refactorNameForMoveToFile, description: description2, actions: [{ ...moveToFileAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_statement_or_statements) }] }];
+      return [{ name: refactorNameForMoveToFile, description, actions: [{ ...moveToFileAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_statement_or_statements) }] }];
     }
     return emptyArray;
   },
@@ -143910,7 +143646,7 @@ registerRefactor(refactorNameForMoveToFile, {
       if (host.fileExists(targetFile) && program.getSourceFile(targetFile) === void 0) {
         return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_statements_to_the_selected_file));
       }
-      const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
+      const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange3(context, context.file, interactiveRefactorArguments.targetFile, context.program, statements, t, context.host, context.preferences));
       return { edits, renameFilename: void 0, renameLocation: void 0 };
     }
     return error(getLocaleSpecificMessage(Diagnostics.Cannot_move_to_file_selected_file_is_invalid));
@@ -143919,144 +143655,46 @@ registerRefactor(refactorNameForMoveToFile, {
 function error(notApplicableReason) {
   return { edits: [], renameFilename: void 0, renameLocation: void 0, notApplicableReason };
 }
-function doChange4(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
+function doChange3(context, oldFile, targetFile, program, toMove, changes, host, preferences) {
   const checker = program.getTypeChecker();
-  if (!host.fileExists(targetFile)) {
-    changes.createNewFile(oldFile, targetFile, getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, getUsageInfo(oldFile, toMove.all, checker), changes, toMove, program, host, preferences));
+  const isForNewFile = !host.fileExists(targetFile);
+  const targetSourceFile = isForNewFile ? createFutureSourceFile(targetFile, oldFile.externalModuleIndicator ? 99 /* ESNext */ : oldFile.commonJsModuleIndicator ? 1 /* CommonJS */ : void 0, program, host) : Debug.checkDefined(program.getSourceFile(targetFile));
+  const importAdderForOldFile = ts_codefix_exports.createImportAdder(oldFile, context.program, context.preferences, context.host);
+  const importAdderForNewFile = ts_codefix_exports.createImportAdder(targetSourceFile, context.program, context.preferences, context.host);
+  getNewStatementsAndRemoveFromOldFile(oldFile, targetSourceFile, getUsageInfo(oldFile, toMove.all, checker, isForNewFile ? void 0 : getExistingLocals(targetSourceFile, toMove.all, checker)), changes, toMove, program, host, preferences, importAdderForNewFile, importAdderForOldFile);
+  if (isForNewFile) {
     addNewFileToTsconfig(program, changes, oldFile.fileName, targetFile, hostGetCanonicalFileName(host));
-  } else {
-    const targetSourceFile = Debug.checkDefined(program.getSourceFile(targetFile));
-    const importAdder = ts_codefix_exports.createImportAdder(targetSourceFile, context.program, context.preferences, context.host);
-    getNewStatementsAndRemoveFromOldFile2(oldFile, targetSourceFile, getUsageInfo(oldFile, toMove.all, checker, getExistingLocals(targetSourceFile, toMove.all, checker)), changes, toMove, program, host, preferences, importAdder);
   }
 }
-function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, changes, toMove, program, host, preferences, importAdder) {
+function getNewStatementsAndRemoveFromOldFile(oldFile, targetFile, usage, changes, toMove, program, host, preferences, importAdderForNewFile, importAdderForOldFile) {
   const checker = program.getTypeChecker();
   const prologueDirectives = takeWhile(oldFile.statements, isPrologueDirective);
-  if (oldFile.externalModuleIndicator === void 0 && oldFile.commonJsModuleIndicator === void 0 && usage.oldImportsNeededByTargetFile.size === 0 && usage.targetFileImportsFromOldFile.size === 0 && typeof targetFile === "string") {
-    deleteMovedStatements(oldFile, toMove.ranges, changes);
-    return [...prologueDirectives, ...toMove.all];
-  }
-  const targetFileName = typeof targetFile === "string" ? targetFile : targetFile.fileName;
-  const useEsModuleSyntax = !fileShouldUseJavaScriptRequire(targetFileName, program, host, !!oldFile.commonJsModuleIndicator);
+  const useEsModuleSyntax = !fileShouldUseJavaScriptRequire(targetFile.fileName, program, host, !!oldFile.commonJsModuleIndicator);
   const quotePreference = getQuotePreference(oldFile, preferences);
-  const importsFromTargetFile = createOldFileImportsFromTargetFile(oldFile, usage.oldFileImportsFromTargetFile, targetFileName, program, host, useEsModuleSyntax, quotePreference);
-  if (importsFromTargetFile) {
-    insertImports(
-      changes,
-      oldFile,
-      importsFromTargetFile,
+  addImportsForMovedSymbols(usage.oldFileImportsFromTargetFile, targetFile.fileName, importAdderForOldFile, program);
+  deleteUnusedOldImports(oldFile, toMove.all, usage.unusedImportsFromOldFile, importAdderForOldFile);
+  importAdderForOldFile.writeFixes(changes, quotePreference);
+  deleteMovedStatements(oldFile, toMove.ranges, changes);
+  updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, targetFile.fileName, quotePreference);
+  addExportsInOldFile(oldFile, usage.targetFileImportsFromOldFile, changes, useEsModuleSyntax);
+  addTargetFileImports(oldFile, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, checker, program, importAdderForNewFile);
+  if (!isFullSourceFile(targetFile) && prologueDirectives.length) {
+    changes.insertStatementsInNewFile(targetFile.fileName, prologueDirectives, oldFile);
+  }
+  importAdderForNewFile.writeFixes(changes, quotePreference);
+  const body = addExports(oldFile, toMove.all, arrayFrom(usage.oldFileImportsFromTargetFile.keys()), useEsModuleSyntax);
+  if (isFullSourceFile(targetFile) && targetFile.statements.length > 0) {
+    moveStatementsToTargetFile(changes, program, body, targetFile, toMove);
+  } else if (isFullSourceFile(targetFile)) {
+    changes.insertNodesAtEndOfFile(
+      targetFile,
+      body,
       /*blankLineBetween*/
-      true,
-      preferences
+      false
     );
-  }
-  deleteUnusedOldImports(oldFile, toMove.all, changes, usage.unusedImportsFromOldFile, checker);
-  deleteMovedStatements(oldFile, toMove.ranges, changes);
-  updateImportsInOtherFiles(changes, program, host, oldFile, usage.movedSymbols, targetFileName, quotePreference);
-  const imports = getTargetFileImportsAndAddExportInOldFile(oldFile, targetFileName, usage.oldImportsNeededByTargetFile, usage.targetFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference, importAdder);
-  const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromTargetFile, useEsModuleSyntax);
-  if (typeof targetFile !== "string") {
-    if (targetFile.statements.length > 0) {
-      moveStatementsToTargetFile(changes, program, body, targetFile, toMove);
-    } else {
-      changes.insertNodesAtEndOfFile(
-        targetFile,
-        body,
-        /*blankLineBetween*/
-        false
-      );
-    }
-    if (imports.length > 0) {
-      insertImports(
-        changes,
-        targetFile,
-        imports,
-        /*blankLineBetween*/
-        true,
-        preferences
-      );
-    }
-  }
-  if (importAdder) {
-    importAdder.writeFixes(changes, quotePreference);
-  }
-  if (imports.length && body.length) {
-    return [
-      ...prologueDirectives,
-      ...imports,
-      4 /* NewLineTrivia */,
-      ...body
-    ];
-  }
-  return [
-    ...prologueDirectives,
-    ...imports,
-    ...body
-  ];
-}
-function getTargetFileImportsAndAddExportInOldFile(oldFile, targetFile, importsToCopy, targetFileImportsFromOldFile, changes, checker, program, host, useEsModuleSyntax, quotePreference, importAdder) {
-  const copiedOldImports = [];
-  if (importAdder) {
-    importsToCopy.forEach((isValidTypeOnlyUseSite, symbol) => {
-      try {
-        importAdder.addImportFromExportedSymbol(skipAlias(symbol, checker), isValidTypeOnlyUseSite);
-      } catch {
-        for (const oldStatement of oldFile.statements) {
-          forEachImportInStatement(oldStatement, (i) => {
-            append(copiedOldImports, filterImport(i, factory.createStringLiteral(moduleSpecifierFromImport(i).text), (name) => importsToCopy.has(checker.getSymbolAtLocation(name))));
-          });
-        }
-      }
-    });
   } else {
-    const targetSourceFile = program.getSourceFile(targetFile);
-    for (const oldStatement of oldFile.statements) {
-      forEachImportInStatement(oldStatement, (i) => {
-        var _a;
-        const moduleSpecifier = moduleSpecifierFromImport(i);
-        const compilerOptions = program.getCompilerOptions();
-        const resolved = program.getResolvedModuleFromModuleSpecifier(moduleSpecifier);
-        const fileName = (_a = resolved == null ? void 0 : resolved.resolvedModule) == null ? void 0 : _a.resolvedFileName;
-        if (fileName && targetSourceFile) {
-          const newModuleSpecifier = getModuleSpecifier(compilerOptions, targetSourceFile, targetSourceFile.fileName, fileName, createModuleSpecifierResolutionHost(program, host));
-          append(copiedOldImports, filterImport(i, makeStringLiteral(newModuleSpecifier, quotePreference), (name) => importsToCopy.has(checker.getSymbolAtLocation(name))));
-        } else {
-          append(copiedOldImports, filterImport(i, factory.createStringLiteral(moduleSpecifierFromImport(i).text), (name) => importsToCopy.has(checker.getSymbolAtLocation(name))));
-        }
-      });
-    }
+    changes.insertStatementsInNewFile(targetFile.fileName, importAdderForNewFile.hasFixes() ? [4 /* NewLineTrivia */, ...body] : body, oldFile);
   }
-  const targetFileSourceFile = program.getSourceFile(targetFile);
-  let oldFileDefault;
-  const oldFileNamedImports = [];
-  const markSeenTop = nodeSeenTracker();
-  targetFileImportsFromOldFile.forEach((symbol) => {
-    if (!symbol.declarations) {
-      return;
-    }
-    for (const decl of symbol.declarations) {
-      if (!isTopLevelDeclaration(decl))
-        continue;
-      const name = nameOfTopLevelDeclaration(decl);
-      if (!name)
-        continue;
-      const top = getTopLevelDeclarationStatement(decl);
-      if (markSeenTop(top)) {
-        addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax);
-      }
-      if (importAdder && checker.isUnknownSymbol(symbol)) {
-        importAdder.addImportFromExportedSymbol(skipAlias(symbol, checker));
-      } else {
-        if (hasSyntacticModifier(decl, 2048 /* Default */)) {
-          oldFileDefault = name;
-        } else {
-          oldFileNamedImports.push(name.text);
-        }
-      }
-    }
-  });
-  return targetFileSourceFile ? append(copiedOldImports, makeImportOrRequire(targetFileSourceFile, oldFileDefault, oldFileNamedImports, oldFile.fileName, program, host, useEsModuleSyntax, quotePreference)) : append(copiedOldImports, makeImportOrRequire(oldFile, oldFileDefault, oldFileNamedImports, oldFile.fileName, program, host, useEsModuleSyntax, quotePreference));
 }
 function addNewFileToTsconfig(program, changes, oldFileName, newFileNameWithExtension, getCanonicalFileName) {
   const cfg = program.getCompilerOptions().configFile;
@@ -144075,13 +143713,38 @@ function deleteMovedStatements(sourceFile, moved, changes) {
     changes.deleteNodeRangeExcludingEnd(sourceFile, first2, afterLast);
   }
 }
-function deleteUnusedOldImports(oldFile, toMove, changes, toDelete, checker) {
+function deleteUnusedOldImports(oldFile, toMove, toDelete, importAdder) {
   for (const statement of oldFile.statements) {
     if (contains(toMove, statement))
       continue;
-    forEachImportInStatement(statement, (i) => deleteUnusedImports(oldFile, i, changes, (name) => toDelete.has(checker.getSymbolAtLocation(name))));
+    forEachImportInStatement(statement, (i) => {
+      forEachAliasDeclarationInImportOrRequire(i, (decl) => {
+        if (toDelete.has(decl.symbol)) {
+          importAdder.removeExistingImport(decl);
+        }
+      });
+    });
   }
 }
+function addExportsInOldFile(oldFile, targetFileImportsFromOldFile, changes, useEsModuleSyntax) {
+  const markSeenTop = nodeSeenTracker();
+  targetFileImportsFromOldFile.forEach((_, symbol) => {
+    if (!symbol.declarations) {
+      return;
+    }
+    for (const decl of symbol.declarations) {
+      if (!isTopLevelDeclaration(decl))
+        continue;
+      const name = nameOfTopLevelDeclaration(decl);
+      if (!name)
+        continue;
+      const top = getTopLevelDeclarationStatement(decl);
+      if (markSeenTop(top)) {
+        addExportToChanges(oldFile, top, name, changes, useEsModuleSyntax);
+      }
+    }
+  });
+}
 function updateImportsInOtherFiles(changes, program, host, oldFile, movedSymbols, targetFileName, quotePreference) {
   const checker = program.getTypeChecker();
   for (const sourceFile of program.getSourceFiles()) {
@@ -144220,45 +143883,39 @@ function forEachImportInStatement(statement, cb) {
     }
   }
 }
-function createOldFileImportsFromTargetFile(sourceFile, targetFileNeedExport, targetFileNameWithExtension, program, host, useEs6Imports, quotePreference) {
-  let defaultImport;
-  const imports = [];
-  targetFileNeedExport.forEach((symbol) => {
-    if (symbol.escapedName === "default" /* Default */) {
-      defaultImport = factory.createIdentifier(symbolNameNoDefault(symbol));
-    } else {
-      imports.push(symbol.name);
+function forEachAliasDeclarationInImportOrRequire(importOrRequire, cb) {
+  var _a, _b, _c, _d, _e;
+  if (importOrRequire.kind === 272 /* ImportDeclaration */) {
+    if ((_a = importOrRequire.importClause) == null ? void 0 : _a.name) {
+      cb(importOrRequire.importClause);
     }
-  });
-  return makeImportOrRequire(sourceFile, defaultImport, imports, targetFileNameWithExtension, program, host, useEs6Imports, quotePreference);
+    if (((_c = (_b = importOrRequire.importClause) == null ? void 0 : _b.namedBindings) == null ? void 0 : _c.kind) === 274 /* NamespaceImport */) {
+      cb(importOrRequire.importClause.namedBindings);
+    }
+    if (((_e = (_d = importOrRequire.importClause) == null ? void 0 : _d.namedBindings) == null ? void 0 : _e.kind) === 275 /* NamedImports */) {
+      for (const element of importOrRequire.importClause.namedBindings.elements) {
+        cb(element);
+      }
+    }
+  } else if (importOrRequire.kind === 271 /* ImportEqualsDeclaration */) {
+    cb(importOrRequire);
+  } else if (importOrRequire.kind === 260 /* VariableDeclaration */) {
+    if (importOrRequire.name.kind === 80 /* Identifier */) {
+      cb(importOrRequire);
+    } else if (importOrRequire.name.kind === 206 /* ObjectBindingPattern */) {
+      for (const element of importOrRequire.name.elements) {
+        if (isIdentifier(element.name)) {
+          cb(element);
+        }
+      }
+    }
+  }
 }
-function makeImportOrRequire(sourceFile, defaultImport, imports, targetFileNameWithExtension, program, host, useEs6Imports, quotePreference) {
-  const pathToTargetFile = resolvePath(getDirectoryPath(getNormalizedAbsolutePath(sourceFile.fileName, program.getCurrentDirectory())), targetFileNameWithExtension);
-  const pathToTargetFileWithCorrectExtension = getModuleSpecifier(program.getCompilerOptions(), sourceFile, sourceFile.fileName, pathToTargetFile, createModuleSpecifierResolutionHost(program, host));
-  if (useEs6Imports) {
-    const specifiers = imports.map((i) => factory.createImportSpecifier(
-      /*isTypeOnly*/
-      false,
-      /*propertyName*/
-      void 0,
-      factory.createIdentifier(i)
-    ));
-    return makeImportIfNecessary(defaultImport, specifiers, pathToTargetFileWithCorrectExtension, quotePreference);
-  } else {
-    Debug.assert(!defaultImport, "No default import should exist");
-    const bindingElements = imports.map((i) => factory.createBindingElement(
-      /*dotDotDotToken*/
-      void 0,
-      /*propertyName*/
-      void 0,
-      i
-    ));
-    return bindingElements.length ? makeVariableStatement(
-      factory.createObjectBindingPattern(bindingElements),
-      /*type*/
-      void 0,
-      createRequireCall(makeStringLiteral(pathToTargetFileWithCorrectExtension, quotePreference))
-    ) : void 0;
+function addImportsForMovedSymbols(symbols, targetFileName, importAdder, program) {
+  for (const [symbol, isValidTypeOnlyUseSite] of symbols) {
+    const symbolName2 = getNameForExportedSymbol(symbol, getEmitScriptTarget(program.getCompilerOptions()));
+    const exportKind = symbol.name === "default" && symbol.parent ? 1 /* Default */ : 0 /* Named */;
+    importAdder.addImportForNonExistentExport(symbolName2, targetFileName, exportKind, symbol.flags, isValidTypeOnlyUseSite);
   }
 }
 function makeVariableStatement(name, type, initializer, flags = 2 /* Const */) {
@@ -144278,7 +143935,7 @@ function addExports(sourceFile, toMove, needExport, useEs6Exports) {
   return flatMap(toMove, (statement) => {
     if (isTopLevelDeclarationStatement(statement) && !isExported(sourceFile, statement, useEs6Exports) && forEachTopLevelDeclaration(statement, (d) => {
       var _a;
-      return needExport.has(Debug.checkDefined((_a = tryCast(d, canHaveSymbol)) == null ? void 0 : _a.symbol));
+      return needExport.includes(Debug.checkDefined((_a = tryCast(d, canHaveSymbol)) == null ? void 0 : _a.symbol));
     })) {
       const exports2 = addExport(getSynthesizedDeepClone(statement), useEs6Exports);
       if (exports2)
@@ -144295,86 +143952,17 @@ function isExported(sourceFile, decl, useEs6Exports, name) {
   return !!sourceFile.symbol && !!sourceFile.symbol.exports && getNamesToExportInCommonJS(decl).some((name2) => sourceFile.symbol.exports.has(escapeLeadingUnderscores(name2)));
 }
 function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
-  switch (importDecl.kind) {
-    case 272 /* ImportDeclaration */:
-      deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
-      break;
-    case 271 /* ImportEqualsDeclaration */:
-      if (isUnused(importDecl.name)) {
-        changes.delete(sourceFile, importDecl);
-      }
-      break;
-    case 260 /* VariableDeclaration */:
-      deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
-      break;
-    default:
-      Debug.assertNever(importDecl, `Unexpected import decl kind ${importDecl.kind}`);
-  }
-}
-function deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused) {
-  if (!importDecl.importClause)
-    return;
-  const { name, namedBindings } = importDecl.importClause;
-  const defaultUnused = !name || isUnused(name);
-  const namedBindingsUnused = !namedBindings || (namedBindings.kind === 274 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every((e) => isUnused(e.name)));
-  if (defaultUnused && namedBindingsUnused) {
-    changes.delete(sourceFile, importDecl);
-  } else {
-    if (name && defaultUnused) {
-      changes.delete(sourceFile, name);
+  if (importDecl.kind === 272 /* ImportDeclaration */ && importDecl.importClause) {
+    const { name, namedBindings } = importDecl.importClause;
+    if ((!name || isUnused(name)) && (!namedBindings || namedBindings.kind === 275 /* NamedImports */ && namedBindings.elements.length !== 0 && namedBindings.elements.every((e) => isUnused(e.name)))) {
+      return changes.delete(sourceFile, importDecl);
     }
-    if (namedBindings) {
-      if (namedBindingsUnused) {
-        changes.replaceNode(
-          sourceFile,
-          importDecl.importClause,
-          factory.updateImportClause(
-            importDecl.importClause,
-            importDecl.importClause.isTypeOnly,
-            name,
-            /*namedBindings*/
-            void 0
-          )
-        );
-      } else if (namedBindings.kind === 275 /* NamedImports */) {
-        for (const element of namedBindings.elements) {
-          if (isUnused(element.name))
-            changes.delete(sourceFile, element);
-        }
-      }
-    }
-  }
-}
-function deleteUnusedImportsInVariableDeclaration(sourceFile, varDecl, changes, isUnused) {
-  const { name } = varDecl;
-  switch (name.kind) {
-    case 80 /* Identifier */:
-      if (isUnused(name)) {
-        if (varDecl.initializer && isRequireCall(
-          varDecl.initializer,
-          /*requireStringLiteralLikeArgument*/
-          true
-        )) {
-          changes.delete(sourceFile, isVariableDeclarationList(varDecl.parent) && length(varDecl.parent.declarations) === 1 ? varDecl.parent.parent : varDecl);
-        } else {
-          changes.delete(sourceFile, name);
-        }
-      }
-      break;
-    case 207 /* ArrayBindingPattern */:
-      break;
-    case 206 /* ObjectBindingPattern */:
-      if (name.elements.every((e) => isIdentifier(e.name) && isUnused(e.name))) {
-        changes.delete(sourceFile, isVariableDeclarationList(varDecl.parent) && varDecl.parent.declarations.length === 1 ? varDecl.parent.parent : varDecl);
-      } else {
-        for (const element of name.elements) {
-          if (isIdentifier(element.name) && isUnused(element.name)) {
-            changes.delete(sourceFile, element.name);
-          }
-        }
-      }
-      break;
   }
+  forEachAliasDeclarationInImportOrRequire(importDecl, (i) => {
+    if (i.name && isIdentifier(i.name) && isUnused(i.name)) {
+      changes.delete(sourceFile, i);
+    }
+  });
 }
 function isTopLevelDeclarationStatement(node) {
   Debug.assert(isSourceFile(node.parent), "Node parent should be a SourceFile");
@@ -144598,12 +144186,13 @@ function isPureImport(node) {
   }
 }
 function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PURE__ */ new Set()) {
+  var _a;
   const movedSymbols = /* @__PURE__ */ new Set();
   const oldImportsNeededByTargetFile = /* @__PURE__ */ new Map();
-  const targetFileImportsFromOldFile = /* @__PURE__ */ new Set();
+  const targetFileImportsFromOldFile = /* @__PURE__ */ new Map();
   const jsxNamespaceSymbol = getJsxNamespaceSymbol(containsJsx(toMove));
   if (jsxNamespaceSymbol) {
-    oldImportsNeededByTargetFile.set(jsxNamespaceSymbol, false);
+    oldImportsNeededByTargetFile.set(jsxNamespaceSymbol, [false, tryCast((_a = jsxNamespaceSymbol.declarations) == null ? void 0 : _a[0], (d) => isImportSpecifier(d) || isImportClause(d) || isNamespaceImport(d) || isImportEqualsDeclaration(d) || isBindingElement(d) || isVariableDeclaration(d))]);
   }
   for (const statement of toMove) {
     forEachTopLevelDeclaration(statement, (decl) => {
@@ -144623,9 +144212,12 @@ function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PUR
       for (const decl of symbol.declarations) {
         if (isInImport(decl)) {
           const prevIsTypeOnly = oldImportsNeededByTargetFile.get(symbol);
-          oldImportsNeededByTargetFile.set(symbol, prevIsTypeOnly === void 0 ? isValidTypeOnlyUseSite : prevIsTypeOnly && isValidTypeOnlyUseSite);
+          oldImportsNeededByTargetFile.set(symbol, [
+            prevIsTypeOnly === void 0 ? isValidTypeOnlyUseSite : prevIsTypeOnly && isValidTypeOnlyUseSite,
+            tryCast(decl, (d) => isImportSpecifier(d) || isImportClause(d) || isNamespaceImport(d) || isImportEqualsDeclaration(d) || isBindingElement(d) || isVariableDeclaration(d))
+          ]);
         } else if (isTopLevelDeclaration(decl) && sourceFileOfTopLevelDeclaration(decl) === oldFile && !movedSymbols.has(symbol)) {
-          targetFileImportsFromOldFile.add(symbol);
+          targetFileImportsFromOldFile.set(symbol, isValidTypeOnlyUseSite);
         }
       }
     });
@@ -144633,16 +144225,16 @@ function getUsageInfo(oldFile, toMove, checker, existingTargetLocals = /* @__PUR
   for (const unusedImport of oldImportsNeededByTargetFile.keys()) {
     unusedImportsFromOldFile.add(unusedImport);
   }
-  const oldFileImportsFromTargetFile = /* @__PURE__ */ new Set();
+  const oldFileImportsFromTargetFile = /* @__PURE__ */ new Map();
   for (const statement of oldFile.statements) {
     if (contains(toMove, statement))
       continue;
     if (jsxNamespaceSymbol && !!(statement.transformFlags & 2 /* ContainsJsx */)) {
       unusedImportsFromOldFile.delete(jsxNamespaceSymbol);
     }
-    forEachReference(statement, checker, (symbol) => {
+    forEachReference(statement, checker, (symbol, isValidTypeOnlyUseSite) => {
       if (movedSymbols.has(symbol))
-        oldFileImportsFromTargetFile.add(symbol);
+        oldFileImportsFromTargetFile.set(symbol, isValidTypeOnlyUseSite);
       unusedImportsFromOldFile.delete(symbol);
     });
   }
@@ -144850,6 +144442,218 @@ function getExistingLocals(sourceFile, statements, checker) {
   return existingLocals;
 }
 
+// src/services/refactors/helpers.ts
+function isRefactorErrorInfo(info) {
+  return info.error !== void 0;
+}
+function refactorKindBeginsWith(known, requested) {
+  if (!requested)
+    return true;
+  return known.substr(0, requested.length) === requested;
+}
+function addTargetFileImports(oldFile, importsToCopy, targetFileImportsFromOldFile, checker, program, importAdder) {
+  importsToCopy.forEach(([isValidTypeOnlyUseSite, declaration], symbol) => {
+    var _a;
+    const targetSymbol = skipAlias(symbol, checker);
+    if (checker.isUnknownSymbol(targetSymbol)) {
+      importAdder.addVerbatimImport(Debug.checkDefined(declaration ?? findAncestor((_a = symbol.declarations) == null ? void 0 : _a[0], isAnyImportOrRequireStatement)));
+    } else {
+      importAdder.addImportFromExportedSymbol(targetSymbol, isValidTypeOnlyUseSite, declaration);
+    }
+  });
+  addImportsForMovedSymbols(targetFileImportsFromOldFile, oldFile.fileName, importAdder, program);
+}
+
+// src/services/refactors/inlineVariable.ts
+var refactorName4 = "Inline variable";
+var refactorDescription = getLocaleSpecificMessage(Diagnostics.Inline_variable);
+var inlineVariableAction = {
+  name: refactorName4,
+  description: refactorDescription,
+  kind: "refactor.inline.variable"
+};
+registerRefactor(refactorName4, {
+  kinds: [inlineVariableAction.kind],
+  getAvailableActions(context) {
+    const {
+      file,
+      program,
+      preferences,
+      startPosition,
+      triggerReason
+    } = context;
+    const info = getInliningInfo(file, startPosition, triggerReason === "invoked", program);
+    if (!info) {
+      return emptyArray;
+    }
+    if (!ts_refactor_exports.isRefactorErrorInfo(info)) {
+      return [{
+        name: refactorName4,
+        description: refactorDescription,
+        actions: [inlineVariableAction]
+      }];
+    }
+    if (preferences.provideRefactorNotApplicableReason) {
+      return [{
+        name: refactorName4,
+        description: refactorDescription,
+        actions: [{
+          ...inlineVariableAction,
+          notApplicableReason: info.error
+        }]
+      }];
+    }
+    return emptyArray;
+  },
+  getEditsForAction(context, actionName2) {
+    Debug.assert(actionName2 === refactorName4, "Unexpected refactor invoked");
+    const { file, program, startPosition } = context;
+    const info = getInliningInfo(
+      file,
+      startPosition,
+      /*tryWithReferenceToken*/
+      true,
+      program
+    );
+    if (!info || ts_refactor_exports.isRefactorErrorInfo(info)) {
+      return void 0;
+    }
+    const { references, declaration, replacement } = info;
+    const edits = ts_textChanges_exports.ChangeTracker.with(context, (tracker) => {
+      for (const node of references) {
+        tracker.replaceNode(file, node, getReplacementExpression(node, replacement));
+      }
+      tracker.delete(file, declaration);
+    });
+    return { edits };
+  }
+});
+function getInliningInfo(file, startPosition, tryWithReferenceToken, program) {
+  var _a, _b;
+  const checker = program.getTypeChecker();
+  const token = getTouchingPropertyName(file, startPosition);
+  const parent2 = token.parent;
+  if (!isIdentifier(token)) {
+    return void 0;
+  }
+  if (isInitializedVariable(parent2) && isVariableDeclarationInVariableStatement(parent2) && isIdentifier(parent2.name)) {
+    if (((_a = checker.getMergedSymbol(parent2.symbol).declarations) == null ? void 0 : _a.length) !== 1) {
+      return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
+    }
+    if (isDeclarationExported(parent2)) {
+      return void 0;
+    }
+    const references = getReferenceNodes(parent2, checker, file);
+    return references && { references, declaration: parent2, replacement: parent2.initializer };
+  }
+  if (tryWithReferenceToken) {
+    let definition = checker.resolveName(
+      token.text,
+      token,
+      111551 /* Value */,
+      /*excludeGlobals*/
+      false
+    );
+    definition = definition && checker.getMergedSymbol(definition);
+    if (((_b = definition == null ? void 0 : definition.declarations) == null ? void 0 : _b.length) !== 1) {
+      return { error: getLocaleSpecificMessage(Diagnostics.Variables_with_multiple_declarations_cannot_be_inlined) };
+    }
+    const declaration = definition.declarations[0];
+    if (!isInitializedVariable(declaration) || !isVariableDeclarationInVariableStatement(declaration) || !isIdentifier(declaration.name)) {
+      return void 0;
+    }
+    if (isDeclarationExported(declaration)) {
+      return void 0;
+    }
+    const references = getReferenceNodes(declaration, checker, file);
+    return references && { references, declaration, replacement: declaration.initializer };
+  }
+  return { error: getLocaleSpecificMessage(Diagnostics.Could_not_find_variable_to_inline) };
+}
+function isDeclarationExported(declaration) {
+  const variableStatement = cast(declaration.parent.parent, isVariableStatement);
+  return some(variableStatement.modifiers, isExportModifier);
+}
+function getReferenceNodes(declaration, checker, file) {
+  const references = [];
+  const cannotInline = ts_FindAllReferences_exports.Core.eachSymbolReferenceInFile(declaration.name, checker, file, (ref) => {
+    if (ts_FindAllReferences_exports.isWriteAccessForReference(ref) && !isShorthandPropertyAssignment(ref.parent)) {
+      return true;
+    }
+    if (isExportSpecifier(ref.parent) || isExportAssignment(ref.parent)) {
+      return true;
+    }
+    if (isTypeQueryNode(ref.parent)) {
+      return true;
+    }
+    if (textRangeContainsPositionInclusive(declaration, ref.pos)) {
+      return true;
+    }
+    references.push(ref);
+  });
+  return references.length === 0 || cannotInline ? void 0 : references;
+}
+function getReplacementExpression(reference, replacement) {
+  replacement = getSynthesizedDeepClone(replacement);
+  const { parent: parent2 } = reference;
+  if (isExpression(parent2) && (getExpressionPrecedence(replacement) < getExpressionPrecedence(parent2) || needsParentheses(parent2))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  if (isFunctionLike(replacement) && (isCallLikeExpression(parent2) || isPropertyAccessExpression(parent2))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  if (isPropertyAccessExpression(parent2) && (isNumericLiteral(replacement) || isObjectLiteralExpression(replacement))) {
+    return factory.createParenthesizedExpression(replacement);
+  }
+  if (isIdentifier(reference) && isShorthandPropertyAssignment(parent2)) {
+    return factory.createPropertyAssignment(reference, replacement);
+  }
+  return replacement;
+}
+
+// src/services/refactors/moveToNewFile.ts
+var refactorName5 = "Move to a new file";
+var description2 = getLocaleSpecificMessage(Diagnostics.Move_to_a_new_file);
+var moveToNewFileAction = {
+  name: refactorName5,
+  description: description2,
+  kind: "refactor.move.newFile"
+};
+registerRefactor(refactorName5, {
+  kinds: [moveToNewFileAction.kind],
+  getAvailableActions: function getRefactorActionsToMoveToNewFile(context) {
+    const statements = getStatementsToMove(context);
+    if (context.preferences.allowTextChangesInNewFiles && statements) {
+      const file = context.file;
+      const affectedTextRange = {
+        start: { line: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).line, offset: getLineAndCharacterOfPosition(file, statements.all[0].getStart(file)).character },
+        end: { line: getLineAndCharacterOfPosition(file, last(statements.all).end).line, offset: getLineAndCharacterOfPosition(file, last(statements.all).end).character }
+      };
+      return [{ name: refactorName5, description: description2, actions: [{ ...moveToNewFileAction, range: affectedTextRange }] }];
+    }
+    if (context.preferences.provideRefactorNotApplicableReason) {
+      return [{ name: refactorName5, description: description2, actions: [{ ...moveToNewFileAction, notApplicableReason: getLocaleSpecificMessage(Diagnostics.Selection_is_not_a_valid_statement_or_statements) }] }];
+    }
+    return emptyArray;
+  },
+  getEditsForAction: function getRefactorEditsToMoveToNewFile(context, actionName2) {
+    Debug.assert(actionName2 === refactorName5, "Wrong refactor invoked");
+    const statements = Debug.checkDefined(getStatementsToMove(context));
+    const edits = ts_textChanges_exports.ChangeTracker.with(context, (t) => doChange4(context.file, context.program, statements, t, context.host, context, context.preferences));
+    return { edits, renameFilename: void 0, renameLocation: void 0 };
+  }
+});
+function doChange4(oldFile, program, toMove, changes, host, context, preferences) {
+  const checker = program.getTypeChecker();
+  const usage = getUsageInfo(oldFile, toMove.all, checker);
+  const newFilename = createNewFileName(oldFile, program, host, toMove);
+  const newSourceFile = createFutureSourceFile(newFilename, oldFile.externalModuleIndicator ? 99 /* ESNext */ : oldFile.commonJsModuleIndicator ? 1 /* CommonJS */ : void 0, program, host);
+  const importAdderForOldFile = ts_codefix_exports.createImportAdder(oldFile, context.program, context.preferences, context.host);
+  const importAdderForNewFile = ts_codefix_exports.createImportAdder(newSourceFile, context.program, context.preferences, context.host);
+  getNewStatementsAndRemoveFromOldFile(oldFile, newSourceFile, usage, changes, toMove, program, host, preferences, importAdderForNewFile, importAdderForOldFile);
+  addNewFileToTsconfig(program, changes, oldFile.fileName, newFilename, hostGetCanonicalFileName(host));
+}
+
 // src/services/_namespaces/ts.refactor.addOrRemoveBracesToArrowFunction.ts
 var ts_refactor_addOrRemoveBracesToArrowFunction_exports = {};
 
@@ -154841,6 +154645,14 @@ function createImportAdderWorker(sourceFile, program, useAutoImportProvider, pre
             entry.namedImports.set(symbolName2, reduceAddAsTypeOnlyValues(prevValue, addAsTypeOnly));
             break;
           case 3 /* CommonJS */:
+            if (compilerOptions.verbatimModuleSyntax) {
+              const prevValue2 = (entry.namedImports || (entry.namedImports = /* @__PURE__ */ new Map())).get(symbolName2);
+              entry.namedImports.set(symbolName2, reduceAddAsTypeOnlyValues(prevValue2, addAsTypeOnly));
+            } else {
+              Debug.assert(entry.namespaceLikeImport === void 0 || entry.namespaceLikeImport.name === symbolName2, "Namespacelike import shoudl be missing or match symbolName");
+              entry.namespaceLikeImport = { importKind, name: symbolName2, addAsTypeOnly };
+            }
+            break;
           case 2 /* Namespace */:
             Debug.assert(entry.namespaceLikeImport === void 0 || entry.namespaceLikeImport.name === symbolName2, "Namespacelike import shoudl be missing or match symbolName");
             entry.namespaceLikeImport = { importKind, name: symbolName2, addAsTypeOnly };
@@ -179780,7 +179592,6 @@ __export(ts_exports2, {
   loadWithModeAwareCache: () => loadWithModeAwareCache,
   makeIdentifierFromModuleName: () => makeIdentifierFromModuleName,
   makeImport: () => makeImport,
-  makeImportIfNecessary: () => makeImportIfNecessary,
   makeStringLiteral: () => makeStringLiteral,
   mangleScopedPackageName: () => mangleScopedPackageName,
   map: () => map,
@@ -194207,7 +194018,6 @@ if (typeof console !== "undefined") {
   loadWithModeAwareCache,
   makeIdentifierFromModuleName,
   makeImport,
-  makeImportIfNecessary,
   makeStringLiteral,
   mangleScopedPackageName,
   map,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@typescript-deploys/pr-build",
   "author": "Microsoft Corp.",
   "homepage": "https://www.typescriptlang.org/",
-  "version": "5.5.0-pr-55267-144",
+  "version": "5.5.0-pr-58321-7",
   "license": "Apache-2.0",
   "description": "TypeScript is a language for application scale JavaScript development",
   "keywords": [