@typescript-deploys/pr-build 5.2.0-pr-54838-4 → 5.2.0-pr-54922-6

package/lib/tsserverlibrary.js

@@ -35,7 +35,7 @@ var ts = (() => {
     "src/compiler/corePublic.ts"() {
       "use strict";
       versionMajorMinor = "5.2";
-      version = `${versionMajorMinor}.0-insiders.20230703`;
+      version = `${versionMajorMinor}.0-insiders.20230707`;
       Comparison = /* @__PURE__ */ ((Comparison3) => {
         Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
         Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -1464,8 +1464,8 @@ var ts = (() => {
     }
     return false;
   }
-  function createGetCanonicalFileName(useCaseSensitiveFileNames) {
-    return useCaseSensitiveFileNames ? identity : toFileNameLowerCase;
+  function createGetCanonicalFileName(useCaseSensitiveFileNames2) {
+    return useCaseSensitiveFileNames2 ? identity : toFileNameLowerCase;
   }
   function patternText({ prefix, suffix }) {
     return `${prefix}*${suffix}`;
@@ -1599,13 +1599,6 @@ var ts = (() => {
       return array.slice(0, index);
     }
   }
-  function startWhitespaceCount(s) {
-    for (let i = 0; i < s.length; i++) {
-      if (!isWhiteSpaceLike(s.charCodeAt(i)))
-        return i;
-    }
-    return s.length;
-  }
   function skipWhile(array, predicate) {
     if (array) {
       const len = array.length;
@@ -5432,10 +5425,10 @@ ${lanes.join("\n")}
       pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === 250 /* Low */ ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingInterval === 250 /* Low */ ? "pollLowPollingIntervalQueue" : "pollPollingIntervalQueue", pollingIntervalQueue(pollingInterval));
     }
   }
-  function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
+  function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2) {
     const fileWatcherCallbacks = createMultiMap();
     const dirWatchers = /* @__PURE__ */ new Map();
-    const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const toCanonicalName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     return nonPollingWatchFile;
     function nonPollingWatchFile(fileName, callback, _pollingInterval, fallbackOptions) {
       const filePath = toCanonicalName(fileName);
@@ -5511,8 +5504,8 @@ ${lanes.join("\n")}
       pollScheduled = host.setTimeout(pollQueue, 2e3 /* High */, "pollQueue");
     }
   }
-  function createSingleWatcherPerName(cache, useCaseSensitiveFileNames, name, callback, createWatcher) {
-    const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+  function createSingleWatcherPerName(cache, useCaseSensitiveFileNames2, name, callback, createWatcher) {
+    const toCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     const path = toCanonicalFileName(name);
     const existing = cache.get(path);
     if (existing) {
@@ -5562,7 +5555,7 @@ ${lanes.join("\n")}
   }
   function createDirectoryWatcherSupportingRecursive({
     watchDirectory,
-    useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     getCurrentDirectory,
     getAccessibleSortedChildDirectories,
     fileSystemEntryExists,
@@ -5574,8 +5567,8 @@ ${lanes.join("\n")}
     const callbackCache = createMultiMap();
     const cacheToUpdateChildWatches = /* @__PURE__ */ new Map();
     let timerToUpdateChildWatches;
-    const filePathComparer = getStringComparer(!useCaseSensitiveFileNames);
-    const toCanonicalFilePath = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const filePathComparer = getStringComparer(!useCaseSensitiveFileNames2);
+    const toCanonicalFilePath = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     return (dirName, callback, recursive, options) => recursive ? createDirectoryWatcher(dirName, options, callback) : watchDirectory(dirName, callback, recursive, options);
     function createDirectoryWatcher(dirName, options, callback) {
       const dirPath = toCanonicalFilePath(dirName);
@@ -5742,12 +5735,12 @@ ${lanes.join("\n")}
       }
     }
     function isIgnoredPath(path, options) {
-      return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames, getCurrentDirectory);
+      return some(ignoredPaths, (searchPath) => isInPath(path, searchPath)) || isIgnoredByWatchOptions(path, options, useCaseSensitiveFileNames2, getCurrentDirectory);
     }
     function isInPath(path, searchPath) {
       if (stringContains(path, searchPath))
         return true;
-      if (useCaseSensitiveFileNames)
+      if (useCaseSensitiveFileNames2)
         return false;
       return stringContains(toCanonicalFilePath(path), searchPath);
     }
@@ -5765,14 +5758,14 @@ ${lanes.join("\n")}
       }
     };
   }
-  function isIgnoredByWatchOptions(pathToCheck, options, useCaseSensitiveFileNames, getCurrentDirectory) {
-    return ((options == null ? void 0 : options.excludeDirectories) || (options == null ? void 0 : options.excludeFiles)) && (matchesExclude(pathToCheck, options == null ? void 0 : options.excludeFiles, useCaseSensitiveFileNames, getCurrentDirectory()) || matchesExclude(pathToCheck, options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames, getCurrentDirectory()));
+  function isIgnoredByWatchOptions(pathToCheck, options, useCaseSensitiveFileNames2, getCurrentDirectory) {
+    return ((options == null ? void 0 : options.excludeDirectories) || (options == null ? void 0 : options.excludeFiles)) && (matchesExclude(pathToCheck, options == null ? void 0 : options.excludeFiles, useCaseSensitiveFileNames2, getCurrentDirectory()) || matchesExclude(pathToCheck, options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames2, getCurrentDirectory()));
   }
-  function createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory) {
+  function createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory) {
     return (eventName, relativeFileName) => {
       if (eventName === "rename") {
         const fileName = !relativeFileName ? directoryName : normalizePath(combinePaths(directoryName, relativeFileName));
-        if (!relativeFileName || !isIgnoredByWatchOptions(fileName, options, useCaseSensitiveFileNames, getCurrentDirectory)) {
+        if (!relativeFileName || !isIgnoredByWatchOptions(fileName, options, useCaseSensitiveFileNames2, getCurrentDirectory)) {
           callback(fileName);
         }
       }
@@ -5785,7 +5778,7 @@ ${lanes.join("\n")}
     clearTimeout: clearTimeout2,
     fsWatchWorker,
     fileSystemEntryExists,
-    useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     getCurrentDirectory,
     fsSupportsRecursiveFsWatch,
     getAccessibleSortedChildDirectories,
@@ -5857,7 +5850,7 @@ ${lanes.join("\n")}
           );
         case 5 /* UseFsEventsOnParentDirectory */:
           if (!nonPollingWatchFile) {
-            nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames);
+            nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
           }
           return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
         default:
@@ -5906,7 +5899,7 @@ ${lanes.join("\n")}
         return fsWatch(
           directoryName,
           1 /* Directory */,
-          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
           recursive,
           500 /* Medium */,
           getFallbackOptions(options)
@@ -5914,7 +5907,7 @@ ${lanes.join("\n")}
       }
       if (!hostRecursiveDirectoryWatcher) {
         hostRecursiveDirectoryWatcher = createDirectoryWatcherSupportingRecursive({
-          useCaseSensitiveFileNames,
+          useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
           getCurrentDirectory,
           fileSystemEntryExists,
           getAccessibleSortedChildDirectories,
@@ -5960,7 +5953,7 @@ ${lanes.join("\n")}
           return fsWatch(
             directoryName,
             1 /* Directory */,
-            createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+            createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
             recursive,
             500 /* Medium */,
             getFallbackOptions(watchDirectoryOptions)
@@ -5988,7 +5981,7 @@ ${lanes.join("\n")}
     function pollingWatchFile(fileName, callback, pollingInterval, options) {
       return createSingleWatcherPerName(
         pollingWatches,
-        useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames2,
         fileName,
         callback,
         (cb) => pollingWatchFileWorker(fileName, cb, pollingInterval, options)
@@ -5997,7 +5990,7 @@ ${lanes.join("\n")}
     function fsWatch(fileOrDirectory, entryKind, callback, recursive, fallbackPollingInterval, fallbackOptions) {
       return createSingleWatcherPerName(
         recursive ? fsWatchesRecursive : fsWatches,
-        useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames2,
         fileOrDirectory,
         callback,
         (cb) => fsWatchHandlingExistenceOnHost(fileOrDirectory, entryKind, cb, recursive, fallbackPollingInterval, fallbackOptions)
@@ -6156,7 +6149,7 @@ ${lanes.join("\n")}
           const Buffer2 =   require("buffer").Buffer;
           const isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
           const platform = _os.platform();
-          const useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+          const useCaseSensitiveFileNames2 = isFileSystemCaseSensitive();
           const fsRealpath = !!_fs.realpathSync.native ? process.platform === "win32" ? fsRealPathHandlingLongPath : _fs.realpathSync.native : _fs.realpathSync;
           const executingFilePath = __filename.endsWith("sys.js") ? _path.join(_path.dirname(__dirname), "__fake__.js") : __filename;
           const fsSupportsRecursiveFsWatch = process.platform === "win32" || process.platform === "darwin";
@@ -6167,7 +6160,7 @@ ${lanes.join("\n")}
             setTimeout,
             clearTimeout,
             fsWatchWorker,
-            useCaseSensitiveFileNames,
+            useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
             getCurrentDirectory,
             fileSystemEntryExists,
             // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
@@ -6184,7 +6177,7 @@ ${lanes.join("\n")}
           const nodeSystem = {
             args: process.argv.slice(2),
             newLine: _os.EOL,
-            useCaseSensitiveFileNames,
+            useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
             write(s) {
               process.stdout.write(s);
             },
@@ -6313,12 +6306,12 @@ ${lanes.join("\n")}
             for (const node of profile.nodes) {
               if (node.callFrame.url) {
                 const url = normalizeSlashes(node.callFrame.url);
-                if (containsPath(fileUrlRoot, url, useCaseSensitiveFileNames)) {
+                if (containsPath(fileUrlRoot, url, useCaseSensitiveFileNames2)) {
                   node.callFrame.url = getRelativePathToDirectoryOrUrl(
                     fileUrlRoot,
                     url,
                     fileUrlRoot,
-                    createGetCanonicalFileName(useCaseSensitiveFileNames),
+                    createGetCanonicalFileName(useCaseSensitiveFileNames2),
                     /*isAbsolutePathAnUrl*/
                     true
                   );
@@ -6498,7 +6491,7 @@ ${lanes.join("\n")}
             }
           }
           function readDirectory(path, extensions, excludes, includes, depth) {
-            return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
+            return matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames2, process.cwd(), depth, getAccessibleFileSystemEntries, realpath);
           }
           function fileSystemEntryExists(path, entryKind) {
             const originalStackTraceLimit = Error.stackTraceLimit;
@@ -7028,7 +7021,7 @@ ${lanes.join("\n")}
         Identifier_expected: diag(1003, 1 /* Error */, "Identifier_expected_1003", "Identifier expected."),
         _0_expected: diag(1005, 1 /* Error */, "_0_expected_1005", "'{0}' expected."),
         A_file_cannot_have_a_reference_to_itself: diag(1006, 1 /* Error */, "A_file_cannot_have_a_reference_to_itself_1006", "A file cannot have a reference to itself."),
-        The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon: diag(1007, 1 /* Error */, "The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon_1007", "The parser expected to find a '{1}' to match the '{0}' token here:"),
+        The_parser_expected_to_find_a_1_to_match_the_0_token_here: diag(1007, 1 /* Error */, "The_parser_expected_to_find_a_1_to_match_the_0_token_here_1007", "The parser expected to find a '{1}' to match the '{0}' token here."),
         Trailing_comma_not_allowed: diag(1009, 1 /* Error */, "Trailing_comma_not_allowed_1009", "Trailing comma not allowed."),
         Asterisk_Slash_expected: diag(1010, 1 /* Error */, "Asterisk_Slash_expected_1010", "'*/' expected."),
         An_element_access_expression_should_take_an_argument: diag(1011, 1 /* Error */, "An_element_access_expression_should_take_an_argument_1011", "An element access expression should take an argument."),
@@ -7290,7 +7283,7 @@ ${lanes.join("\n")}
         unique_symbol_types_are_not_allowed_here: diag(1335, 1 /* Error */, "unique_symbol_types_are_not_allowed_here_1335", "'unique symbol' types are not allowed here."),
         An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_object_type_instead: diag(1337, 1 /* Error */, "An_index_signature_parameter_type_cannot_be_a_literal_type_or_generic_type_Consider_using_a_mapped_o_1337", "An index signature parameter type cannot be a literal type or generic type. Consider using a mapped object type instead."),
         infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type: diag(1338, 1 /* Error */, "infer_declarations_are_only_permitted_in_the_extends_clause_of_a_conditional_type_1338", "'infer' declarations are only permitted in the 'extends' clause of a conditional type."),
-        Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon: diag(1339, 1 /* Error */, "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon_1339", "Module '{0}' does not refer to a value, but is used as a value here:"),
+        Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here: diag(1339, 1 /* Error */, "Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_1339", "Module '{0}' does not refer to a value, but is used as a value here."),
         Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0: diag(1340, 1 /* Error */, "Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0_1340", "Module '{0}' does not refer to a type, but is used as a type here. Did you mean 'typeof import('{0}')'?"),
         Class_constructor_may_not_be_an_accessor: diag(1341, 1 /* Error */, "Class_constructor_may_not_be_an_accessor_1341", "Class constructor may not be an accessor."),
         The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_es2022_esnext_system_node16_or_nodenext: diag(1343, 1 /* Error */, "The_import_meta_meta_property_is_only_allowed_when_the_module_option_is_es2020_es2022_esnext_system__1343", "The 'import.meta' meta-property is only allowed when the '--module' option is 'es2020', 'es2022', 'esnext', 'system', 'node16', or 'nodenext'."),
@@ -7298,7 +7291,7 @@ ${lanes.join("\n")}
         An_expression_of_type_void_cannot_be_tested_for_truthiness: diag(1345, 1 /* Error */, "An_expression_of_type_void_cannot_be_tested_for_truthiness_1345", "An expression of type 'void' cannot be tested for truthiness."),
         This_parameter_is_not_allowed_with_use_strict_directive: diag(1346, 1 /* Error */, "This_parameter_is_not_allowed_with_use_strict_directive_1346", "This parameter is not allowed with 'use strict' directive."),
         use_strict_directive_cannot_be_used_with_non_simple_parameter_list: diag(1347, 1 /* Error */, "use_strict_directive_cannot_be_used_with_non_simple_parameter_list_1347", "'use strict' directive cannot be used with non-simple parameter list."),
-        Non_simple_parameter_declared_here_Colon: diag(1348, 1 /* Error */, "Non_simple_parameter_declared_here_Colon_1348", "Non-simple parameter declared here:"),
+        Non_simple_parameter_declared_here: diag(1348, 1 /* Error */, "Non_simple_parameter_declared_here_1348", "Non-simple parameter declared here."),
         use_strict_directive_used_here: diag(1349, 1 /* Error */, "use_strict_directive_used_here_1349", "'use strict' directive used here."),
         Print_the_final_configuration_instead_of_building: diag(1350, 3 /* Message */, "Print_the_final_configuration_instead_of_building_1350", "Print the final configuration instead of building."),
         An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal: diag(1351, 1 /* Error */, "An_identifier_or_keyword_cannot_immediately_follow_a_numeric_literal_1351", "An identifier or keyword cannot immediately follow a numeric literal."),
@@ -7322,8 +7315,8 @@ ${lanes.join("\n")}
         Did_you_mean_0: diag(1369, 3 /* Message */, "Did_you_mean_0_1369", "Did you mean '{0}'?"),
         This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set_to_error: diag(1371, 1 /* Error */, "This_import_is_never_used_as_a_value_and_must_use_import_type_because_importsNotUsedAsValues_is_set__1371", "This import is never used as a value and must use 'import type' because 'importsNotUsedAsValues' is set to 'error'."),
         await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(1375, 1 /* Error */, "await_expressions_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_fi_1375", "'await' expressions are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
-        _0_was_imported_here_Colon: diag(1376, 3 /* Message */, "_0_was_imported_here_Colon_1376", "'{0}' was imported here:"),
-        _0_was_exported_here_Colon: diag(1377, 3 /* Message */, "_0_was_exported_here_Colon_1377", "'{0}' was exported here:"),
+        _0_was_imported_here: diag(1376, 3 /* Message */, "_0_was_imported_here_1376", "'{0}' was imported here."),
+        _0_was_exported_here: diag(1377, 3 /* Message */, "_0_was_exported_here_1377", "'{0}' was exported here."),
         Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_node16_or_nodenext_and_the_target_option_is_set_to_es2017_or_higher: diag(1378, 1 /* Error */, "Top_level_await_expressions_are_only_allowed_when_the_module_option_is_set_to_es2022_esnext_system_n_1378", "Top-level 'await' expressions are only allowed when the 'module' option is set to 'es2022', 'esnext', 'system', 'node16', or 'nodenext', and the 'target' option is set to 'es2017' or higher."),
         An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type: diag(1379, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type_1379", "An import alias cannot reference a declaration that was exported using 'export type'."),
         An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type: diag(1380, 1 /* Error */, "An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type_1380", "An import alias cannot reference a declaration that was imported using 'import type'."),
@@ -7342,34 +7335,34 @@ ${lanes.join("\n")}
         Imported_via_0_from_file_1_with_packageId_2_to_import_importHelpers_as_specified_in_compilerOptions: diag(1396, 3 /* Message */, "Imported_via_0_from_file_1_with_packageId_2_to_import_importHelpers_as_specified_in_compilerOptions_1396", "Imported via {0} from file '{1}' with packageId '{2}' to import 'importHelpers' as specified in compilerOptions"),
         Imported_via_0_from_file_1_to_import_jsx_and_jsxs_factory_functions: diag(1397, 3 /* Message */, "Imported_via_0_from_file_1_to_import_jsx_and_jsxs_factory_functions_1397", "Imported via {0} from file '{1}' to import 'jsx' and 'jsxs' factory functions"),
         Imported_via_0_from_file_1_with_packageId_2_to_import_jsx_and_jsxs_factory_functions: diag(1398, 3 /* Message */, "Imported_via_0_from_file_1_with_packageId_2_to_import_jsx_and_jsxs_factory_functions_1398", "Imported via {0} from file '{1}' with packageId '{2}' to import 'jsx' and 'jsxs' factory functions"),
-        File_is_included_via_import_here_Colon: diag(1399, 3 /* Message */, "File_is_included_via_import_here_Colon_1399", "File is included via import here:"),
+        File_is_included_via_import_here: diag(1399, 3 /* Message */, "File_is_included_via_import_here_1399", "File is included via import here."),
         Referenced_via_0_from_file_1: diag(1400, 3 /* Message */, "Referenced_via_0_from_file_1_1400", "Referenced via '{0}' from file '{1}'"),
-        File_is_included_via_reference_here_Colon: diag(1401, 3 /* Message */, "File_is_included_via_reference_here_Colon_1401", "File is included via reference here:"),
+        File_is_included_via_reference_here: diag(1401, 3 /* Message */, "File_is_included_via_reference_here_1401", "File is included via reference here."),
         Type_library_referenced_via_0_from_file_1: diag(1402, 3 /* Message */, "Type_library_referenced_via_0_from_file_1_1402", "Type library referenced via '{0}' from file '{1}'"),
         Type_library_referenced_via_0_from_file_1_with_packageId_2: diag(1403, 3 /* Message */, "Type_library_referenced_via_0_from_file_1_with_packageId_2_1403", "Type library referenced via '{0}' from file '{1}' with packageId '{2}'"),
-        File_is_included_via_type_library_reference_here_Colon: diag(1404, 3 /* Message */, "File_is_included_via_type_library_reference_here_Colon_1404", "File is included via type library reference here:"),
+        File_is_included_via_type_library_reference_here: diag(1404, 3 /* Message */, "File_is_included_via_type_library_reference_here_1404", "File is included via type library reference here."),
         Library_referenced_via_0_from_file_1: diag(1405, 3 /* Message */, "Library_referenced_via_0_from_file_1_1405", "Library referenced via '{0}' from file '{1}'"),
-        File_is_included_via_library_reference_here_Colon: diag(1406, 3 /* Message */, "File_is_included_via_library_reference_here_Colon_1406", "File is included via library reference here:"),
+        File_is_included_via_library_reference_here: diag(1406, 3 /* Message */, "File_is_included_via_library_reference_here_1406", "File is included via library reference here."),
         Matched_by_include_pattern_0_in_1: diag(1407, 3 /* Message */, "Matched_by_include_pattern_0_in_1_1407", "Matched by include pattern '{0}' in '{1}'"),
-        File_is_matched_by_include_pattern_specified_here_Colon: diag(1408, 3 /* Message */, "File_is_matched_by_include_pattern_specified_here_Colon_1408", "File is matched by include pattern specified here:"),
+        File_is_matched_by_include_pattern_specified_here: diag(1408, 3 /* Message */, "File_is_matched_by_include_pattern_specified_here_1408", "File is matched by include pattern specified here."),
         Part_of_files_list_in_tsconfig_json: diag(1409, 3 /* Message */, "Part_of_files_list_in_tsconfig_json_1409", "Part of 'files' list in tsconfig.json"),
-        File_is_matched_by_files_list_specified_here_Colon: diag(1410, 3 /* Message */, "File_is_matched_by_files_list_specified_here_Colon_1410", "File is matched by 'files' list specified here:"),
+        File_is_matched_by_files_list_specified_here: diag(1410, 3 /* Message */, "File_is_matched_by_files_list_specified_here_1410", "File is matched by 'files' list specified here."),
         Output_from_referenced_project_0_included_because_1_specified: diag(1411, 3 /* Message */, "Output_from_referenced_project_0_included_because_1_specified_1411", "Output from referenced project '{0}' included because '{1}' specified"),
         Output_from_referenced_project_0_included_because_module_is_specified_as_none: diag(1412, 3 /* Message */, "Output_from_referenced_project_0_included_because_module_is_specified_as_none_1412", "Output from referenced project '{0}' included because '--module' is specified as 'none'"),
-        File_is_output_from_referenced_project_specified_here_Colon: diag(1413, 3 /* Message */, "File_is_output_from_referenced_project_specified_here_Colon_1413", "File is output from referenced project specified here:"),
+        File_is_output_from_referenced_project_specified_here: diag(1413, 3 /* Message */, "File_is_output_from_referenced_project_specified_here_1413", "File is output from referenced project specified here."),
         Source_from_referenced_project_0_included_because_1_specified: diag(1414, 3 /* Message */, "Source_from_referenced_project_0_included_because_1_specified_1414", "Source from referenced project '{0}' included because '{1}' specified"),
         Source_from_referenced_project_0_included_because_module_is_specified_as_none: diag(1415, 3 /* Message */, "Source_from_referenced_project_0_included_because_module_is_specified_as_none_1415", "Source from referenced project '{0}' included because '--module' is specified as 'none'"),
-        File_is_source_from_referenced_project_specified_here_Colon: diag(1416, 3 /* Message */, "File_is_source_from_referenced_project_specified_here_Colon_1416", "File is source from referenced project specified here:"),
+        File_is_source_from_referenced_project_specified_here: diag(1416, 3 /* Message */, "File_is_source_from_referenced_project_specified_here_1416", "File is source from referenced project specified here."),
         Entry_point_of_type_library_0_specified_in_compilerOptions: diag(1417, 3 /* Message */, "Entry_point_of_type_library_0_specified_in_compilerOptions_1417", "Entry point of type library '{0}' specified in compilerOptions"),
         Entry_point_of_type_library_0_specified_in_compilerOptions_with_packageId_1: diag(1418, 3 /* Message */, "Entry_point_of_type_library_0_specified_in_compilerOptions_with_packageId_1_1418", "Entry point of type library '{0}' specified in compilerOptions with packageId '{1}'"),
-        File_is_entry_point_of_type_library_specified_here_Colon: diag(1419, 3 /* Message */, "File_is_entry_point_of_type_library_specified_here_Colon_1419", "File is entry point of type library specified here:"),
+        File_is_entry_point_of_type_library_specified_here: diag(1419, 3 /* Message */, "File_is_entry_point_of_type_library_specified_here_1419", "File is entry point of type library specified here."),
         Entry_point_for_implicit_type_library_0: diag(1420, 3 /* Message */, "Entry_point_for_implicit_type_library_0_1420", "Entry point for implicit type library '{0}'"),
         Entry_point_for_implicit_type_library_0_with_packageId_1: diag(1421, 3 /* Message */, "Entry_point_for_implicit_type_library_0_with_packageId_1_1421", "Entry point for implicit type library '{0}' with packageId '{1}'"),
         Library_0_specified_in_compilerOptions: diag(1422, 3 /* Message */, "Library_0_specified_in_compilerOptions_1422", "Library '{0}' specified in compilerOptions"),
-        File_is_library_specified_here_Colon: diag(1423, 3 /* Message */, "File_is_library_specified_here_Colon_1423", "File is library specified here:"),
+        File_is_library_specified_here: diag(1423, 3 /* Message */, "File_is_library_specified_here_1423", "File is library specified here."),
         Default_library: diag(1424, 3 /* Message */, "Default_library_1424", "Default library"),
         Default_library_for_target_0: diag(1425, 3 /* Message */, "Default_library_for_target_0_1425", "Default library for target '{0}'"),
-        File_is_default_library_for_target_specified_here_Colon: diag(1426, 3 /* Message */, "File_is_default_library_for_target_specified_here_Colon_1426", "File is default library for target specified here:"),
+        File_is_default_library_for_target_specified_here: diag(1426, 3 /* Message */, "File_is_default_library_for_target_specified_here_1426", "File is default library for target specified here."),
         Root_file_specified_for_compilation: diag(1427, 3 /* Message */, "Root_file_specified_for_compilation_1427", "Root file specified for compilation"),
         File_is_output_of_project_reference_source_0: diag(1428, 3 /* Message */, "File_is_output_of_project_reference_source_0_1428", "File is output of project reference source '{0}'"),
         File_redirects_to_file_0: diag(1429, 3 /* Message */, "File_redirects_to_file_0_1429", "File redirects to file '{0}'"),
@@ -7822,7 +7815,7 @@ ${lanes.join("\n")}
         Cannot_extend_an_interface_0_Did_you_mean_implements: diag(2689, 1 /* Error */, "Cannot_extend_an_interface_0_Did_you_mean_implements_2689", "Cannot extend an interface '{0}'. Did you mean 'implements'?"),
         _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0: diag(2690, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0_2690", "'{0}' only refers to a type, but is being used as a value here. Did you mean to use '{1} in {0}'?"),
         _0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible: diag(2692, 1 /* Error */, "_0_is_a_primitive_but_1_is_a_wrapper_object_Prefer_using_0_when_possible_2692", "'{0}' is a primitive, but '{1}' is a wrapper object. Prefer using '{0}' when possible."),
-        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon: diag(2693, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon_2693", "'{0}' only refers to a type, but is being used as a value here:"),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_value_here: diag(2693, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_value_here_2693", "'{0}' only refers to a type, but is being used as a value here."),
         Namespace_0_has_no_exported_member_1: diag(2694, 1 /* Error */, "Namespace_0_has_no_exported_member_1_2694", "Namespace '{0}' has no exported member '{1}'."),
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: diag(
           2695,
@@ -7838,7 +7831,7 @@ ${lanes.join("\n")}
         Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1: diag(2699, 1 /* Error */, "Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1_2699", "Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'."),
         Rest_types_may_only_be_created_from_object_types: diag(2700, 1 /* Error */, "Rest_types_may_only_be_created_from_object_types_2700", "Rest types may only be created from object types."),
         The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access: diag(2701, 1 /* Error */, "The_target_of_an_object_rest_assignment_must_be_a_variable_or_a_property_access_2701", "The target of an object rest assignment must be a variable or a property access."),
-        _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon: diag(2702, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon_2702", "'{0}' only refers to a type, but is being used as a namespace here:"),
+        _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here: diag(2702, 1 /* Error */, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_2702", "'{0}' only refers to a type, but is being used as a namespace here."),
         The_operand_of_a_delete_operator_must_be_a_property_reference: diag(2703, 1 /* Error */, "The_operand_of_a_delete_operator_must_be_a_property_reference_2703", "The operand of a 'delete' operator must be a property reference."),
         The_operand_of_a_delete_operator_cannot_be_a_read_only_property: diag(2704, 1 /* Error */, "The_operand_of_a_delete_operator_cannot_be_a_read_only_property_2704", "The operand of a 'delete' operator cannot be a read-only property."),
         An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2705, 1 /* Error */, "An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705", "An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option."),
@@ -7864,12 +7857,12 @@ ${lanes.join("\n")}
         Class_name_cannot_be_Object_when_targeting_ES5_with_module_0: diag(2725, 1 /* Error */, "Class_name_cannot_be_Object_when_targeting_ES5_with_module_0_2725", "Class name cannot be 'Object' when targeting ES5 with module {0}."),
         Cannot_find_lib_definition_for_0: diag(2726, 1 /* Error */, "Cannot_find_lib_definition_for_0_2726", "Cannot find lib definition for '{0}'."),
         Cannot_find_lib_definition_for_0_Did_you_mean_1: diag(2727, 1 /* Error */, "Cannot_find_lib_definition_for_0_Did_you_mean_1_2727", "Cannot find lib definition for '{0}'. Did you mean '{1}'?"),
-        _0_is_declared_here_Colon: diag(2728, 3 /* Message */, "_0_is_declared_here_Colon_2728", "'{0}' is declared here:"),
+        _0_is_declared_here: diag(2728, 3 /* Message */, "_0_is_declared_here_2728", "'{0}' is declared here."),
         Property_0_is_used_before_its_initialization: diag(2729, 1 /* Error */, "Property_0_is_used_before_its_initialization_2729", "Property '{0}' is used before its initialization."),
         An_arrow_function_cannot_have_a_this_parameter: diag(2730, 1 /* Error */, "An_arrow_function_cannot_have_a_this_parameter_2730", "An arrow function cannot have a 'this' parameter."),
         Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_in_String: diag(2731, 1 /* Error */, "Implicit_conversion_of_a_symbol_to_a_string_will_fail_at_runtime_Consider_wrapping_this_expression_i_2731", "Implicit conversion of a 'symbol' to a 'string' will fail at runtime. Consider wrapping this expression in 'String(...)'."),
         Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension: diag(2732, 1 /* Error */, "Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension_2732", "Cannot find module '{0}'. Consider using '--resolveJsonModule' to import module with '.json' extension."),
-        Property_0_was_also_declared_here_Colon: diag(2733, 1 /* Error */, "Property_0_was_also_declared_here_Colon_2733", "Property '{0}' was also declared here:"),
+        Property_0_was_also_declared_here: diag(2733, 1 /* Error */, "Property_0_was_also_declared_here_2733", "Property '{0}' was also declared here."),
         Are_you_missing_a_semicolon: diag(2734, 1 /* Error */, "Are_you_missing_a_semicolon_2734", "Are you missing a semicolon?"),
         Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1: diag(2735, 1 /* Error */, "Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1_2735", "Did you mean for '{0}' to be constrained to type 'new (...args: any[]) => {1}'?"),
         Operator_0_cannot_be_applied_to_type_1: diag(2736, 1 /* Error */, "Operator_0_cannot_be_applied_to_type_1_2736", "Operator '{0}' cannot be applied to type '{1}'."),
@@ -7886,10 +7879,10 @@ ${lanes.join("\n")}
         _0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_type_of_1_is_2: diag(2747, 1 /* Error */, "_0_components_don_t_accept_text_as_child_elements_Text_in_JSX_has_the_type_string_but_the_expected_t_2747", "'{0}' components don't accept text as child elements. Text in JSX has the type 'string', but the expected type of '{1}' is '{2}'."),
         Cannot_access_ambient_const_enums_when_0_is_enabled: diag(2748, 1 /* Error */, "Cannot_access_ambient_const_enums_when_0_is_enabled_2748", "Cannot access ambient const enums when '{0}' is enabled."),
         _0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0: diag(2749, 1 /* Error */, "_0_refers_to_a_value_but_is_being_used_as_a_type_here_Did_you_mean_typeof_0_2749", "'{0}' refers to a value, but is being used as a type here. Did you mean 'typeof {0}'?"),
-        The_implementation_signature_is_declared_here_Colon: diag(2750, 1 /* Error */, "The_implementation_signature_is_declared_here_Colon_2750", "The implementation signature is declared here:"),
+        The_implementation_signature_is_declared_here: diag(2750, 1 /* Error */, "The_implementation_signature_is_declared_here_2750", "The implementation signature is declared here."),
         Circularity_originates_in_type_at_this_location: diag(2751, 1 /* Error */, "Circularity_originates_in_type_at_this_location_2751", "Circularity originates in type at this location."),
-        The_first_export_default_is_here_Colon: diag(2752, 1 /* Error */, "The_first_export_default_is_here_Colon_2752", "The first export default is here:"),
-        Another_export_default_is_here_Colon: diag(2753, 1 /* Error */, "Another_export_default_is_here_Colon_2753", "Another export default is here:"),
+        The_first_export_default_is_here: diag(2752, 1 /* Error */, "The_first_export_default_is_here_2752", "The first export default is here."),
+        Another_export_default_is_here: diag(2753, 1 /* Error */, "Another_export_default_is_here_2753", "Another export default is here."),
         super_may_not_use_type_arguments: diag(2754, 1 /* Error */, "super_may_not_use_type_arguments_2754", "'super' may not use type arguments."),
         No_constituent_of_type_0_is_callable: diag(2755, 1 /* Error */, "No_constituent_of_type_0_is_callable_2755", "No constituent of type '{0}' is callable."),
         Not_all_constituents_of_type_0_are_callable: diag(2756, 1 /* Error */, "Not_all_constituents_of_type_0_are_callable_2756", "Not all constituents of type '{0}' are callable."),
@@ -7907,7 +7900,7 @@ ${lanes.join("\n")}
         The_0_property_of_an_async_iterator_must_be_a_method: diag(2768, 1 /* Error */, "The_0_property_of_an_async_iterator_must_be_a_method_2768", "The '{0}' property of an async iterator must be a method."),
         No_overload_matches_this_call: diag(2769, 1 /* Error */, "No_overload_matches_this_call_2769", "No overload matches this call."),
         The_last_overload_gave_the_following_error: diag(2770, 1 /* Error */, "The_last_overload_gave_the_following_error_2770", "The last overload gave the following error."),
-        The_last_overload_is_declared_here_Colon: diag(2771, 1 /* Error */, "The_last_overload_is_declared_here_Colon_2771", "The last overload is declared here:"),
+        The_last_overload_is_declared_here: diag(2771, 1 /* Error */, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
         Overload_0_of_1_2_gave_the_following_error: diag(2772, 1 /* Error */, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
         Did_you_forget_to_use_await: diag(2773, 1 /* Error */, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
         This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead: diag(2774, 1 /* Error */, "This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_2774", "This condition will always return true since this function is always defined. Did you mean to call it instead?"),
@@ -7934,7 +7927,7 @@ ${lanes.join("\n")}
         The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types: diag(2795, 1 /* Error */, "The_intrinsic_keyword_can_only_be_used_to_declare_compiler_provided_intrinsic_types_2795", "The 'intrinsic' keyword can only be used to declare compiler provided intrinsic types."),
         It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tagged_template_expression_which_cannot_be_invoked: diag(2796, 1 /* Error */, "It_is_likely_that_you_are_missing_a_comma_to_separate_these_two_template_expressions_They_form_a_tag_2796", "It is likely that you are missing a comma to separate these two template expressions. They form a tagged template expression which cannot be invoked."),
         A_mixin_class_that_extends_from_a_type_variable_containing_an_abstract_construct_signature_must_also_be_declared_abstract: diag(2797, 1 /* Error */, "A_mixin_class_that_extends_from_a_type_variable_containing_an_abstract_construct_signature_must_also_2797", "A mixin class that extends from a type variable containing an abstract construct signature must also be declared 'abstract'."),
-        The_declaration_was_marked_as_deprecated_here_Colon: diag(2798, 1 /* Error */, "The_declaration_was_marked_as_deprecated_here_Colon_2798", "The declaration was marked as deprecated here:"),
+        The_declaration_was_marked_as_deprecated_here: diag(2798, 1 /* Error */, "The_declaration_was_marked_as_deprecated_here_2798", "The declaration was marked as deprecated here."),
         Type_produces_a_tuple_type_that_is_too_large_to_represent: diag(2799, 1 /* Error */, "Type_produces_a_tuple_type_that_is_too_large_to_represent_2799", "Type produces a tuple type that is too large to represent."),
         Expression_produces_a_tuple_type_that_is_too_large_to_represent: diag(2800, 1 /* Error */, "Expression_produces_a_tuple_type_that_is_too_large_to_represent_2800", "Expression produces a tuple type that is too large to represent."),
         This_condition_will_always_return_true_since_this_0_is_always_defined: diag(2801, 1 /* Error */, "This_condition_will_always_return_true_since_this_0_is_always_defined_2801", "This condition will always return true since this '{0}' is always defined."),
@@ -8371,8 +8364,8 @@ ${lanes.join("\n")}
         Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0: diag(6200, 1 /* Error */, "Definitions_of_the_following_identifiers_conflict_with_those_in_another_file_Colon_0_6200", "Definitions of the following identifiers conflict with those in another file: {0}"),
         Conflicts_are_in_this_file: diag(6201, 3 /* Message */, "Conflicts_are_in_this_file_6201", "Conflicts are in this file."),
         Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0: diag(6202, 1 /* Error */, "Project_references_may_not_form_a_circular_graph_Cycle_detected_Colon_0_6202", "Project references may not form a circular graph. Cycle detected: {0}"),
-        _0_was_also_declared_here_Colon: diag(6203, 3 /* Message */, "_0_was_also_declared_here_Colon_6203", "'{0}' was also declared here:"),
-        and_here_Colon: diag(6204, 3 /* Message */, "and_here_Colon_6204", "and here:"),
+        _0_was_also_declared_here: diag(6203, 3 /* Message */, "_0_was_also_declared_here_6203", "'{0}' was also declared here."),
+        and_here: diag(6204, 3 /* Message */, "and_here_6204", "and here."),
         All_type_parameters_are_unused: diag(6205, 1 /* Error */, "All_type_parameters_are_unused_6205", "All type parameters are unused."),
         package_json_has_a_typesVersions_field_with_version_specific_path_mappings: diag(6206, 3 /* Message */, "package_json_has_a_typesVersions_field_with_version_specific_path_mappings_6206", "'package.json' has a 'typesVersions' field with version-specific path mappings."),
         package_json_does_not_have_a_typesVersions_entry_that_matches_version_0: diag(6207, 3 /* Message */, "package_json_does_not_have_a_typesVersions_entry_that_matches_version_0_6207", "'package.json' does not have a 'typesVersions' entry that matches version '{0}'."),
@@ -8792,7 +8785,7 @@ ${lanes.join("\n")}
         You_cannot_rename_a_module_via_a_global_import: diag(8031, 1 /* Error */, "You_cannot_rename_a_module_via_a_global_import_8031", "You cannot rename a module via a global import."),
         Qualified_name_0_is_not_allowed_without_a_leading_param_object_1: diag(8032, 1 /* Error */, "Qualified_name_0_is_not_allowed_without_a_leading_param_object_1_8032", "Qualified name '{0}' is not allowed without a leading '@param {object} {1}'."),
         A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags: diag(8033, 1 /* Error */, "A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags_8033", "A JSDoc '@typedef' comment may not contain multiple '@type' tags."),
-        The_tag_was_first_specified_here_Colon: diag(8034, 1 /* Error */, "The_tag_was_first_specified_here_Colon_8034", "The tag was first specified here:"),
+        The_tag_was_first_specified_here: diag(8034, 1 /* Error */, "The_tag_was_first_specified_here_8034", "The tag was first specified here."),
         You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder: diag(8035, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_a_node_modules_folder_8035", "You cannot rename elements that are defined in a 'node_modules' folder."),
         You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder: diag(8036, 1 /* Error */, "You_cannot_rename_elements_that_are_defined_in_another_node_modules_folder_8036", "You cannot rename elements that are defined in another 'node_modules' folder."),
         Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files: diag(8037, 1 /* Error */, "Type_satisfaction_expressions_can_only_be_used_in_TypeScript_files_8037", "Type satisfaction expressions can only be used in TypeScript files."),
@@ -9746,7 +9739,7 @@ ${lanes.join("\n")}
           if (withMinus)
             start2--;
           error2(Diagnostics.Octal_literals_are_not_allowed_Use_the_syntax_0, start2, pos - start2, literal);
-          return { type: 9 /* NumericLiteral */, value: tokenValue };
+          return 9 /* NumericLiteral */;
         }
       } else {
         mainFragment = scanNumberFragment();
@@ -9786,20 +9779,18 @@ ${lanes.join("\n")}
       }
       if (tokenFlags & 8192 /* ContainsLeadingZero */) {
         error2(Diagnostics.Decimals_with_leading_zeros_are_not_allowed, start2, end2 - start2);
-        return { type: 9 /* NumericLiteral */, value: "" + +result };
+        tokenValue = "" + +result;
+        return 9 /* NumericLiteral */;
       }
       if (decimalFragment !== void 0 || tokenFlags & 16 /* Scientific */) {
         checkForIdentifierStartAfterNumericLiteral(start2, decimalFragment === void 0 && !!(tokenFlags & 16 /* Scientific */));
-        return {
-          type: 9 /* NumericLiteral */,
-          value: "" + +result
-          // if value is not an integer, it can be safely coerced to a number
-        };
+        tokenValue = "" + +result;
+        return 9 /* NumericLiteral */;
       } else {
         tokenValue = result;
         const type = checkBigIntSuffix();
         checkForIdentifierStartAfterNumericLiteral(start2);
-        return { type, value: tokenValue };
+        return type;
       }
     }
     function checkForIdentifierStartAfterNumericLiteral(numericStart, isScientific) {
@@ -10408,7 +10399,7 @@ ${lanes.join("\n")}
             return token = 41 /* MinusToken */;
           case 46 /* dot */:
             if (isDigit(text.charCodeAt(pos + 1))) {
-              tokenValue = scanNumber().value;
+              scanNumber();
               return token = 9 /* NumericLiteral */;
             }
             if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
@@ -10526,8 +10517,7 @@ ${lanes.join("\n")}
           case 55 /* _7 */:
           case 56 /* _8 */:
           case 57 /* _9 */:
-            ({ type: token, value: tokenValue } = scanNumber());
-            return token;
+            return token = scanNumber();
           case 58 /* colon */:
             pos++;
             return token = 59 /* ColonToken */;
@@ -16419,7 +16409,7 @@ ${lanes.join("\n")}
   }
   function createTextWriter(newLine) {
     var output;
-    var indent2;
+    var indent3;
     var lineStart;
     var lineCount;
     var linePos;
@@ -16437,7 +16427,7 @@ ${lanes.join("\n")}
     function writeText(s) {
       if (s && s.length) {
         if (lineStart) {
-          s = getIndentString(indent2) + s;
+          s = getIndentString(indent3) + s;
           lineStart = false;
         }
         output += s;
@@ -16456,7 +16446,7 @@ ${lanes.join("\n")}
     }
     function reset2() {
       output = "";
-      indent2 = 0;
+      indent3 = 0;
       lineStart = true;
       lineCount = 0;
       linePos = 0;
@@ -16493,15 +16483,15 @@ ${lanes.join("\n")}
       writeLiteral,
       writeLine,
       increaseIndent: () => {
-        indent2++;
+        indent3++;
       },
       decreaseIndent: () => {
-        indent2--;
+        indent3--;
       },
-      getIndent: () => indent2,
+      getIndent: () => indent3,
       getTextPos: () => output.length,
       getLine: () => lineCount,
-      getColumn: () => lineStart ? indent2 * getIndentSize() : output.length - linePos,
+      getColumn: () => lineStart ? indent3 * getIndentSize() : output.length - linePos,
       getText: () => output,
       isAtStartOfLine: () => lineStart,
       hasTrailingComment: () => hasTrailingComment,
@@ -18412,7 +18402,7 @@ ${lanes.join("\n")}
   function replaceWildcardCharacter(match, singleAsteriskRegexFragment) {
     return match === "*" ? singleAsteriskRegexFragment : match === "?" ? "[^/]" : "\\" + match;
   }
-  function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
+  function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames2, currentDirectory) {
     path = normalizePath(path);
     currentDirectory = normalizePath(currentDirectory);
     const absolutePath = combinePaths(currentDirectory, path);
@@ -18421,22 +18411,22 @@ ${lanes.join("\n")}
       includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
       includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
       excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-      basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
+      basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames2)
     };
   }
-  function getRegexFromPattern(pattern, useCaseSensitiveFileNames) {
-    return new RegExp(pattern, useCaseSensitiveFileNames ? "" : "i");
+  function getRegexFromPattern(pattern, useCaseSensitiveFileNames2) {
+    return new RegExp(pattern, useCaseSensitiveFileNames2 ? "" : "i");
   }
-  function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath) {
+  function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath) {
     path = normalizePath(path);
     currentDirectory = normalizePath(currentDirectory);
-    const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
-    const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map((pattern) => getRegexFromPattern(pattern, useCaseSensitiveFileNames));
-    const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames);
-    const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames);
+    const patterns = getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNames2, currentDirectory);
+    const includeFileRegexes = patterns.includeFilePatterns && patterns.includeFilePatterns.map((pattern) => getRegexFromPattern(pattern, useCaseSensitiveFileNames2));
+    const includeDirectoryRegex = patterns.includeDirectoryPattern && getRegexFromPattern(patterns.includeDirectoryPattern, useCaseSensitiveFileNames2);
+    const excludeRegex = patterns.excludePattern && getRegexFromPattern(patterns.excludePattern, useCaseSensitiveFileNames2);
     const results = includeFileRegexes ? includeFileRegexes.map(() => []) : [[]];
     const visited = /* @__PURE__ */ new Map();
-    const toCanonical = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const toCanonical = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     for (const basePath of patterns.basePaths) {
       visitDirectory(basePath, combinePaths(currentDirectory, basePath), depth);
     }
@@ -18478,7 +18468,7 @@ ${lanes.join("\n")}
       }
     }
   }
-  function getBasePaths(path, includes, useCaseSensitiveFileNames) {
+  function getBasePaths(path, includes, useCaseSensitiveFileNames2) {
     const basePaths = [path];
     if (includes) {
       const includeBasePaths = [];
@@ -18486,9 +18476,9 @@ ${lanes.join("\n")}
         const absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
         includeBasePaths.push(getIncludeBasePath(absolute));
       }
-      includeBasePaths.sort(getStringComparer(!useCaseSensitiveFileNames));
+      includeBasePaths.sort(getStringComparer(!useCaseSensitiveFileNames2));
       for (const includeBasePath of includeBasePaths) {
-        if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames))) {
+        if (every(basePaths, (basePath) => !containsPath(basePath, includeBasePath, path, !useCaseSensitiveFileNames2))) {
           basePaths.push(includeBasePath);
         }
       }
@@ -29559,7 +29549,7 @@ ${lanes.join("\n")}
           if (lastError) {
             addRelatedInfo(
               lastError,
-              createDetachedDiagnostic(fileName, openPosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, tokenToString(openKind), tokenToString(closeKind))
+              createDetachedDiagnostic(fileName, openPosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, tokenToString(openKind), tokenToString(closeKind))
             );
           }
         }
@@ -31147,7 +31137,7 @@ ${lanes.join("\n")}
             if (lastError && lastError.code === Diagnostics._0_expected.code) {
               addRelatedInfo(
                 lastError,
-                createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, "{", "}")
+                createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}")
               );
             }
           }
@@ -34251,7 +34241,7 @@ ${lanes.join("\n")}
               if (lastError && lastError.code === Diagnostics._0_expected.code) {
                 addRelatedInfo(
                   lastError,
-                  createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here_Colon, "{", "}")
+                  createDetachedDiagnostic(fileName, openBracePosition, 1, Diagnostics.The_parser_expected_to_find_a_1_to_match_the_0_token_here, "{", "}")
                 );
               }
             }
@@ -34619,20 +34609,20 @@ ${lanes.join("\n")}
             function doJSDocScan() {
               let state = 1 /* SawAsterisk */;
               let margin;
-              let indent2 = start - (content.lastIndexOf("\n", start) + 1) + 4;
+              let indent3 = start - (content.lastIndexOf("\n", start) + 1) + 4;
               function pushComment(text) {
                 if (!margin) {
-                  margin = indent2;
+                  margin = indent3;
                 }
                 comments.push(text);
-                indent2 += text.length;
+                indent3 += text.length;
               }
               nextTokenJSDoc();
               while (parseOptionalJsdoc(5 /* WhitespaceTrivia */))
                 ;
               if (parseOptionalJsdoc(4 /* NewLineTrivia */)) {
                 state = 0 /* BeginningOfLine */;
-                indent2 = 0;
+                indent3 = 0;
               }
               loop:
                 while (true) {
@@ -34641,14 +34631,14 @@ ${lanes.join("\n")}
                       removeTrailingWhitespace(comments);
                       if (!commentsPos)
                         commentsPos = getNodePos();
-                      addTag(parseTag(indent2));
+                      addTag(parseTag(indent3));
                       state = 0 /* BeginningOfLine */;
                       margin = void 0;
                       break;
                     case 4 /* NewLineTrivia */:
                       comments.push(scanner2.getTokenText());
                       state = 0 /* BeginningOfLine */;
-                      indent2 = 0;
+                      indent3 = 0;
                       break;
                     case 42 /* AsteriskToken */:
                       const asterisk = scanner2.getTokenText();
@@ -34658,16 +34648,16 @@ ${lanes.join("\n")}
                       } else {
                         Debug.assert(state === 0 /* BeginningOfLine */);
                         state = 1 /* SawAsterisk */;
-                        indent2 += asterisk.length;
+                        indent3 += asterisk.length;
                       }
                       break;
                     case 5 /* WhitespaceTrivia */:
                       Debug.assert(state !== 2 /* SavingComments */, "whitespace shouldn't come from the scanner while saving top-level comment text");
                       const whitespace = scanner2.getTokenText();
-                      if (margin !== void 0 && indent2 + whitespace.length > margin) {
-                        comments.push(whitespace.slice(margin - indent2));
+                      if (margin !== void 0 && indent3 + whitespace.length > margin) {
+                        comments.push(whitespace.slice(margin - indent3));
                       }
-                      indent2 += whitespace.length;
+                      indent3 += whitespace.length;
                       break;
                     case 1 /* EndOfFileToken */:
                       break loop;
@@ -34869,7 +34859,7 @@ ${lanes.join("\n")}
               }
               return parseTagComments(margin, indentText.slice(margin));
             }
-            function parseTagComments(indent2, initialMargin) {
+            function parseTagComments(indent3, initialMargin) {
               const commentsPos2 = getNodePos();
               let comments2 = [];
               const parts2 = [];
@@ -34878,10 +34868,10 @@ ${lanes.join("\n")}
               let margin;
               function pushComment(text) {
                 if (!margin) {
-                  margin = indent2;
+                  margin = indent3;
                 }
                 comments2.push(text);
-                indent2 += text.length;
+                indent3 += text.length;
               }
               if (initialMargin !== void 0) {
                 if (initialMargin !== "") {
@@ -34896,7 +34886,7 @@ ${lanes.join("\n")}
                     case 4 /* NewLineTrivia */:
                       state = 0 /* BeginningOfLine */;
                       comments2.push(scanner2.getTokenText());
-                      indent2 = 0;
+                      indent3 = 0;
                       break;
                     case 60 /* AtToken */:
                       scanner2.resetTokenState(scanner2.getTokenEnd() - 1);
@@ -34906,11 +34896,11 @@ ${lanes.join("\n")}
                     case 5 /* WhitespaceTrivia */:
                       Debug.assert(state !== 2 /* SavingComments */ && state !== 3 /* SavingBackticks */, "whitespace shouldn't come from the scanner while saving comment text");
                       const whitespace = scanner2.getTokenText();
-                      if (margin !== void 0 && indent2 + whitespace.length > margin) {
-                        comments2.push(whitespace.slice(margin - indent2));
+                      if (margin !== void 0 && indent3 + whitespace.length > margin) {
+                        comments2.push(whitespace.slice(margin - indent3));
                         state = 2 /* SavingComments */;
                       }
-                      indent2 += whitespace.length;
+                      indent3 += whitespace.length;
                       break;
                     case 19 /* OpenBraceToken */:
                       state = 2 /* SavingComments */;
@@ -34943,7 +34933,7 @@ ${lanes.join("\n")}
                     case 42 /* AsteriskToken */:
                       if (state === 0 /* BeginningOfLine */) {
                         state = 1 /* SawAsterisk */;
-                        indent2 += 1;
+                        indent3 += 1;
                         break;
                       }
                     default:
@@ -35008,8 +34998,8 @@ ${lanes.join("\n")}
             function isJSDocLinkTag(kind) {
               return kind === "link" || kind === "linkcode" || kind === "linkplain";
             }
-            function parseUnknownTag(start2, tagName, indent2, indentText) {
-              return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
+            function parseUnknownTag(start2, tagName, indent3, indentText) {
+              return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
             }
             function addTag(tag) {
               if (!tag) {
@@ -35056,7 +35046,7 @@ ${lanes.join("\n")}
                   return isTypeReferenceNode(node) && isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
               }
             }
-            function parseParameterOrPropertyTag(start2, tagName, target, indent2) {
+            function parseParameterOrPropertyTag(start2, tagName, target, indent3) {
               let typeExpression = tryParseTypeExpression();
               let isNameFirst = !typeExpression;
               skipWhitespaceOrAsterisk();
@@ -35065,8 +35055,8 @@ ${lanes.join("\n")}
               if (isNameFirst && !lookAhead(parseJSDocLinkPrefix)) {
                 typeExpression = tryParseTypeExpression();
               }
-              const comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
-              const nestedTypeLiteral = parseNestedTypeLiteral(typeExpression, name, target, indent2);
+              const comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
+              const nestedTypeLiteral = parseNestedTypeLiteral(typeExpression, name, target, indent3);
               if (nestedTypeLiteral) {
                 typeExpression = nestedTypeLiteral;
                 isNameFirst = true;
@@ -35074,12 +35064,12 @@ ${lanes.join("\n")}
               const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
               return finishNode(result2, start2);
             }
-            function parseNestedTypeLiteral(typeExpression, name, target, indent2) {
+            function parseNestedTypeLiteral(typeExpression, name, target, indent3) {
               if (typeExpression && isObjectOrObjectArrayTypeReference(typeExpression.type)) {
                 const pos = getNodePos();
                 let child;
                 let children;
-                while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent2, name))) {
+                while (child = tryParse(() => parseChildParameterOrPropertyTag(target, indent3, name))) {
                   if (child.kind === 348 /* JSDocParameterTag */ || child.kind === 355 /* JSDocPropertyTag */) {
                     children = append(children, child);
                   } else if (child.kind === 352 /* JSDocTemplateTag */) {
@@ -35092,14 +35082,14 @@ ${lanes.join("\n")}
                 }
               }
             }
-            function parseReturnTag(start2, tagName, indent2, indentText) {
+            function parseReturnTag(start2, tagName, indent3, indentText) {
               if (some(tags, isJSDocReturnTag)) {
                 parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, unescapeLeadingUnderscores(tagName.escapedText));
               }
               const typeExpression = tryParseTypeExpression();
-              return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
+              return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
             }
-            function parseTypeTag(start2, tagName, indent2, indentText) {
+            function parseTypeTag(start2, tagName, indent3, indentText) {
               if (some(tags, isJSDocTypeTag)) {
                 parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, unescapeLeadingUnderscores(tagName.escapedText));
               }
@@ -35107,25 +35097,25 @@ ${lanes.join("\n")}
                 /*mayOmitBraces*/
                 true
               );
-              const comments2 = indent2 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent2, indentText) : void 0;
+              const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent3, indentText) : void 0;
               return finishNode(factory2.createJSDocTypeTag(tagName, typeExpression, comments2), start2);
             }
-            function parseSeeTag(start2, tagName, indent2, indentText) {
+            function parseSeeTag(start2, tagName, indent3, indentText) {
               const isMarkdownOrJSDocLink = token() === 23 /* OpenBracketToken */ || lookAhead(() => nextTokenJSDoc() === 60 /* AtToken */ && tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && isJSDocLinkTag(scanner2.getTokenValue()));
               const nameExpression = isMarkdownOrJSDocLink ? void 0 : parseJSDocNameReference();
-              const comments2 = indent2 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent2, indentText) : void 0;
+              const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start2, getNodePos(), indent3, indentText) : void 0;
               return finishNode(factory2.createJSDocSeeTag(tagName, nameExpression, comments2), start2);
             }
-            function parseThrowsTag(start2, tagName, indent2, indentText) {
+            function parseThrowsTag(start2, tagName, indent3, indentText) {
               const typeExpression = tryParseTypeExpression();
-              const comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
+              const comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
               return finishNode(factory2.createJSDocThrowsTag(tagName, typeExpression, comment), start2);
             }
-            function parseAuthorTag(start2, tagName, indent2, indentText) {
+            function parseAuthorTag(start2, tagName, indent3, indentText) {
               const commentStart = getNodePos();
               const textOnly = parseAuthorNameAndEmail();
               let commentEnd = scanner2.getTokenFullStart();
-              const comments2 = parseTrailingTagComments(start2, commentEnd, indent2, indentText);
+              const comments2 = parseTrailingTagComments(start2, commentEnd, indent3, indentText);
               if (!comments2) {
                 commentEnd = scanner2.getTokenFullStart();
               }
@@ -35209,19 +35199,19 @@ ${lanes.join("\n")}
               skipWhitespace();
               return finishNode(factory2.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start2, getNodePos(), margin, indentText)), start2);
             }
-            function parseTypedefTag(start2, tagName, indent2, indentText) {
+            function parseTypedefTag(start2, tagName, indent3, indentText) {
               let typeExpression = tryParseTypeExpression();
               skipWhitespaceOrAsterisk();
               const fullName = parseJSDocTypeNameWithNamespace();
               skipWhitespace();
-              let comment = parseTagComments(indent2);
+              let comment = parseTagComments(indent3);
               let end2;
               if (!typeExpression || isObjectOrObjectArrayTypeReference(typeExpression.type)) {
                 let child;
                 let childTypeTag;
                 let jsDocPropertyTags;
                 let hasChildren = false;
-                while (child = tryParse(() => parseChildPropertyTag(indent2))) {
+                while (child = tryParse(() => parseChildPropertyTag(indent3))) {
                   if (child.kind === 352 /* JSDocTemplateTag */) {
                     break;
                   }
@@ -35230,7 +35220,7 @@ ${lanes.join("\n")}
                     if (childTypeTag) {
                       const lastError = parseErrorAtCurrentToken(Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                       if (lastError) {
-                        addRelatedInfo(lastError, createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here_Colon));
+                        addRelatedInfo(lastError, createDetachedDiagnostic(fileName, 0, 0, Diagnostics.The_tag_was_first_specified_here));
                       }
                       break;
                     } else {
@@ -35249,7 +35239,7 @@ ${lanes.join("\n")}
               }
               end2 = end2 || comment !== void 0 ? getNodePos() : (fullName ?? typeExpression ?? tagName).end;
               if (!comment) {
-                comment = parseTrailingTagComments(start2, end2, indent2, indentText);
+                comment = parseTrailingTagComments(start2, end2, indent3, indentText);
               }
               const typedefTag = factory2.createJSDocTypedefTag(tagName, typeExpression, fullName, comment);
               return finishNode(typedefTag, start2, end2);
@@ -35279,11 +35269,11 @@ ${lanes.join("\n")}
               }
               return typeNameOrNamespaceName;
             }
-            function parseCallbackTagParameters(indent2) {
+            function parseCallbackTagParameters(indent3) {
               const pos = getNodePos();
               let child;
               let parameters;
-              while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent2))) {
+              while (child = tryParse(() => parseChildParameterOrPropertyTag(4 /* CallbackParameter */, indent3))) {
                 if (child.kind === 352 /* JSDocTemplateTag */) {
                   parseErrorAtRange(child.tagName, Diagnostics.A_JSDoc_template_tag_may_not_follow_a_typedef_callback_or_overload_tag);
                   break;
@@ -35292,11 +35282,11 @@ ${lanes.join("\n")}
               }
               return createNodeArray(parameters || [], pos);
             }
-            function parseJSDocSignature(start2, indent2) {
-              const parameters = parseCallbackTagParameters(indent2);
+            function parseJSDocSignature(start2, indent3) {
+              const parameters = parseCallbackTagParameters(indent3);
               const returnTag = tryParse(() => {
                 if (parseOptionalJsdoc(60 /* AtToken */)) {
-                  const tag = parseTag(indent2);
+                  const tag = parseTag(indent3);
                   if (tag && tag.kind === 349 /* JSDocReturnTag */) {
                     return tag;
                   }
@@ -35309,23 +35299,23 @@ ${lanes.join("\n")}
                 returnTag
               ), start2);
             }
-            function parseCallbackTag(start2, tagName, indent2, indentText) {
+            function parseCallbackTag(start2, tagName, indent3, indentText) {
               const fullName = parseJSDocTypeNameWithNamespace();
               skipWhitespace();
-              let comment = parseTagComments(indent2);
-              const typeExpression = parseJSDocSignature(start2, indent2);
+              let comment = parseTagComments(indent3);
+              const typeExpression = parseJSDocSignature(start2, indent3);
               if (!comment) {
-                comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
+                comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
               }
               const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
               return finishNode(factory2.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start2, end2);
             }
-            function parseOverloadTag(start2, tagName, indent2, indentText) {
+            function parseOverloadTag(start2, tagName, indent3, indentText) {
               skipWhitespace();
-              let comment = parseTagComments(indent2);
-              const typeExpression = parseJSDocSignature(start2, indent2);
+              let comment = parseTagComments(indent3);
+              const typeExpression = parseJSDocSignature(start2, indent3);
               if (!comment) {
-                comment = parseTrailingTagComments(start2, getNodePos(), indent2, indentText);
+                comment = parseTrailingTagComments(start2, getNodePos(), indent3, indentText);
               }
               const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
               return finishNode(factory2.createJSDocOverloadTag(tagName, typeExpression, comment), start2, end2);
@@ -35341,17 +35331,17 @@ ${lanes.join("\n")}
               }
               return a.escapedText === b.escapedText;
             }
-            function parseChildPropertyTag(indent2) {
-              return parseChildParameterOrPropertyTag(1 /* Property */, indent2);
+            function parseChildPropertyTag(indent3) {
+              return parseChildParameterOrPropertyTag(1 /* Property */, indent3);
             }
-            function parseChildParameterOrPropertyTag(target, indent2, name) {
+            function parseChildParameterOrPropertyTag(target, indent3, name) {
               let canParseTag = true;
               let seenAsterisk = false;
               while (true) {
                 switch (nextTokenJSDoc()) {
                   case 60 /* AtToken */:
                     if (canParseTag) {
-                      const child = tryParseChildTag(target, indent2);
+                      const child = tryParseChildTag(target, indent3);
                       if (child && (child.kind === 348 /* JSDocParameterTag */ || child.kind === 355 /* JSDocPropertyTag */) && name && (isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                         return false;
                       }
@@ -35377,7 +35367,7 @@ ${lanes.join("\n")}
                 }
               }
             }
-            function tryParseChildTag(target, indent2) {
+            function tryParseChildTag(target, indent3) {
               Debug.assert(token() === 60 /* AtToken */);
               const start2 = scanner2.getTokenFullStart();
               nextTokenJSDoc();
@@ -35397,14 +35387,14 @@ ${lanes.join("\n")}
                   t = 2 /* Parameter */ | 4 /* CallbackParameter */;
                   break;
                 case "template":
-                  return parseTemplateTag(start2, tagName, indent2, indentText);
+                  return parseTemplateTag(start2, tagName, indent3, indentText);
                 default:
                   return false;
               }
               if (!(target & t)) {
                 return false;
               }
-              return parseParameterOrPropertyTag(start2, tagName, target, indent2);
+              return parseParameterOrPropertyTag(start2, tagName, target, indent3);
             }
             function parseTemplateTagTypeParameter() {
               const typeParameterPos = getNodePos();
@@ -35445,10 +35435,10 @@ ${lanes.join("\n")}
               } while (parseOptionalJsdoc(28 /* CommaToken */));
               return createNodeArray(typeParameters, pos);
             }
-            function parseTemplateTag(start2, tagName, indent2, indentText) {
+            function parseTemplateTag(start2, tagName, indent3, indentText) {
               const constraint = token() === 19 /* OpenBraceToken */ ? parseJSDocTypeExpression() : void 0;
               const typeParameters = parseTemplateTagTypeParameters();
-              return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start2, getNodePos(), indent2, indentText)), start2);
+              return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start2, getNodePos(), indent3, indentText)), start2);
             }
             function parseOptionalJsdoc(t) {
               if (token() === t) {
@@ -37279,19 +37269,19 @@ ${lanes.join("\n")}
     const wildcardFiles = arrayFrom(wildcardFileMap.values());
     return literalFiles.concat(wildcardFiles, arrayFrom(wildCardJsonFileMap.values()));
   }
-  function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames, currentDirectory) {
+  function isExcludedFile(pathToCheck, spec, basePath, useCaseSensitiveFileNames2, currentDirectory) {
     const { validatedFilesSpec, validatedIncludeSpecs, validatedExcludeSpecs } = spec;
     if (!length(validatedIncludeSpecs) || !length(validatedExcludeSpecs))
       return false;
     basePath = normalizePath(basePath);
-    const keyMapper = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const keyMapper = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     if (validatedFilesSpec) {
       for (const fileName of validatedFilesSpec) {
         if (keyMapper(getNormalizedAbsolutePath(fileName, basePath)) === pathToCheck)
           return false;
       }
     }
-    return matchesExcludeWorker(pathToCheck, validatedExcludeSpecs, useCaseSensitiveFileNames, currentDirectory, basePath);
+    return matchesExcludeWorker(pathToCheck, validatedExcludeSpecs, useCaseSensitiveFileNames2, currentDirectory, basePath);
   }
   function invalidDotDotAfterRecursiveWildcard(s) {
     const wildcardIndex = startsWith(s, "**/") ? 0 : s.indexOf("/**/");
@@ -37301,17 +37291,17 @@ ${lanes.join("\n")}
     const lastDotIndex = endsWith(s, "/..") ? s.length : s.lastIndexOf("/../");
     return lastDotIndex > wildcardIndex;
   }
-  function matchesExclude(pathToCheck, excludeSpecs, useCaseSensitiveFileNames, currentDirectory) {
+  function matchesExclude(pathToCheck, excludeSpecs, useCaseSensitiveFileNames2, currentDirectory) {
     return matchesExcludeWorker(
       pathToCheck,
       filter(excludeSpecs, (spec) => !invalidDotDotAfterRecursiveWildcard(spec)),
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames2,
       currentDirectory
     );
   }
-  function matchesExcludeWorker(pathToCheck, excludeSpecs, useCaseSensitiveFileNames, currentDirectory, basePath) {
+  function matchesExcludeWorker(pathToCheck, excludeSpecs, useCaseSensitiveFileNames2, currentDirectory, basePath) {
     const excludePattern = getRegularExpressionForWildcard(excludeSpecs, combinePaths(normalizePath(currentDirectory), basePath), "exclude");
-    const excludeRegex = excludePattern && getRegexFromPattern(excludePattern, useCaseSensitiveFileNames);
+    const excludeRegex = excludePattern && getRegexFromPattern(excludePattern, useCaseSensitiveFileNames2);
     if (!excludeRegex)
       return false;
     if (excludeRegex.test(pathToCheck))
@@ -37341,9 +37331,9 @@ ${lanes.join("\n")}
       return [Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec];
     }
   }
-  function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }, path, useCaseSensitiveFileNames) {
+  function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExcludeSpecs: exclude }, path, useCaseSensitiveFileNames2) {
     const rawExcludeRegex = getRegularExpressionForWildcard(exclude, path, "exclude");
-    const excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
+    const excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames2 ? "" : "i");
     const wildcardDirectories = {};
     if (include !== void 0) {
       const recursiveKeys = [];
@@ -37352,7 +37342,7 @@ ${lanes.join("\n")}
         if (excludeRegex && excludeRegex.test(spec)) {
           continue;
         }
-        const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames);
+        const match = getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2);
         if (match) {
           const { key, flags } = match;
           const existingFlags = wildcardDirectories[key];
@@ -37367,7 +37357,7 @@ ${lanes.join("\n")}
       for (const key in wildcardDirectories) {
         if (hasProperty(wildcardDirectories, key)) {
           for (const recursiveKey of recursiveKeys) {
-            if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
+            if (key !== recursiveKey && containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames2)) {
               delete wildcardDirectories[key];
             }
           }
@@ -37376,20 +37366,20 @@ ${lanes.join("\n")}
     }
     return wildcardDirectories;
   }
-  function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames) {
+  function getWildcardDirectoryFromSpec(spec, useCaseSensitiveFileNames2) {
     const match = wildcardDirectoryPattern.exec(spec);
     if (match) {
       const questionWildcardIndex = spec.indexOf("?");
       const starWildcardIndex = spec.indexOf("*");
       const lastDirectorySeperatorIndex = spec.lastIndexOf(directorySeparator);
       return {
-        key: useCaseSensitiveFileNames ? match[0] : toFileNameLowerCase(match[0]),
+        key: useCaseSensitiveFileNames2 ? match[0] : toFileNameLowerCase(match[0]),
         flags: questionWildcardIndex !== -1 && questionWildcardIndex < lastDirectorySeperatorIndex || starWildcardIndex !== -1 && starWildcardIndex < lastDirectorySeperatorIndex ? 1 /* Recursive */ : 0 /* None */
       };
     }
     if (isImplicitGlob(spec.substring(spec.lastIndexOf(directorySeparator) + 1))) {
       return {
-        key: removeTrailingDirectorySeparator(useCaseSensitiveFileNames ? spec : toFileNameLowerCase(spec)),
+        key: removeTrailingDirectorySeparator(useCaseSensitiveFileNames2 ? spec : toFileNameLowerCase(spec)),
         flags: 1 /* Recursive */
       };
     }
@@ -37994,6 +37984,7 @@ ${lanes.join("\n")}
         {
           name: "checkJs",
           type: "boolean",
+          affectsModuleResolution: true,
           showInSimplifiedHelpView: true,
           category: Diagnostics.JavaScript_Support,
           description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -39074,6 +39065,18 @@ ${lanes.join("\n")}
       result.push("JSON");
     return result.join(", ");
   }
+  function extensionsToExtensionsArray(extensions) {
+    const result = [];
+    if (extensions & 1 /* TypeScript */)
+      result.push(...supportedTSImplementationExtensions);
+    if (extensions & 2 /* JavaScript */)
+      result.push(...supportedJSExtensionsFlat);
+    if (extensions & 4 /* Declaration */)
+      result.push(...supportedDeclarationExtensions);
+    if (extensions & 8 /* Json */)
+      result.push(".json" /* Json */);
+    return result;
+  }
   function resolvedTypeScriptOnly(resolved) {
     if (!resolved) {
       return void 0;
@@ -39246,8 +39249,8 @@ ${lanes.join("\n")}
     return typeRoots;
   }
   function arePathsEqual(path1, path2, host) {
-    const useCaseSensitiveFileNames = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
-    return comparePaths(path1, path2, !useCaseSensitiveFileNames) === 0 /* EqualTo */;
+    const useCaseSensitiveFileNames2 = typeof host.useCaseSensitiveFileNames === "function" ? host.useCaseSensitiveFileNames() : host.useCaseSensitiveFileNames;
+    return comparePaths(path1, path2, !useCaseSensitiveFileNames2) === 0 /* EqualTo */;
   }
   function getOriginalAndResolvedFileName(fileName, host, traceEnabled) {
     const resolvedFileName = realPath(fileName, host, traceEnabled);
@@ -40510,7 +40513,7 @@ ${lanes.join("\n")}
         arrayIsEqualTo
       );
       for (const conditions of conditionSets) {
-        const loadPackageJsonExportsState = { ...loadPackageJsonMainState, failedLookupLocations: [], conditions };
+        const loadPackageJsonExportsState = { ...loadPackageJsonMainState, failedLookupLocations: [], conditions, host };
         const exportResolutions = loadEntrypointsFromExportMap(
           packageJsonInfo,
           packageJsonInfo.contents.packageJsonContent.exports,
@@ -40542,23 +40545,42 @@ ${lanes.join("\n")}
     return entrypoints;
     function loadEntrypointsFromTargetExports(target) {
       var _a, _b;
-      if (typeof target === "string" && startsWith(target, "./") && target.indexOf("*") === -1) {
-        const partsAfterFirst = getPathComponents(target).slice(2);
-        if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
-          return false;
-        }
-        const resolvedTarget = combinePaths(scope.packageDirectory, target);
-        const finalPath = getNormalizedAbsolutePath(resolvedTarget, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
-        const result = loadFileNameFromPackageJsonField(
-          extensions,
-          finalPath,
-          /*onlyRecordFailures*/
-          false,
-          state
-        );
-        if (result) {
-          entrypoints = appendIfUnique(entrypoints, result, (a, b) => a.path === b.path);
-          return true;
+      if (typeof target === "string" && startsWith(target, "./")) {
+        if (target.indexOf("*") >= 0 && state.host.readDirectory) {
+          if (target.indexOf("*") !== target.lastIndexOf("*")) {
+            return false;
+          }
+          state.host.readDirectory(
+            scope.packageDirectory,
+            extensionsToExtensionsArray(extensions),
+            /*excludes*/
+            void 0,
+            [changeAnyExtension(target.replace("*", "**/*"), getDeclarationEmitExtensionForPath(target))]
+          ).forEach((entry) => {
+            entrypoints = appendIfUnique(entrypoints, {
+              path: entry,
+              ext: getAnyExtensionFromPath(entry),
+              resolvedUsingTsExtension: void 0
+            });
+          });
+        } else {
+          const partsAfterFirst = getPathComponents(target).slice(2);
+          if (partsAfterFirst.indexOf("..") >= 0 || partsAfterFirst.indexOf(".") >= 0 || partsAfterFirst.indexOf("node_modules") >= 0) {
+            return false;
+          }
+          const resolvedTarget = combinePaths(scope.packageDirectory, target);
+          const finalPath = getNormalizedAbsolutePath(resolvedTarget, (_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a));
+          const result = loadFileNameFromPackageJsonField(
+            extensions,
+            finalPath,
+            /*onlyRecordFailures*/
+            false,
+            state
+          );
+          if (result) {
+            entrypoints = appendIfUnique(entrypoints, result, (a, b) => a.path === b.path);
+            return true;
+          }
         }
       } else if (Array.isArray(target)) {
         for (const t of target) {
@@ -40767,6 +40789,9 @@ ${lanes.join("\n")}
     }
     const trailingParts = parts.slice(nameParts.length);
     const subpath = !length(trailingParts) ? "." : `.${directorySeparator}${trailingParts.join(directorySeparator)}`;
+    if (getAllowJSCompilerOption(state.compilerOptions) && !pathContainsNodeModules(directory)) {
+      return loadModuleFromExports(scope, extensions, subpath, state, cache, redirectedReference);
+    }
     const priorityExtensions = extensions & (1 /* TypeScript */ | 4 /* Declaration */);
     const secondaryExtensions = extensions & ~(1 /* TypeScript */ | 4 /* Declaration */);
     return loadModuleFromExports(scope, priorityExtensions, subpath, state, cache, redirectedReference) || loadModuleFromExports(scope, secondaryExtensions, subpath, state, cache, redirectedReference);
@@ -41114,13 +41139,10 @@ ${lanes.join("\n")}
       function combineDirectoryPath(root, dir) {
         return ensureTrailingDirectorySeparator(combinePaths(root, dir));
       }
-      function useCaseSensitiveFileNames() {
-        return !state.host.useCaseSensitiveFileNames ? true : typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames : state.host.useCaseSensitiveFileNames();
-      }
       function tryLoadInputFileForPath(finalPath, entry, packagePath, isImports2) {
         var _a, _b, _c, _d;
-        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames()) : true)) {
-          const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames });
+        if (!state.isConfigLookup && (state.compilerOptions.declarationDir || state.compilerOptions.outDir) && finalPath.indexOf("/node_modules/") === -1 && (state.compilerOptions.configFile ? containsPath(scope.packageDirectory, toAbsolutePath(state.compilerOptions.configFile.fileName), !useCaseSensitiveFileNames(state)) : true)) {
+          const getCanonicalFileName = hostGetCanonicalFileName({ useCaseSensitiveFileNames: () => useCaseSensitiveFileNames(state) });
           const commonSourceDirGuesses = [];
           if (state.compilerOptions.rootDir || state.compilerOptions.composite && state.compilerOptions.configFilePath) {
             const commonDir = toAbsolutePath(getCommonSourceDirectory(state.compilerOptions, () => [], ((_b = (_a = state.host).getCurrentDirectory) == null ? void 0 : _b.call(_a)) || "", getCanonicalFileName));
@@ -41149,7 +41171,7 @@ ${lanes.join("\n")}
           for (const commonSourceDirGuess of commonSourceDirGuesses) {
             const candidateDirectories = getOutputDirectoriesForBaseDirectory(commonSourceDirGuess);
             for (const candidateDir of candidateDirectories) {
-              if (containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames())) {
+              if (containsPath(candidateDir, finalPath, !useCaseSensitiveFileNames(state))) {
                 const pathFragment = finalPath.slice(candidateDir.length + 1);
                 const possibleInputBase = combinePaths(commonSourceDirGuess, pathFragment);
                 const jsAndDtsExtensions = [".mjs" /* Mjs */, ".cjs" /* Cjs */, ".js" /* Js */, ".json" /* Json */, ".d.mts" /* Dmts */, ".d.cts" /* Dcts */, ".d.ts" /* Dts */];
@@ -41159,7 +41181,7 @@ ${lanes.join("\n")}
                     for (const possibleExt of inputExts) {
                       if (!extensionIsOk(extensions, possibleExt))
                         continue;
-                      const possibleInputWithInputExtension = changeAnyExtension(possibleInputBase, possibleExt, ext, !useCaseSensitiveFileNames());
+                      const possibleInputWithInputExtension = changeAnyExtension(possibleInputBase, possibleExt, ext, !useCaseSensitiveFileNames(state));
                       if (state.host.fileExists(possibleInputWithInputExtension)) {
                         return toSearchResult(withPackageId(scope, loadFileNameFromPackageJsonField(
                           extensions,
@@ -41575,6 +41597,9 @@ ${lanes.join("\n")}
       trace(state.host, diagnostic, ...args);
     }
   }
+  function useCaseSensitiveFileNames(state) {
+    return !state.host.useCaseSensitiveFileNames ? true : typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames : state.host.useCaseSensitiveFileNames();
+  }
   var typeScriptVersion, nodeModulesAtTypes, NodeResolutionFeatures, nodeModulesPathPart, mangledScopedPackageSeparator;
   var init_moduleNameResolver = __esm({
     "src/compiler/moduleNameResolver.ts"() {
@@ -41959,10 +41984,10 @@ ${lanes.join("\n")}
               const decl = getNameOfDeclaration(declaration) || declaration;
               const diag3 = messageNeedsName ? createDiagnosticForNode2(decl, message, getDisplayName(declaration)) : createDiagnosticForNode2(decl, message);
               file.bindDiagnostics.push(
-                multipleDefaultExports ? addRelatedInfo(diag3, createDiagnosticForNode2(declarationName, index === 0 ? Diagnostics.Another_export_default_is_here_Colon : Diagnostics.and_here_Colon)) : diag3
+                multipleDefaultExports ? addRelatedInfo(diag3, createDiagnosticForNode2(declarationName, index === 0 ? Diagnostics.Another_export_default_is_here : Diagnostics.and_here)) : diag3
               );
               if (multipleDefaultExports) {
-                relatedInformation.push(createDiagnosticForNode2(decl, Diagnostics.The_first_export_default_is_here_Colon));
+                relatedInformation.push(createDiagnosticForNode2(decl, Diagnostics.The_first_export_default_is_here));
               }
             });
             const diag2 = messageNeedsName ? createDiagnosticForNode2(declarationName, message, getDisplayName(node)) : createDiagnosticForNode2(declarationName, message);
@@ -45080,7 +45105,9 @@ ${lanes.join("\n")}
           for (const { ending, value } of candidates) {
             if (value.length >= prefix.length + suffix.length && startsWith(value, prefix) && endsWith(value, suffix) && validateEnding({ ending, value })) {
               const matchedStar = value.substring(prefix.length, value.length - suffix.length);
-              return pathIsRelative(matchedStar) ? void 0 : key.replace("*", matchedStar);
+              if (!pathIsRelative(matchedStar)) {
+                return key.replace("*", matchedStar);
+              }
             }
           }
         } else if (some(candidates, (c) => c.ending !== 0 /* Minimal */ && pattern === c.value) || some(candidates, (c) => c.ending === 0 /* Minimal */ && pattern === c.value && validateEnding(c))) {
@@ -45152,7 +45179,7 @@ ${lanes.join("\n")}
         for (const key of getOwnKeys(exports)) {
           if (key === "default" || conditions.indexOf(key) >= 0 || isApplicableVersionedTypesKey(conditions, key)) {
             const subTarget = exports[key];
-            const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions);
+            const result = tryGetModuleNameFromExports(options, targetFilePath, packageDirectory, packageName, subTarget, conditions, mode);
             if (result) {
               return result;
             }
@@ -46210,7 +46237,7 @@ ${lanes.join("\n")}
     };
     var amalgamatedDuplicates;
     var reverseMappedCache = /* @__PURE__ */ new Map();
-    var inInferTypeForHomomorphicMappedType = false;
+    var homomorphicMappedTypeInferenceStack = [];
     var ambientModulesCache;
     var patternAmbientModules;
     var patternAmbientModuleAugmentations;
@@ -46467,7 +46494,7 @@ ${lanes.join("\n")}
       if (deprecatedTag) {
         addRelatedInfo(
           diagnostic,
-          createDiagnosticForNode(deprecatedTag, Diagnostics.The_declaration_was_marked_as_deprecated_here_Colon)
+          createDiagnosticForNode(deprecatedTag, Diagnostics.The_declaration_was_marked_as_deprecated_here)
         );
       }
       suggestionDiagnostics.add(diagnostic);
@@ -46662,8 +46689,8 @@ ${lanes.join("\n")}
         if (adjustedNode === errorNode)
           continue;
         err.relatedInformation = err.relatedInformation || [];
-        const leadingMessage = createDiagnosticForNode(adjustedNode, Diagnostics._0_was_also_declared_here_Colon, symbolName2);
-        const followOnMessage = createDiagnosticForNode(adjustedNode, Diagnostics.and_here_Colon);
+        const leadingMessage = createDiagnosticForNode(adjustedNode, Diagnostics._0_was_also_declared_here, symbolName2);
+        const followOnMessage = createDiagnosticForNode(adjustedNode, Diagnostics.and_here);
         if (length(err.relatedInformation) >= 5 || some(err.relatedInformation, (r) => compareDiagnostics(r, followOnMessage) === 0 /* EqualTo */ || compareDiagnostics(r, leadingMessage) === 0 /* EqualTo */))
           continue;
         addRelatedInfo(err, !length(err.relatedInformation) ? leadingMessage : followOnMessage);
@@ -47274,7 +47301,7 @@ ${lanes.join("\n")}
                   if (suggestion.valueDeclaration) {
                     addRelatedInfo(
                       diagnostic,
-                      createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestionName)
+                      createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestionName)
                     );
                   }
                 }
@@ -47336,7 +47363,7 @@ ${lanes.join("\n")}
         diagnostic,
         createDiagnosticForNode(
           typeOnlyDeclaration,
-          typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 280 /* NamespaceExport */ ? Diagnostics._0_was_exported_here_Colon : Diagnostics._0_was_imported_here_Colon,
+          typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ || typeOnlyDeclaration.kind === 280 /* NamespaceExport */ ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here,
           unescapedName
         )
       );
@@ -47473,7 +47500,7 @@ ${lanes.join("\n")}
               return true;
             }
           }
-          error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_Colon, unescapeLeadingUnderscores(name));
+          error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here, unescapeLeadingUnderscores(name));
           return true;
         }
       }
@@ -47515,7 +47542,7 @@ ${lanes.join("\n")}
           if (isExtendedByInterface(errorLocation)) {
             error2(errorLocation, Diagnostics.An_interface_cannot_extend_a_primitive_type_like_0_an_interface_can_only_extend_named_types_and_classes, unescapeLeadingUnderscores(name));
           } else {
-            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon, unescapeLeadingUnderscores(name));
+            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, unescapeLeadingUnderscores(name));
           }
           return true;
         }
@@ -47538,7 +47565,7 @@ ${lanes.join("\n")}
           } else if (maybeMappedType(errorLocation, symbol)) {
             error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Did_you_mean_to_use_1_in_0, rawName, rawName === "K" ? "P" : "K");
           } else {
-            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon, rawName);
+            error2(errorLocation, Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here, rawName);
           }
           return true;
         }
@@ -47644,7 +47671,7 @@ ${lanes.join("\n")}
         if (diagnosticMessage) {
           addRelatedInfo(
             diagnosticMessage,
-            createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here_Colon, declarationName)
+            createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here, declarationName)
           );
         }
       }
@@ -47712,7 +47739,7 @@ ${lanes.join("\n")}
         const typeOnlyDeclaration = getTypeOnlyAliasDeclaration(getSymbolOfDeclaration(node));
         const isExport = typeOnlyDeclaration.kind === 281 /* ExportSpecifier */ || typeOnlyDeclaration.kind === 278 /* ExportDeclaration */;
         const message = isExport ? Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_exported_using_export_type : Diagnostics.An_import_alias_cannot_reference_a_declaration_that_was_imported_using_import_type;
-        const relatedMessage = isExport ? Diagnostics._0_was_exported_here_Colon : Diagnostics._0_was_imported_here_Colon;
+        const relatedMessage = isExport ? Diagnostics._0_was_exported_here : Diagnostics._0_was_imported_here;
         const name = typeOnlyDeclaration.kind === 278 /* ExportDeclaration */ ? "*" : unescapeLeadingUnderscores(typeOnlyDeclaration.name.escapedText);
         addRelatedInfo(error2(node.moduleReference, message), createDiagnosticForNode(typeOnlyDeclaration, relatedMessage, name));
       }
@@ -48034,7 +48061,7 @@ ${lanes.join("\n")}
         if (suggestion.valueDeclaration) {
           addRelatedInfo(
             diagnostic,
-            createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestionName)
+            createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestionName)
           );
         }
       } else {
@@ -48064,7 +48091,7 @@ ${lanes.join("\n")}
           if (localSymbol.declarations) {
             addRelatedInfo(
               diagnostic,
-              ...map(localSymbol.declarations, (decl, index) => createDiagnosticForNode(decl, index === 0 ? Diagnostics._0_is_declared_here_Colon : Diagnostics.and_here_Colon, declarationName))
+              ...map(localSymbol.declarations, (decl, index) => createDiagnosticForNode(decl, index === 0 ? Diagnostics._0_is_declared_here : Diagnostics.and_here, declarationName))
             );
           }
         }
@@ -50801,6 +50828,7 @@ ${lanes.join("\n")}
         );
       }
       function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
+        var _a;
         const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
         if (suppressAny)
           context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -50936,6 +50964,20 @@ ${lanes.join("\n")}
         if (typeArguments) {
           node.typeArguments = factory.createNodeArray(typeArguments);
         }
+        if (((_a = signature.declaration) == null ? void 0 : _a.kind) === 330 /* JSDocSignature */ && signature.declaration.parent.kind === 346 /* JSDocOverloadTag */) {
+          const comment = getTextOfNode(
+            signature.declaration.parent.parent,
+            /*includeTrivia*/
+            true
+          ).slice(2, -2).split(/\r\n|\n|\r/).map((line) => line.replace(/^\s+/, " ")).join("\n");
+          addSyntheticLeadingComment(
+            node,
+            3 /* MultiLineCommentTrivia */,
+            comment,
+            /*hasTrailingNewLine*/
+            true
+          );
+        }
         cleanup == null ? void 0 : cleanup();
         return node;
       }
@@ -54109,11 +54151,11 @@ ${lanes.join("\n")}
                 const exportedMemberName = ((_a = tryCast(exportedMember.valueDeclaration, isNamedDeclaration)) == null ? void 0 : _a.name) || exportedMember.valueDeclaration;
                 addRelatedInfo(
                   error2(s.valueDeclaration, Diagnostics.Duplicate_identifier_0, unescapedName),
-                  createDiagnosticForNode(exportedMemberName, Diagnostics._0_was_also_declared_here_Colon, unescapedName)
+                  createDiagnosticForNode(exportedMemberName, Diagnostics._0_was_also_declared_here, unescapedName)
                 );
                 addRelatedInfo(
                   error2(exportedMemberName, Diagnostics.Duplicate_identifier_0, unescapedName),
-                  createDiagnosticForNode(s.valueDeclaration, Diagnostics._0_was_also_declared_here_Colon, unescapedName)
+                  createDiagnosticForNode(s.valueDeclaration, Diagnostics._0_was_also_declared_here, unescapedName)
                 );
               }
               const union = createSymbol(s.flags | exportedMember.flags, name);
@@ -55348,7 +55390,7 @@ ${lanes.join("\n")}
           if (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol) {
             const declarations = earlySymbol ? concatenate(earlySymbol.declarations, lateSymbol.declarations) : lateSymbol.declarations;
             const name = !(type.flags & 8192 /* UniqueESSymbol */) && unescapeLeadingUnderscores(memberName) || declarationNameToString(declName);
-            forEach(declarations, (declaration) => error2(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here_Colon, name));
+            forEach(declarations, (declaration) => error2(getNameOfDeclaration(declaration) || declaration, Diagnostics.Property_0_was_also_declared_here, name));
             error2(declName || decl, Diagnostics.Duplicate_property_0, name);
             lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */);
           }
@@ -60260,7 +60302,7 @@ ${lanes.join("\n")}
           if (moduleSymbol.flags & targetMeaning) {
             links.resolvedType = resolveImportSymbolType(node, links, moduleSymbol, targetMeaning);
           } else {
-            const errorMessage = targetMeaning === 111551 /* Value */ ? Diagnostics.Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here_Colon : Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0;
+            const errorMessage = targetMeaning === 111551 /* Value */ ? Diagnostics.Module_0_does_not_refer_to_a_value_but_is_used_as_a_value_here : Diagnostics.Module_0_does_not_refer_to_a_type_but_is_used_as_a_type_here_Did_you_mean_typeof_import_0;
             error2(node, errorMessage, node.argument.literal.text);
             links.resolvedSymbol = unknownSymbol;
             links.resolvedType = errorType;
@@ -64021,7 +64063,7 @@ ${lanes.join("\n")}
           );
           reportError(Diagnostics.Property_0_is_missing_in_type_1_but_required_in_type_2, propName, ...getTypeNamesForErrorDisplay(source2, target2));
           if (length(unmatchedProperty.declarations)) {
-            associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here_Colon, propName));
+            associateRelatedInfo(createDiagnosticForNode(unmatchedProperty.declarations[0], Diagnostics._0_is_declared_here, propName));
           }
           if (shouldSkipElaboration && errorInfo) {
             overrideNextErrorInfo++;
@@ -65599,17 +65641,18 @@ ${lanes.join("\n")}
       );
     }
     function inferTypeForHomomorphicMappedType(source, target, constraint) {
-      if (inInferTypeForHomomorphicMappedType) {
-        return void 0;
+      const cacheKey = source.id + "," + target.id + "," + constraint.id;
+      if (reverseMappedCache.has(cacheKey)) {
+        return reverseMappedCache.get(cacheKey);
       }
-      const key = source.id + "," + target.id + "," + constraint.id;
-      if (reverseMappedCache.has(key)) {
-        return reverseMappedCache.get(key);
+      const recursionKey = source.id + "," + (target.target || target).id;
+      if (contains(homomorphicMappedTypeInferenceStack, recursionKey)) {
+        return void 0;
       }
-      inInferTypeForHomomorphicMappedType = true;
+      homomorphicMappedTypeInferenceStack.push(recursionKey);
       const type = createReverseMappedType(source, target, constraint);
-      inInferTypeForHomomorphicMappedType = false;
-      reverseMappedCache.set(key, type);
+      homomorphicMappedTypeInferenceStack.pop();
+      reverseMappedCache.set(cacheKey, type);
       return type;
     }
     function isPartiallyInferableType(type) {
@@ -71796,7 +71839,7 @@ ${lanes.join("\n")}
       if (diagnosticMessage) {
         addRelatedInfo(
           diagnosticMessage,
-          createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here_Colon, declarationName)
+          createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here, declarationName)
         );
       }
     }
@@ -71883,7 +71926,7 @@ ${lanes.join("\n")}
               const suggestedName = symbolName(suggestion);
               const message = isUncheckedJS ? Diagnostics.Property_0_may_not_exist_on_type_1_Did_you_mean_2 : Diagnostics.Property_0_does_not_exist_on_type_1_Did_you_mean_2;
               errorInfo = chainDiagnosticMessages(errorInfo, message, missingProperty, container, suggestedName);
-              relatedInfo = suggestion.valueDeclaration && createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestedName);
+              relatedInfo = suggestion.valueDeclaration && createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestedName);
             } else {
               const diagnostic = containerSeemsToBeEmptyDomElement(containingType) ? Diagnostics.Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom : Diagnostics.Property_0_does_not_exist_on_type_1;
               errorInfo = chainDiagnosticMessages(elaborateNeverIntersection(errorInfo, containingType), diagnostic, missingProperty, container);
@@ -72600,7 +72643,7 @@ ${lanes.join("\n")}
           const diag2 = createDiagnosticForNode(node.tagName, Diagnostics.Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3, entityNameToString(node.tagName), absoluteMinArgCount, entityNameToString(factory2), maxParamCount);
           const tagNameDeclaration = (_a = getSymbolAtLocation(node.tagName)) == null ? void 0 : _a.valueDeclaration;
           if (tagNameDeclaration) {
-            addRelatedInfo(diag2, createDiagnosticForNode(tagNameDeclaration, Diagnostics._0_is_declared_here_Colon, entityNameToString(node.tagName)));
+            addRelatedInfo(diag2, createDiagnosticForNode(tagNameDeclaration, Diagnostics._0_is_declared_here, entityNameToString(node.tagName)));
           }
           if (errorOutputContainer && errorOutputContainer.skipLogging) {
             (errorOutputContainer.errors || (errorOutputContainer.errors = [])).push(diag2);
@@ -73052,7 +73095,7 @@ ${lanes.join("\n")}
             if (diags) {
               for (const d of diags) {
                 if (last2.declaration && candidatesForArgumentError.length > 3) {
-                  addRelatedInfo(d, createDiagnosticForNode(last2.declaration, Diagnostics.The_last_overload_is_declared_here_Colon));
+                  addRelatedInfo(d, createDiagnosticForNode(last2.declaration, Diagnostics.The_last_overload_is_declared_here));
                 }
                 addImplementationSuccessElaboration(last2, d);
                 diagnostics.add(d);
@@ -78192,7 +78235,7 @@ ${lanes.join("\n")}
               const errorNode = signature.declaration && isJSDocSignature(signature.declaration) ? signature.declaration.parent.tagName : signature.declaration;
               addRelatedInfo(
                 error2(errorNode, Diagnostics.This_overload_signature_is_not_compatible_with_its_implementation_signature),
-                createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here_Colon)
+                createDiagnosticForNode(bodyDeclaration, Diagnostics.The_implementation_signature_is_declared_here)
               );
               break;
             }
@@ -78658,7 +78701,7 @@ ${lanes.join("\n")}
           const diag2 = error2(typeName, Diagnostics.A_type_referenced_in_a_decorated_signature_must_be_imported_with_import_type_or_a_namespace_import_when_isolatedModules_and_emitDecoratorMetadata_are_enabled);
           const aliasDeclaration = find(rootSymbol.declarations || emptyArray, isAliasSymbolDeclaration2);
           if (aliasDeclaration) {
-            addRelatedInfo(diag2, createDiagnosticForNode(aliasDeclaration, Diagnostics._0_was_imported_here_Colon, idText(rootName)));
+            addRelatedInfo(diag2, createDiagnosticForNode(aliasDeclaration, Diagnostics._0_was_imported_here, idText(rootName)));
           }
         }
       }
@@ -79602,7 +79645,7 @@ ${lanes.join("\n")}
       if (firstDeclaration) {
         addRelatedInfo(
           err,
-          createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here_Colon, declName)
+          createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here, declName)
         );
       }
     }
@@ -80712,7 +80755,7 @@ ${lanes.join("\n")}
             typeToString(info.type)
           );
           if (propDeclaration && errorNode !== propDeclaration) {
-            addRelatedInfo(diagnostic, createDiagnosticForNode(propDeclaration, Diagnostics._0_is_declared_here_Colon, symbolToString(prop)));
+            addRelatedInfo(diagnostic, createDiagnosticForNode(propDeclaration, Diagnostics._0_is_declared_here, symbolToString(prop)));
           }
           diagnostics.add(diagnostic);
         }
@@ -85047,7 +85090,7 @@ ${lanes.join("\n")}
                 createDiagnosticForNode(useStrictDirective, Diagnostics.use_strict_directive_used_here)
               );
             });
-            const diagnostics2 = nonSimpleParameters.map((parameter, index) => index === 0 ? createDiagnosticForNode(parameter, Diagnostics.Non_simple_parameter_declared_here_Colon) : createDiagnosticForNode(parameter, Diagnostics.and_here_Colon));
+            const diagnostics2 = nonSimpleParameters.map((parameter, index) => index === 0 ? createDiagnosticForNode(parameter, Diagnostics.Non_simple_parameter_declared_here) : createDiagnosticForNode(parameter, Diagnostics.and_here));
             addRelatedInfo(error2(useStrictDirective, Diagnostics.use_strict_directive_cannot_be_used_with_non_simple_parameter_list), ...diagnostics2);
             return true;
           }
@@ -116956,14 +116999,14 @@ ${lanes.join("\n")}
   });
 
   // src/compiler/watchUtilities.ts
-  function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames) {
+  function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames2) {
     if (!host.getDirectories || !host.readDirectory) {
       return void 0;
     }
     const cachedReadDirectoryResult = /* @__PURE__ */ new Map();
-    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     return {
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       fileExists,
       readFile: (path, encoding) => host.readFile(path, encoding),
       directoryExists: host.directoryExists && directoryExists,
@@ -117085,7 +117128,7 @@ ${lanes.join("\n")}
       const rootResult = tryReadDirectory2(rootDir, rootDirPath);
       let rootSymLinkResult;
       if (rootResult !== void 0) {
-        return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
+        return matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames2, currentDirectory, depth, getFileSystemEntries, realpath);
       }
       return host.readDirectory(rootDir, extensions, excludes, includes, depth);
       function getFileSystemEntries(dir) {
@@ -117280,7 +117323,7 @@ ${lanes.join("\n")}
     program,
     extraFileExtensions,
     currentDirectory,
-    useCaseSensitiveFileNames,
+    useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
     writeLog,
     toPath: toPath3
   }) {
@@ -117296,7 +117339,7 @@ ${lanes.join("\n")}
       writeLog(`Project: ${configFileName} Detected file add/remove of non supported extension: ${fileOrDirectory}`);
       return true;
     }
-    if (isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, getNormalizedAbsolutePath(getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames, currentDirectory)) {
+    if (isExcludedFile(fileOrDirectory, options.configFile.configFileSpecs, getNormalizedAbsolutePath(getDirectoryPath(configFileName), currentDirectory), useCaseSensitiveFileNames2, currentDirectory)) {
       writeLog(`Project: ${configFileName} Detected excluded file: ${fileOrDirectory}`);
       return true;
     }
@@ -117353,7 +117396,7 @@ ${lanes.join("\n")}
     function createExcludeHandlingAddWatch(key) {
       return (file, cb, flags, options, detailInfo1, detailInfo2) => {
         var _a;
-        return !matchesExclude(file, key === "watchFile" ? options == null ? void 0 : options.excludeFiles : options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames(), ((_a = host.getCurrentDirectory) == null ? void 0 : _a.call(host)) || "") ? factory2[key].call(
+        return !matchesExclude(file, key === "watchFile" ? options == null ? void 0 : options.excludeFiles : options == null ? void 0 : options.excludeDirectories, useCaseSensitiveFileNames2(), ((_a = host.getCurrentDirectory) == null ? void 0 : _a.call(host)) || "") ? factory2[key].call(
           /*thisArgs*/
           void 0,
           file,
@@ -117365,7 +117408,7 @@ ${lanes.join("\n")}
         ) : excludeWatcherFactory(file, flags, options, detailInfo1, detailInfo2);
       };
     }
-    function useCaseSensitiveFileNames() {
+    function useCaseSensitiveFileNames2() {
       return typeof host.useCaseSensitiveFileNames === "boolean" ? host.useCaseSensitiveFileNames : host.useCaseSensitiveFileNames();
     }
     function createExcludeWatcherWithLogging(file, flags, options, detailInfo1, detailInfo2) {
@@ -117731,49 +117774,39 @@ ${lanes.join("\n")}
   function formatColorAndReset(text, formatStyle) {
     return formatStyle + text + resetEscapeSequence;
   }
-  function formatCodeSpan(file, start, length2, indent2, underlineColor, host) {
+  function formatCodeSpan(file, start, length2, indent3, squiggleColor, host) {
     const { line: firstLine, character: firstLineChar } = getLineAndCharacterOfPosition(file, start);
     const { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start + length2);
     const lastLineInFile = getLineAndCharacterOfPosition(file, file.text.length).line;
-    const gutterWidth = 1;
     const hasMoreThanFiveLines = lastLine - firstLine >= 4;
-    let whitespaceToTrim = Number.MAX_VALUE;
-    for (let i = firstLine; i <= lastLine; i++) {
-      if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-        i = lastLine - 1;
-      }
-      const lineStart = getPositionOfLineAndCharacter(file, i, 0);
-      const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
-      const lineContent = file.text.slice(lineStart, lineEnd);
-      whitespaceToTrim = Math.min(whitespaceToTrim, startWhitespaceCount(lineContent));
+    let gutterWidth = (lastLine + 1 + "").length;
+    if (hasMoreThanFiveLines) {
+      gutterWidth = Math.max(ellipsis.length, gutterWidth);
     }
     let context = "";
     for (let i = firstLine; i <= lastLine; i++) {
       context += host.getNewLine();
       if (hasMoreThanFiveLines && firstLine + 1 < i && i < lastLine - 1) {
-        context += indent2 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
+        context += indent3 + formatColorAndReset(padLeft(ellipsis, gutterWidth), gutterStyleSequence) + gutterSeparator + host.getNewLine();
         i = lastLine - 1;
       }
       const lineStart = getPositionOfLineAndCharacter(file, i, 0);
       const lineEnd = i < lastLineInFile ? getPositionOfLineAndCharacter(file, i + 1, 0) : file.text.length;
       let lineContent = file.text.slice(lineStart, lineEnd);
-      lineContent = lineContent.slice(whitespaceToTrim);
       lineContent = trimStringEnd(lineContent);
       lineContent = lineContent.replace(/\t/g, " ");
-      const gutterLine = "|";
-      context += indent2 + padLeft(gutterLine, gutterWidth) + gutterSeparator;
+      context += indent3 + formatColorAndReset(padLeft(i + 1 + "", gutterWidth), gutterStyleSequence) + gutterSeparator;
       context += lineContent + host.getNewLine();
-      context += indent2 + padLeft("", gutterWidth) + gutterSeparator;
-      context += underlineColor;
+      context += indent3 + formatColorAndReset(padLeft("", gutterWidth), gutterStyleSequence) + gutterSeparator;
+      context += squiggleColor;
       if (i === firstLine) {
         const lastCharForLine = i === lastLine ? lastLineChar : void 0;
-        context += lineContent.slice(0, firstLineChar - whitespaceToTrim).replace(/\S/g, " ");
-        const amendedLastChar = lastCharForLine ? lastCharForLine - whitespaceToTrim : void 0;
-        context += lineContent.slice(firstLineChar - whitespaceToTrim, amendedLastChar).replace(/./g, "\u2594");
+        context += lineContent.slice(0, firstLineChar).replace(/\S/g, " ");
+        context += lineContent.slice(firstLineChar, lastCharForLine).replace(/./g, "~");
       } else if (i === lastLine) {
-        context += lineContent.slice(0, lastLineChar).replace(/./g, "\u2594");
+        context += lineContent.slice(0, lastLineChar).replace(/./g, "~");
       } else {
-        context += lineContent.replace(/./g, "\u2594");
+        context += lineContent.replace(/./g, "~");
       }
       context += resetEscapeSequence;
     }
@@ -117791,87 +117824,54 @@ ${lanes.join("\n")}
     return output;
   }
   function formatDiagnosticsWithColorAndContext(diagnostics, host) {
-    var _a, _b;
-    const terminalWidth = ((_b = (_a = sys).getWidthOfTerminal) == null ? void 0 : _b.call(_a)) ?? 0;
-    const indent2 = terminalWidth < 60 ? "" : halfIndent;
     let output = "";
     for (const diagnostic of diagnostics) {
-      const diagnosticCode = "TS" + diagnostic.code;
-      const diagnosticCatName = diagnosticCategoryName(
-        diagnostic,
-        /*lowerCase*/
-        false
-      );
-      const diagnosticCatNameColored = formatColorAndReset(diagnosticCatName, getCategoryFormat(diagnostic.category));
-      if (diagnostic.file && diagnostic.code !== Diagnostics.File_appears_to_be_binary.code) {
+      if (diagnostic.file) {
         const { file, start } = diagnostic;
-        const location = formatLocation(file, start, host);
-        const locationLength = location.replace(/\u001b[[0-9]+m/g, "").length;
-        const codeLength = diagnosticCode.length;
-        output += formatColorAndReset(bullet, getCategoryFormat(diagnostic.category)) + location;
-        const defaultPad = codeLength + 1;
-        let padWidth = terminalWidth < 60 ? defaultPad : terminalWidth - (bullet.length + locationLength + codeLength + diagnosticCatName.length + 2);
-        if (padWidth < diagnosticCode.length)
-          padWidth = defaultPad;
-        output += padLeft(diagnosticCatNameColored, padWidth + (diagnosticCatNameColored.length - diagnosticCatName.length));
-        output += " " + diagnosticCode;
-        output += formatCodeSpan(diagnostic.file, diagnostic.start, diagnostic.length, indent2, getCategoryFormat(diagnostic.category), host);
+        output += formatLocation(file, start, host);
+        output += " - ";
+      }
+      output += formatColorAndReset(diagnosticCategoryName(diagnostic), getCategoryFormat(diagnostic.category));
+      output += formatColorAndReset(` TS${diagnostic.code}: `, "\x1B[90m" /* Grey */);
+      output += flattenDiagnosticMessageText(diagnostic.messageText, host.getNewLine());
+      if (diagnostic.file && diagnostic.code !== Diagnostics.File_appears_to_be_binary.code) {
         output += host.getNewLine();
-      } else {
-        output += formatColorAndReset(bullet, getCategoryFormat(diagnostic.category)) + " " + diagnosticCatNameColored + " " + diagnosticCode;
+        output += formatCodeSpan(diagnostic.file, diagnostic.start, diagnostic.length, "", getCategoryFormat(diagnostic.category), host);
       }
-      let diagnosticText = flattenDiagnosticMessageText(
-        diagnostic.messageText,
-        host.getNewLine(),
-        0,
-        /*pretty*/
-        true
-      );
-      diagnosticText = diagnosticText.split(host.getNewLine()).map((text) => indent2 + text).join(host.getNewLine());
-      output += diagnosticText;
-      output += host.getNewLine();
       if (diagnostic.relatedInformation) {
         output += host.getNewLine();
         for (const { file, start, length: length2, messageText } of diagnostic.relatedInformation) {
-          output += indent2 + trimStringStart(flattenDiagnosticMessageText(
-            messageText,
-            host.getNewLine(),
-            0,
-            /*pretty*/
-            true
-          ));
           if (file) {
-            output += " " + formatLocation(file, start, host);
             output += host.getNewLine();
-            output += formatCodeSpan(file, start, length2, indent2 + "  ", "\x1B[96m" /* Cyan */, host);
+            output += halfIndent + formatLocation(file, start, host);
+            output += formatCodeSpan(file, start, length2, indent, "\x1B[96m" /* Cyan */, host);
           }
+          output += host.getNewLine();
+          output += indent + flattenDiagnosticMessageText(messageText, host.getNewLine());
         }
       }
+      output += host.getNewLine();
     }
     return output;
   }
-  function flattenDiagnosticMessageText(diag2, newLine, indent2 = 0, pretty = false) {
+  function flattenDiagnosticMessageText(diag2, newLine, indent3 = 0) {
     if (isString(diag2)) {
       return diag2;
     } else if (diag2 === void 0) {
       return "";
     }
     let result = "";
-    if (indent2) {
+    if (indent3) {
       result += newLine;
-      const indentsToReplaceWithNewLines = pretty ? 1 : 0;
-      if (indent2 > indentsToReplaceWithNewLines) {
-        for (let i = indentsToReplaceWithNewLines; i < indent2; i++) {
-          result += "  ";
-        }
-      } else
-        result += newLine;
+      for (let i = 0; i < indent3; i++) {
+        result += "  ";
+      }
     }
     result += diag2.messageText;
-    indent2++;
+    indent3++;
     if (diag2.next) {
       for (const kid of diag2.next) {
-        result += flattenDiagnosticMessageText(kid, newLine, indent2);
+        result += flattenDiagnosticMessageText(kid, newLine, indent3);
       }
     }
     return result;
@@ -120867,16 +120867,16 @@ ${lanes.join("\n")}
         let message2;
         switch (reason.kind) {
           case 3 /* Import */:
-            message2 = Diagnostics.File_is_included_via_import_here_Colon;
+            message2 = Diagnostics.File_is_included_via_import_here;
             break;
           case 4 /* ReferenceFile */:
-            message2 = Diagnostics.File_is_included_via_reference_here_Colon;
+            message2 = Diagnostics.File_is_included_via_reference_here;
             break;
           case 5 /* TypeReferenceDirective */:
-            message2 = Diagnostics.File_is_included_via_type_library_reference_here_Colon;
+            message2 = Diagnostics.File_is_included_via_type_library_reference_here;
             break;
           case 7 /* LibReferenceDirective */:
-            message2 = Diagnostics.File_is_included_via_library_reference_here_Colon;
+            message2 = Diagnostics.File_is_included_via_library_reference_here;
             break;
           default:
             Debug.assertNever(reason);
@@ -120900,14 +120900,14 @@ ${lanes.join("\n")}
           const matchedByFiles = getMatchedFileSpec(program, fileName);
           if (matchedByFiles) {
             configFileNode = getTsConfigPropArrayElementValue(options.configFile, "files", matchedByFiles);
-            message = Diagnostics.File_is_matched_by_files_list_specified_here_Colon;
+            message = Diagnostics.File_is_matched_by_files_list_specified_here;
             break;
           }
           const matchedByInclude = getMatchedIncludeSpec(program, fileName);
           if (!matchedByInclude || !isString(matchedByInclude))
             return void 0;
           configFileNode = getTsConfigPropArrayElementValue(options.configFile, "include", matchedByInclude);
-          message = Diagnostics.File_is_matched_by_include_pattern_specified_here_Colon;
+          message = Diagnostics.File_is_matched_by_include_pattern_specified_here;
           break;
         case 1 /* SourceFromProjectReference */:
         case 2 /* OutputFromProjectReference */:
@@ -120928,23 +120928,23 @@ ${lanes.join("\n")}
           return referencesSyntax && referencesSyntax.elements.length > index ? createDiagnosticForNodeInSourceFile(
             sourceFile,
             referencesSyntax.elements[index],
-            reason.kind === 2 /* OutputFromProjectReference */ ? Diagnostics.File_is_output_from_referenced_project_specified_here_Colon : Diagnostics.File_is_source_from_referenced_project_specified_here_Colon
+            reason.kind === 2 /* OutputFromProjectReference */ ? Diagnostics.File_is_output_from_referenced_project_specified_here : Diagnostics.File_is_source_from_referenced_project_specified_here
           ) : void 0;
         case 8 /* AutomaticTypeDirectiveFile */:
           if (!options.types)
             return void 0;
           configFileNode = getOptionsSyntaxByArrayElementValue("types", reason.typeReference);
-          message = Diagnostics.File_is_entry_point_of_type_library_specified_here_Colon;
+          message = Diagnostics.File_is_entry_point_of_type_library_specified_here;
           break;
         case 6 /* LibFile */:
           if (reason.index !== void 0) {
             configFileNode = getOptionsSyntaxByArrayElementValue("lib", options.lib[reason.index]);
-            message = Diagnostics.File_is_library_specified_here_Colon;
+            message = Diagnostics.File_is_library_specified_here;
             break;
           }
           const target = forEachEntry(targetOptionDeclaration.type, (value, key) => value === getEmitScriptTarget(options) ? key : void 0);
           configFileNode = target ? getOptionsSyntaxByValue("target", target) : void 0;
-          message = Diagnostics.File_is_default_library_for_target_specified_here_Colon;
+          message = Diagnostics.File_is_default_library_for_target_specified_here;
           break;
         default:
           Debug.assertNever(reason);
@@ -121348,6 +121348,9 @@ ${lanes.join("\n")}
         return directoryStructureHost.readDirectory(root, extensions, excludes, includes, depth);
       },
       readFile: (f) => directoryStructureHost.readFile(f),
+      directoryExists: maybeBind(directoryStructureHost, directoryStructureHost.directoryExists),
+      getDirectories: maybeBind(directoryStructureHost, directoryStructureHost.getDirectories),
+      realpath: maybeBind(directoryStructureHost, directoryStructureHost.realpath),
       useCaseSensitiveFileNames: host.useCaseSensitiveFileNames(),
       getCurrentDirectory: () => host.getCurrentDirectory(),
       onUnRecoverableConfigFileDiagnostic: host.onUnRecoverableConfigFileDiagnostic || returnUndefined,
@@ -121436,7 +121439,7 @@ ${lanes.join("\n")}
     }
     Debug.fail("should never ask for module name at index higher than possible module name");
   }
-  var ForegroundColorEscapeSequences, gutterStyleSequence, gutterSeparator, resetEscapeSequence, ellipsis, halfIndent, bullet, emptyResolution, moduleResolutionNameAndModeGetter, typeReferenceResolutionNameAndModeGetter, inferredTypesContainingFile, plainJSErrors, emitSkippedWithNoDiagnostics;
+  var ForegroundColorEscapeSequences, gutterStyleSequence, gutterSeparator, resetEscapeSequence, ellipsis, halfIndent, indent, emptyResolution, moduleResolutionNameAndModeGetter, typeReferenceResolutionNameAndModeGetter, inferredTypesContainingFile, plainJSErrors, emitSkippedWithNoDiagnostics;
   var init_program = __esm({
     "src/compiler/program.ts"() {
       "use strict";
@@ -121455,7 +121458,7 @@ ${lanes.join("\n")}
       resetEscapeSequence = "\x1B[0m";
       ellipsis = "...";
       halfIndent = "  ";
-      bullet = "\u25CF ";
+      indent = "    ";
       emptyResolution = {
         resolvedModule: void 0,
         resolvedTypeReferenceDirective: void 0
@@ -121473,8 +121476,8 @@ ${lanes.join("\n")}
         // binder errors
         Diagnostics.Cannot_redeclare_block_scoped_variable_0.code,
         Diagnostics.A_module_cannot_have_multiple_default_exports.code,
-        Diagnostics.Another_export_default_is_here_Colon.code,
-        Diagnostics.The_first_export_default_is_here_Colon.code,
+        Diagnostics.Another_export_default_is_here.code,
+        Diagnostics.The_first_export_default_is_here.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_at_the_top_level_of_a_module.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode.code,
         Diagnostics.Identifier_expected_0_is_a_reserved_word_that_cannot_be_used_here.code,
@@ -124543,12 +124546,12 @@ ${lanes.join("\n")}
       return true;
     const isJsonFile = fileExtensionIs(fileName, ".json" /* Json */);
     const basePath = getDirectoryPath(getNormalizedAbsolutePath(configFile.fileName, program.getCurrentDirectory()));
-    const useCaseSensitiveFileNames = program.useCaseSensitiveFileNames();
+    const useCaseSensitiveFileNames2 = program.useCaseSensitiveFileNames();
     return find((_b = configFile == null ? void 0 : configFile.configFileSpecs) == null ? void 0 : _b.validatedIncludeSpecs, (includeSpec) => {
       if (isJsonFile && !endsWith(includeSpec, ".json" /* Json */))
         return false;
       const pattern = getPatternFromSpec(includeSpec, basePath, "files");
-      return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames).test(fileName);
+      return !!pattern && getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames2).test(fileName);
     });
   }
   function fileIncludeReasonToDiagnostics(program, reason, fileNameConvertor) {
@@ -124752,7 +124755,7 @@ ${lanes.join("\n")}
     return result;
   }
   function createCompilerHostFromProgramHost(host, getCompilerOptions, directoryStructureHost = host) {
-    const useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+    const useCaseSensitiveFileNames2 = host.useCaseSensitiveFileNames();
     const compilerHost = {
       getSourceFile: createGetSourceFile(
         (fileName, encoding) => !encoding ? compilerHost.readFile(fileName) : host.readFile(fileName, encoding),
@@ -124768,8 +124771,8 @@ ${lanes.join("\n")}
         (path) => host.directoryExists(path)
       ),
       getCurrentDirectory: memoize(() => host.getCurrentDirectory()),
-      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
-      getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames),
+      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
+      getCanonicalFileName: createGetCanonicalFileName(useCaseSensitiveFileNames2),
       getNewLine: () => getNewLineCharacter(getCompilerOptions()),
       fileExists: (f) => host.fileExists(f),
       readFile: (f) => host.readFile(f),
@@ -125050,7 +125053,7 @@ ${lanes.join("\n")}
     const sourceFilesCache = /* @__PURE__ */ new Map();
     let missingFilePathsRequestedForRelease;
     let hasChangedCompilerOptions = false;
-    const useCaseSensitiveFileNames = host.useCaseSensitiveFileNames();
+    const useCaseSensitiveFileNames2 = host.useCaseSensitiveFileNames();
     const currentDirectory = host.getCurrentDirectory();
     const { configFileName, optionsToExtend: optionsToExtendForConfigFile = {}, watchOptionsToExtend, extraFileExtensions, createProgram: createProgram2 } = host;
     let { rootFiles: rootFileNames, options: compilerOptions, watchOptions, projectReferences } = host;
@@ -125058,7 +125061,7 @@ ${lanes.join("\n")}
     let configFileParsingDiagnostics;
     let canConfigFileJsonReportNoInputFiles = false;
     let hasChangedConfigFileParsingErrors = false;
-    const cachedDirectoryStructureHost = configFileName === void 0 ? void 0 : createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames);
+    const cachedDirectoryStructureHost = configFileName === void 0 ? void 0 : createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensitiveFileNames2);
     const directoryStructureHost = cachedDirectoryStructureHost || host;
     const parseConfigFileHost = parseConfigHostFromCompilerHostLike(host, directoryStructureHost);
     let newLine = updateNewLine();
@@ -125076,8 +125079,8 @@ ${lanes.join("\n")}
     Debug.assert(compilerOptions);
     Debug.assert(rootFileNames);
     const { watchFile: watchFile2, watchDirectory, writeLog } = createWatchFactory(host, compilerOptions);
-    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
-    writeLog(`Current directory: ${currentDirectory} CaseSensitiveFileNames: ${useCaseSensitiveFileNames}`);
+    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
+    writeLog(`Current directory: ${currentDirectory} CaseSensitiveFileNames: ${useCaseSensitiveFileNames2}`);
     let configFileWatcher;
     if (configFileName) {
       configFileWatcher = watchFile2(configFileName, scheduleProgramReload, 2e3 /* High */, watchOptions, WatchType.ConfigFile);
@@ -125583,7 +125586,7 @@ ${lanes.join("\n")}
             options: compilerOptions,
             program: getCurrentBuilderProgram() || rootFileNames,
             currentDirectory,
-            useCaseSensitiveFileNames,
+            useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
             writeLog,
             toPath: toPath3
           }))
@@ -125673,7 +125676,7 @@ ${lanes.join("\n")}
                   options: config.parsedCommandLine.options,
                   program: config.parsedCommandLine.fileNames,
                   currentDirectory,
-                  useCaseSensitiveFileNames,
+                  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
                   writeLog,
                   toPath: toPath3
                 }))
@@ -130184,7 +130187,7 @@ ${lanes.join("\n")}
     const absoluteMaximumLength = defaultMaximumTruncationLength * 10;
     let displayParts;
     let lineStart;
-    let indent2;
+    let indent3;
     let length2;
     resetWriter();
     const unknownWrite = (text) => writeKind(text, 17 /* text */);
@@ -130220,12 +130223,12 @@ ${lanes.join("\n")}
       hasTrailingWhitespace: () => false,
       hasTrailingComment: () => false,
       rawWrite: notImplemented,
-      getIndent: () => indent2,
+      getIndent: () => indent3,
       increaseIndent: () => {
-        indent2++;
+        indent3++;
       },
       decreaseIndent: () => {
-        indent2--;
+        indent3--;
       },
       clear: resetWriter
     };
@@ -130233,7 +130236,7 @@ ${lanes.join("\n")}
       if (length2 > absoluteMaximumLength)
         return;
       if (lineStart) {
-        const indentString = getIndentString(indent2);
+        const indentString = getIndentString(indent3);
         if (indentString) {
           length2 += indentString.length;
           displayParts.push(displayPart(indentString, 16 /* space */));
@@ -130265,7 +130268,7 @@ ${lanes.join("\n")}
     function resetWriter() {
       displayParts = [];
       lineStart = true;
-      indent2 = 0;
+      indent3 = 0;
       length2 = 0;
     }
   }
@@ -131569,10 +131572,10 @@ ${lanes.join("\n")}
   }
   function forEachExternalModuleToImportFrom(program, host, preferences, useAutoImportProvider, cb) {
     var _a, _b;
-    const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
+    const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
     const excludePatterns = preferences.autoImportFileExcludePatterns && mapDefined(preferences.autoImportFileExcludePatterns, (spec) => {
       const pattern = getPatternFromSpec(spec, "", "exclude");
-      return pattern ? getRegexFromPattern(pattern, useCaseSensitiveFileNames) : void 0;
+      return pattern ? getRegexFromPattern(pattern, useCaseSensitiveFileNames2) : void 0;
     });
     forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), excludePatterns, (module2, file) => cb(
       module2,
@@ -133068,12 +133071,12 @@ ${lanes.join("\n")}
   function isDocumentRegistryEntry(entry) {
     return !!entry.sourceFile;
   }
-  function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
-    return createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory);
+  function createDocumentRegistry(useCaseSensitiveFileNames2, currentDirectory) {
+    return createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory);
   }
-  function createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory = "", externalCache) {
+  function createDocumentRegistryInternal(useCaseSensitiveFileNames2, currentDirectory = "", externalCache) {
     const buckets = /* @__PURE__ */ new Map();
-    const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames);
+    const getCanonicalFileName = createGetCanonicalFileName(!!useCaseSensitiveFileNames2);
     function reportStats() {
       const bucketInfoArray = arrayFrom(buckets.keys()).filter((name) => name && name.charAt(0) === "_").map((name) => {
         const entries = buckets.get(name);
@@ -133282,12 +133285,12 @@ ${lanes.join("\n")}
 
   // src/services/getEditsForFileRename.ts
   function getEditsForFileRename(program, oldFileOrDirPath, newFileOrDirPath, host, formatContext, preferences, sourceMapper) {
-    const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
-    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
+    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     const oldToNew = getPathUpdater(oldFileOrDirPath, newFileOrDirPath, getCanonicalFileName, sourceMapper);
     const newToOld = getPathUpdater(newFileOrDirPath, oldFileOrDirPath, getCanonicalFileName, sourceMapper);
     return ts_textChanges_exports.ChangeTracker.with({ host, formatContext, preferences }, (changeTracker) => {
-      updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, host.getCurrentDirectory(), useCaseSensitiveFileNames);
+      updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, host.getCurrentDirectory(), useCaseSensitiveFileNames2);
       updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName);
     });
   }
@@ -133309,7 +133312,7 @@ ${lanes.join("\n")}
     const rel = getRelativePathFromFile(a0, b0, getCanonicalFileName);
     return combinePathsSafe(getDirectoryPath(a1), rel);
   }
-  function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, currentDirectory, useCaseSensitiveFileNames) {
+  function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath, newFileOrDirPath, currentDirectory, useCaseSensitiveFileNames2) {
     const { configFile } = program.getCompilerOptions();
     if (!configFile)
       return;
@@ -133333,10 +133336,10 @@ ${lanes.join("\n")}
             /*excludes*/
             [],
             includes,
-            useCaseSensitiveFileNames,
+            useCaseSensitiveFileNames2,
             currentDirectory
           );
-          if (getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(oldFileOrDirPath) && !getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames).test(newFileOrDirPath)) {
+          if (getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames2).test(oldFileOrDirPath) && !getRegexFromPattern(Debug.checkDefined(matchers.includeFilePattern), useCaseSensitiveFileNames2).test(newFileOrDirPath)) {
             changeTracker.insertNodeAfter(configFile, last(property.initializer.elements), factory.createStringLiteral(relativePath(newFileOrDirPath)));
           }
           return;
@@ -133384,7 +133387,7 @@ ${lanes.join("\n")}
         configDir,
         path,
         /*ignoreCase*/
-        !useCaseSensitiveFileNames
+        !useCaseSensitiveFileNames2
       );
     }
   }
@@ -136698,7 +136701,7 @@ ${lanes.join("\n")}
     const body = addExports(oldFile, toMove.all, usage.oldFileImportsFromTargetFile, useEsModuleSyntax);
     if (typeof targetFile !== "string") {
       if (targetFile.statements.length > 0) {
-        changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], body);
+        moveStatementsToTargetFile(changes, program, body, targetFile, toMove);
       } else {
         changes.insertNodesAtEndOfFile(
           targetFile,
@@ -137491,6 +137494,67 @@ ${lanes.join("\n")}
         return false;
     }
   }
+  function moveStatementsToTargetFile(changes, program, statements, targetFile, toMove) {
+    var _a;
+    const removedExports = /* @__PURE__ */ new Set();
+    const targetExports = (_a = targetFile.symbol) == null ? void 0 : _a.exports;
+    if (targetExports) {
+      const checker = program.getTypeChecker();
+      const targetToSourceExports = /* @__PURE__ */ new Map();
+      for (const node of toMove.all) {
+        if (isTopLevelDeclarationStatement(node) && hasSyntacticModifier(node, 1 /* Export */)) {
+          forEachTopLevelDeclaration(node, (declaration) => {
+            var _a2;
+            const targetDeclarations = canHaveSymbol(declaration) ? (_a2 = targetExports.get(declaration.symbol.escapedName)) == null ? void 0 : _a2.declarations : void 0;
+            const exportDeclaration = firstDefined(targetDeclarations, (d) => isExportDeclaration(d) ? d : isExportSpecifier(d) ? tryCast(d.parent.parent, isExportDeclaration) : void 0);
+            if (exportDeclaration && exportDeclaration.moduleSpecifier) {
+              targetToSourceExports.set(
+                exportDeclaration,
+                (targetToSourceExports.get(exportDeclaration) || /* @__PURE__ */ new Set()).add(declaration)
+              );
+            }
+          });
+        }
+      }
+      for (const [exportDeclaration, topLevelDeclarations] of arrayFrom(targetToSourceExports)) {
+        if (exportDeclaration.exportClause && isNamedExports(exportDeclaration.exportClause) && length(exportDeclaration.exportClause.elements)) {
+          const elements = exportDeclaration.exportClause.elements;
+          const updatedElements = filter(elements, (elem) => find(skipAlias(elem.symbol, checker).declarations, (d) => isTopLevelDeclaration(d) && topLevelDeclarations.has(d)) === void 0);
+          if (length(updatedElements) === 0) {
+            changes.deleteNode(targetFile, exportDeclaration);
+            removedExports.add(exportDeclaration);
+            continue;
+          }
+          if (length(updatedElements) < length(elements)) {
+            changes.replaceNode(
+              targetFile,
+              exportDeclaration,
+              factory.updateExportDeclaration(
+                exportDeclaration,
+                exportDeclaration.modifiers,
+                exportDeclaration.isTypeOnly,
+                factory.updateNamedExports(exportDeclaration.exportClause, factory.createNodeArray(updatedElements, elements.hasTrailingComma)),
+                exportDeclaration.moduleSpecifier,
+                exportDeclaration.assertClause
+              )
+            );
+          }
+        }
+      }
+    }
+    const lastReExport = findLast(targetFile.statements, (n) => isExportDeclaration(n) && !!n.moduleSpecifier && !removedExports.has(n));
+    if (lastReExport) {
+      changes.insertNodesBefore(
+        targetFile,
+        lastReExport,
+        statements,
+        /*blankLineBetween*/
+        true
+      );
+    } else {
+      changes.insertNodesAfter(targetFile, targetFile.statements[targetFile.statements.length - 1], statements);
+    }
+  }
   function getOverloadRangeToMove(sourceFile, statement) {
     if (isFunctionLikeDeclaration(statement)) {
       const declarations = statement.symbol.declarations;
@@ -141526,10 +141590,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         host.log(message);
       }
     }
-    const useCaseSensitiveFileNames = hostUsesCaseSensitiveFileNames(host);
-    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames);
+    const useCaseSensitiveFileNames2 = hostUsesCaseSensitiveFileNames(host);
+    const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames2);
     const sourceMapper = getSourceMapper({
-      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
       getCurrentDirectory: () => currentDirectory,
       getProgram,
       fileExists: maybeBind(host, host.fileExists),
@@ -141577,7 +141641,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         getSourceFileByPath: getOrCreateSourceFileByPath,
         getCancellationToken: () => cancellationToken,
         getCanonicalFileName,
-        useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
         getNewLine: () => getNewLineCharacter(newSettings),
         getDefaultLibFileName: (options2) => host.getDefaultLibFileName(options2),
         writeFile: noop,
@@ -141621,9 +141685,12 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
       compilerHost.getSourceFile = getSourceFileWithCache;
       (_c = host.setCompilerHost) == null ? void 0 : _c.call(host, compilerHost);
       const parseConfigHost = {
-        useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
         fileExists: (fileName) => compilerHost.fileExists(fileName),
         readFile: (fileName) => compilerHost.readFile(fileName),
+        directoryExists: (f) => compilerHost.directoryExists(f),
+        getDirectories: (f) => compilerHost.getDirectories(f),
+        realpath: compilerHost.realpath,
         readDirectory: (...args) => compilerHost.readDirectory(...args),
         trace: compilerHost.trace,
         getCurrentDirectory: compilerHost.getCurrentDirectory,
@@ -149742,7 +149809,7 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0.code,
         Diagnostics.Cannot_find_namespace_0.code,
         Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code,
-        Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here_Colon.code,
+        Diagnostics._0_only_refers_to_a_type_but_is_being_used_as_a_value_here.code,
         Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer.code,
         Diagnostics._0_cannot_be_used_as_a_value_because_it_was_imported_using_import_type.code
       ];
@@ -160514,16 +160581,18 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const fragmentDirectory = fragmentHasPath ? hasTrailingDirectorySeparator(fragment) ? fragment : getDirectoryPath(fragment) : void 0;
     const expandedPrefixDirectory = fragmentHasPath ? combinePaths(normalizedPrefixDirectory, normalizedPrefixBase + fragmentDirectory) : normalizedPrefixDirectory;
     const normalizedSuffix = normalizePath(parsed.suffix);
+    const declarationExtension = normalizedSuffix && getDeclarationEmitExtensionForPath("_" + normalizedSuffix);
+    const matchingSuffixes = declarationExtension ? [changeExtension(normalizedSuffix, declarationExtension), normalizedSuffix] : [normalizedSuffix];
     const baseDirectory = normalizePath(combinePaths(packageDirectory, expandedPrefixDirectory));
     const completePrefix = fragmentHasPath ? baseDirectory : ensureTrailingDirectorySeparator(baseDirectory) + normalizedPrefixBase;
-    const includeGlob = normalizedSuffix ? "**/*" + normalizedSuffix : "./*";
+    const includeGlobs = normalizedSuffix ? matchingSuffixes.map((suffix) => "**/*" + suffix) : ["./*"];
     const matches = mapDefined(tryReadDirectory(
       host,
       baseDirectory,
       extensionOptions.extensionsToSearch,
       /*exclude*/
       void 0,
-      [includeGlob]
+      includeGlobs
     ), (match) => {
       const trimmedWithPattern = trimPrefixAndSuffix(match);
       if (trimmedWithPattern) {
@@ -160537,8 +160606,10 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
     const directories = normalizedSuffix ? emptyArray : mapDefined(tryGetDirectories(host, baseDirectory), (dir) => dir === "node_modules" ? void 0 : directoryResult(dir));
     return [...matches, ...directories];
     function trimPrefixAndSuffix(path) {
-      const inner = withoutStartAndEnd(normalizePath(path), completePrefix, normalizedSuffix);
-      return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      return firstDefined(matchingSuffixes, (suffix) => {
+        const inner = withoutStartAndEnd(normalizePath(path), completePrefix, suffix);
+        return inner === void 0 ? void 0 : removeLeadingDirectorySeparator(inner);
+      });
     }
   }
   function withoutStartAndEnd(s, start, end) {
@@ -167853,6 +167924,9 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         insertNodeBefore(sourceFile, before, newNode, blankLineBetween = false, options = {}) {
           this.insertNodeAt(sourceFile, getAdjustedStartPosition(sourceFile, before, options), newNode, this.getOptionsForInsertNodeBefore(before, newNode, blankLineBetween));
         }
+        insertNodesBefore(sourceFile, before, newNodes, blankLineBetween = false, options = {}) {
+          this.insertNodesAt(sourceFile, getAdjustedStartPosition(sourceFile, before, options), newNodes, this.getOptionsForInsertNodeBefore(before, first(newNodes), blankLineBetween));
+        }
         insertModifierAt(sourceFile, pos, modifier, options = {}) {
           this.insertNodeAt(sourceFile, pos, factory.createToken(modifier), options);
         }
@@ -167864,8 +167938,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
           const startPosition = getFirstNonSpaceCharacterPosition(sourceFile.text, lineStartPosition);
           const insertAtLineStart = isValidLocationToAddComment(sourceFile, startPosition);
           const token = getTouchingToken(sourceFile, insertAtLineStart ? startPosition : position);
-          const indent2 = sourceFile.text.slice(lineStartPosition, startPosition);
-          const text = `${insertAtLineStart ? "" : this.newLineCharacter}//${commentText}${this.newLineCharacter}${indent2}`;
+          const indent3 = sourceFile.text.slice(lineStartPosition, startPosition);
+          const text = `${insertAtLineStart ? "" : this.newLineCharacter}//${commentText}${this.newLineCharacter}${indent3}`;
           this.insertText(sourceFile, token.getStart(sourceFile), text);
         }
         insertJsdocCommentBefore(sourceFile, node, tag) {
@@ -167884,8 +167958,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
             }
           }
           const startPosition = getPrecedingNonSpaceCharacterPosition(sourceFile.text, fnStart - 1);
-          const indent2 = sourceFile.text.slice(startPosition, fnStart);
-          this.insertNodeAt(sourceFile, fnStart, tag, { suffix: this.newLineCharacter + indent2 });
+          const indent3 = sourceFile.text.slice(startPosition, fnStart);
+          this.insertNodeAt(sourceFile, fnStart, tag, { suffix: this.newLineCharacter + indent3 });
         }
         createJSDocText(sourceFile, node) {
           const comments = flatMap(node.jsDoc, (jsDoc2) => isString(jsDoc2.comment) ? factory.createJSDocText(jsDoc2.comment) : jsDoc2.comment);
@@ -171965,7 +172039,7 @@ ${options.prefix}` : "\n" : options.prefix
       array.splice(removeIndex, 1);
     }
   }
-  function indent(str) {
+  function indent2(str) {
     return indentStr + str.replace(/\n/g, indentStr);
   }
   function stringifyIndented(json) {
@@ -174493,7 +174567,7 @@ ${options.prefix}` : "\n" : options.prefix
           return this.projectService.includePackageJsonAutoImports();
         }
         /** @internal */
-        getModuleResolutionHostForAutoImportProvider() {
+        getHostForAutoImportProvider() {
           var _a, _b;
           if (this.program) {
             return {
@@ -174504,7 +174578,8 @@ ${options.prefix}` : "\n" : options.prefix
               readFile: this.projectService.host.readFile.bind(this.projectService.host),
               getDirectories: this.projectService.host.getDirectories.bind(this.projectService.host),
               trace: (_b = this.projectService.host.trace) == null ? void 0 : _b.bind(this.projectService.host),
-              useCaseSensitiveFileNames: this.program.useCaseSensitiveFileNames()
+              useCaseSensitiveFileNames: this.program.useCaseSensitiveFileNames(),
+              readDirectory: this.projectService.host.readDirectory.bind(this.projectService.host)
             };
           }
           return this.projectService.host;
@@ -174532,7 +174607,7 @@ ${options.prefix}` : "\n" : options.prefix
           if (dependencySelection) {
             (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "getPackageJsonAutoImportProvider");
             const start = timestamp();
-            this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getModuleResolutionHostForAutoImportProvider(), this.documentRegistry);
+            this.autoImportProviderHost = AutoImportProviderProject.create(dependencySelection, this, this.getHostForAutoImportProvider(), this.documentRegistry);
             if (this.autoImportProviderHost) {
               updateProjectIfDirty(this.autoImportProviderHost);
               this.sendPerformanceEvent("CreatePackageJsonAutoImportProvider", timestamp() - start);
@@ -174748,7 +174823,7 @@ ${options.prefix}` : "\n" : options.prefix
           this.getParsedCommandLine = maybeBind(this.hostProject, this.hostProject.getParsedCommandLine);
         }
         /** @internal */
-        static getRootFileNames(dependencySelection, hostProject, moduleResolutionHost, compilerOptions) {
+        static getRootFileNames(dependencySelection, hostProject, host, compilerOptions) {
           var _a, _b;
           if (!dependencySelection) {
             return emptyArray;
@@ -174778,7 +174853,7 @@ ${options.prefix}` : "\n" : options.prefix
                 name,
                 hostProject.currentDirectory,
                 compilerOptions,
-                moduleResolutionHost,
+                host,
                 program.getModuleResolutionCache()
               );
               if (packageJson) {
@@ -174795,7 +174870,7 @@ ${options.prefix}` : "\n" : options.prefix
                     `@types/${name}`,
                     directory,
                     compilerOptions,
-                    moduleResolutionHost,
+                    host,
                     program.getModuleResolutionCache()
                   );
                   if (typesPackageJson) {
@@ -174835,12 +174910,12 @@ ${options.prefix}` : "\n" : options.prefix
             const entrypoints = getEntrypointsFromPackageJsonInfo(
               packageJson,
               compilerOptions,
-              moduleResolutionHost,
+              host,
               program2.getModuleResolutionCache(),
               resolveJs
             );
             if (entrypoints) {
-              const real = (_a2 = moduleResolutionHost.realpath) == null ? void 0 : _a2.call(moduleResolutionHost, packageJson.packageDirectory);
+              const real = (_a2 = host.realpath) == null ? void 0 : _a2.call(host, packageJson.packageDirectory);
               const isSymlink = real && real !== packageJson.packageDirectory;
               if (isSymlink) {
                 symlinkCache.setSymlinkedDirectory(packageJson.packageDirectory, {
@@ -174858,7 +174933,7 @@ ${options.prefix}` : "\n" : options.prefix
           }
         }
         /** @internal */
-        static create(dependencySelection, hostProject, moduleResolutionHost, documentRegistry) {
+        static create(dependencySelection, hostProject, host, documentRegistry) {
           if (dependencySelection === 0 /* Off */) {
             return void 0;
           }
@@ -174866,7 +174941,7 @@ ${options.prefix}` : "\n" : options.prefix
             ...hostProject.getCompilerOptions(),
             ...this.compilerOptionsOverrides
           };
-          const rootNames = this.getRootFileNames(dependencySelection, hostProject, moduleResolutionHost, compilerOptions);
+          const rootNames = this.getRootFileNames(dependencySelection, hostProject, host, compilerOptions);
           if (!rootNames.length) {
             return void 0;
           }
@@ -174885,7 +174960,7 @@ ${options.prefix}` : "\n" : options.prefix
             rootFileNames = _AutoImportProviderProject.getRootFileNames(
               this.hostProject.includePackageJsonAutoImports(),
               this.hostProject,
-              this.hostProject.getModuleResolutionHostForAutoImportProvider(),
+              this.hostProject.getHostForAutoImportProvider(),
               this.getCompilationSettings()
             );
           }
@@ -174924,7 +174999,7 @@ ${options.prefix}` : "\n" : options.prefix
         onPackageJsonChange() {
           throw new Error("package.json changes should be notified on an AutoImportProvider's host project");
         }
-        getModuleResolutionHostForAutoImportProvider() {
+        getHostForAutoImportProvider() {
           throw new Error("AutoImportProviderProject cannot provide its own host; use `hostProject.getModuleResolutionHostForAutomImportProvider()` instead.");
         }
         getProjectReferences() {
@@ -178759,7 +178834,7 @@ Dynamic files must always be opened with service's current directory or service
     const verboseLogging = logger.hasLevel(3 /* verbose */);
     const json = JSON.stringify(msg);
     if (verboseLogging) {
-      logger.info(`${msg.type}:${indent(JSON.stringify(msg, void 0, " "))}`);
+      logger.info(`${msg.type}:${indent2(JSON.stringify(msg, void 0, " "))}`);
     }
     const len = byteLength(json, "utf8");
     return `Content-Length: ${1 + len}\r
@@ -180068,9 +180143,9 @@ ${json}${newLine}`;
         logErrorWorker(err, cmd, fileRequest) {
           let msg = "Exception on executing command " + cmd;
           if (err.message) {
-            msg += ":\n" + indent(err.message);
+            msg += ":\n" + indent2(err.message);
             if (err.stack) {
-              msg += "\n" + indent(err.stack);
+              msg += "\n" + indent2(err.stack);
             }
           }
           if (this.logger.hasLevel(3 /* verbose */)) {
@@ -180082,7 +180157,7 @@ ${json}${newLine}`;
                   const text = getSnapshotText(scriptInfo.getSnapshot());
                   msg += `
 
-File text of ${fileRequest.file}:${indent(text)}
+File text of ${fileRequest.file}:${indent2(text)}
 `;
                 }
               } catch {
@@ -181923,7 +181998,7 @@ ${e.message}`;
           if (this.logger.hasLevel(2 /* requestTime */)) {
             start = this.hrtime();
             if (this.logger.hasLevel(3 /* verbose */)) {
-              this.logger.info(`request:${indent(this.toStringMessage(message))}`);
+              this.logger.info(`request:${indent2(this.toStringMessage(message))}`);
             }
           }
           let request;
@@ -182796,7 +182871,7 @@ ${e.message}`;
     getLocationInNewDocument: () => getLocationInNewDocument,
     hasArgument: () => hasArgument,
     hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-    indent: () => indent,
+    indent: () => indent2,
     isConfigFile: () => isConfigFile,
     isConfiguredProject: () => isConfiguredProject,
     isDynamicFileName: () => isDynamicFileName,
@@ -184956,7 +185031,6 @@ ${e.message}`;
     startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
     startOnNewLine: () => startOnNewLine,
     startTracing: () => startTracing,
-    startWhitespaceCount: () => startWhitespaceCount,
     startsWith: () => startsWith,
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,
@@ -185212,7 +185286,7 @@ ${e.message}`;
     getLocationInNewDocument: () => getLocationInNewDocument,
     hasArgument: () => hasArgument,
     hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-    indent: () => indent,
+    indent: () => indent2,
     isConfigFile: () => isConfigFile,
     isConfiguredProject: () => isConfiguredProject,
     isDynamicFileName: () => isDynamicFileName,
@@ -187360,7 +187434,6 @@ ${e.message}`;
     startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
     startOnNewLine: () => startOnNewLine,
     startTracing: () => startTracing,
-    startWhitespaceCount: () => startWhitespaceCount,
     startsWith: () => startsWith,
     startsWithDirectory: () => startsWithDirectory,
     startsWithUnderscore: () => startsWithUnderscore,