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

package/lib/tsserver.js

@@ -2147,7 +2147,6 @@ __export(server_exports, {
   startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
   startOnNewLine: () => startOnNewLine,
   startTracing: () => startTracing,
-  startWhitespaceCount: () => startWhitespaceCount,
   startsWith: () => startsWith,
   startsWithDirectory: () => startsWithDirectory,
   startsWithUnderscore: () => startsWithUnderscore,
@@ -2328,7 +2327,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.2";
-var version = `${versionMajorMinor}.0-insiders.20230703`;
+var version = `${versionMajorMinor}.0-insiders.20230707`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -3840,8 +3839,8 @@ function unorderedRemoveFirstItemWhere(array, predicate) {
   }
   return false;
 }
-function createGetCanonicalFileName(useCaseSensitiveFileNames) {
-  return useCaseSensitiveFileNames ? identity : toFileNameLowerCase;
+function createGetCanonicalFileName(useCaseSensitiveFileNames2) {
+  return useCaseSensitiveFileNames2 ? identity : toFileNameLowerCase;
 }
 function patternText({ prefix, suffix }) {
   return `${prefix}*${suffix}`;
@@ -3975,13 +3974,6 @@ function takeWhile(array, predicate) {
     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;
@@ -7685,10 +7677,10 @@ function createDynamicPriorityPollingWatchFile(host) {
     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);
@@ -7764,8 +7756,8 @@ function createFixedChunkSizePollingWatchFile(host) {
     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) {
@@ -7817,7 +7809,7 @@ function setSysLog(logger) {
 }
 function createDirectoryWatcherSupportingRecursive({
   watchDirectory,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   getCurrentDirectory,
   getAccessibleSortedChildDirectories,
   fileSystemEntryExists,
@@ -7829,8 +7821,8 @@ function createDirectoryWatcherSupportingRecursive({
   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);
@@ -7997,12 +7989,12 @@ function createDirectoryWatcherSupportingRecursive({
     }
   }
   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);
   }
@@ -8025,14 +8017,14 @@ function createFsWatchCallbackForFileWatcherCallback(fileName, callback, getModi
     }
   };
 }
-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);
       }
     }
@@ -8045,7 +8037,7 @@ function createSystemWatchFunctions({
   clearTimeout: clearTimeout2,
   fsWatchWorker,
   fileSystemEntryExists,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   getCurrentDirectory,
   fsSupportsRecursiveFsWatch,
   getAccessibleSortedChildDirectories,
@@ -8117,7 +8109,7 @@ function createSystemWatchFunctions({
         );
       case 5 /* UseFsEventsOnParentDirectory */:
         if (!nonPollingWatchFile) {
-          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames);
+          nonPollingWatchFile = createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames2);
         }
         return nonPollingWatchFile(fileName, callback, pollingInterval, getFallbackOptions(options));
       default:
@@ -8166,7 +8158,7 @@ function createSystemWatchFunctions({
       return fsWatch(
         directoryName,
         1 /* Directory */,
-        createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+        createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
         recursive,
         500 /* Medium */,
         getFallbackOptions(options)
@@ -8174,7 +8166,7 @@ function createSystemWatchFunctions({
     }
     if (!hostRecursiveDirectoryWatcher) {
       hostRecursiveDirectoryWatcher = createDirectoryWatcherSupportingRecursive({
-        useCaseSensitiveFileNames,
+        useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
         getCurrentDirectory,
         fileSystemEntryExists,
         getAccessibleSortedChildDirectories,
@@ -8220,7 +8212,7 @@ function createSystemWatchFunctions({
         return fsWatch(
           directoryName,
           1 /* Directory */,
-          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory),
+          createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames2, getCurrentDirectory),
           recursive,
           500 /* Medium */,
           getFallbackOptions(watchDirectoryOptions)
@@ -8248,7 +8240,7 @@ function createSystemWatchFunctions({
   function pollingWatchFile(fileName, callback, pollingInterval, options) {
     return createSingleWatcherPerName(
       pollingWatches,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames2,
       fileName,
       callback,
       (cb) => pollingWatchFileWorker(fileName, cb, pollingInterval, options)
@@ -8257,7 +8249,7 @@ function createSystemWatchFunctions({
   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)
@@ -8385,7 +8377,7 @@ var sys = (() => {
     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";
@@ -8396,7 +8388,7 @@ var sys = (() => {
       setTimeout,
       clearTimeout,
       fsWatchWorker,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       getCurrentDirectory,
       fileSystemEntryExists,
       // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
@@ -8413,7 +8405,7 @@ var sys = (() => {
     const nodeSystem = {
       args: process.argv.slice(2),
       newLine: _os.EOL,
-      useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
       write(s) {
         process.stdout.write(s);
       },
@@ -8542,12 +8534,12 @@ var sys = (() => {
       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
             );
@@ -8727,7 +8719,7 @@ var sys = (() => {
       }
     }
     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;
@@ -9246,7 +9238,7 @@ var Diagnostics = {
   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."),
@@ -9508,7 +9500,7 @@ var Diagnostics = {
   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'."),
@@ -9516,7 +9508,7 @@ var Diagnostics = {
   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."),
@@ -9540,8 +9532,8 @@ var Diagnostics = {
   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'."),
@@ -9560,34 +9552,34 @@ var Diagnostics = {
   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}'"),
@@ -10040,7 +10032,7 @@ var Diagnostics = {
   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,
@@ -10056,7 +10048,7 @@ var Diagnostics = {
   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."),
@@ -10082,12 +10074,12 @@ var Diagnostics = {
   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}'."),
@@ -10104,10 +10096,10 @@ var Diagnostics = {
   _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."),
@@ -10125,7 +10117,7 @@ var Diagnostics = {
   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?"),
@@ -10152,7 +10144,7 @@ var Diagnostics = {
   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."),
@@ -10589,8 +10581,8 @@ var Diagnostics = {
   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}'."),
@@ -11010,7 +11002,7 @@ var Diagnostics = {
   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."),
@@ -12123,7 +12115,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         if (withMinus)
           start3--;
         error2(Diagnostics.Octal_literals_are_not_allowed_Use_the_syntax_0, start3, pos - start3, literal);
-        return { type: 9 /* NumericLiteral */, value: tokenValue };
+        return 9 /* NumericLiteral */;
       }
     } else {
       mainFragment = scanNumberFragment();
@@ -12163,20 +12155,18 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
     }
     if (tokenFlags & 8192 /* ContainsLeadingZero */) {
       error2(Diagnostics.Decimals_with_leading_zeros_are_not_allowed, start3, end2 - start3);
-      return { type: 9 /* NumericLiteral */, value: "" + +result };
+      tokenValue = "" + +result;
+      return 9 /* NumericLiteral */;
     }
     if (decimalFragment !== void 0 || tokenFlags & 16 /* Scientific */) {
       checkForIdentifierStartAfterNumericLiteral(start3, 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(start3);
-      return { type, value: tokenValue };
+      return type;
     }
   }
   function checkForIdentifierStartAfterNumericLiteral(numericStart, isScientific) {
@@ -12785,7 +12775,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
           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 */) {
@@ -12903,8 +12893,7 @@ function createScanner(languageVersion, skipTrivia2, languageVariant = 0 /* Stan
         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 */;
@@ -18719,7 +18708,7 @@ function isNightly() {
 }
 function createTextWriter(newLine) {
   var output;
-  var indent2;
+  var indent3;
   var lineStart;
   var lineCount;
   var linePos;
@@ -18737,7 +18726,7 @@ function createTextWriter(newLine) {
   function writeText(s) {
     if (s && s.length) {
       if (lineStart) {
-        s = getIndentString(indent2) + s;
+        s = getIndentString(indent3) + s;
         lineStart = false;
       }
       output += s;
@@ -18756,7 +18745,7 @@ function createTextWriter(newLine) {
   }
   function reset2() {
     output = "";
-    indent2 = 0;
+    indent3 = 0;
     lineStart = true;
     lineCount = 0;
     linePos = 0;
@@ -18793,15 +18782,15 @@ function createTextWriter(newLine) {
     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,
@@ -20766,7 +20755,7 @@ function getSubPatternFromSpec(spec, basePath, usage, { singleAsteriskRegexFragm
 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);
@@ -20775,22 +20764,22 @@ function getFileMatcherPatterns(path, excludes, includes, useCaseSensitiveFileNa
     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);
   }
@@ -20832,7 +20821,7 @@ function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNa
     }
   }
 }
-function getBasePaths(path, includes, useCaseSensitiveFileNames) {
+function getBasePaths(path, includes, useCaseSensitiveFileNames2) {
   const basePaths = [path];
   if (includes) {
     const includeBasePaths = [];
@@ -20840,9 +20829,9 @@ function getBasePaths(path, includes, useCaseSensitiveFileNames) {
       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);
       }
     }
@@ -31487,7 +31476,7 @@ var Parser;
     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))
       );
     }
   }
@@ -33075,7 +33064,7 @@ var Parser;
       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, "{", "}")
         );
       }
     }
@@ -36179,7 +36168,7 @@ var Parser;
         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, "{", "}")
           );
         }
       }
@@ -36547,20 +36536,20 @@ var Parser;
       function doJSDocScan() {
         let state = 1 /* SawAsterisk */;
         let margin;
-        let indent2 = start2 - (content.lastIndexOf("\n", start2) + 1) + 4;
+        let indent3 = start2 - (content.lastIndexOf("\n", start2) + 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) {
@@ -36569,14 +36558,14 @@ var Parser;
                 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();
@@ -36586,16 +36575,16 @@ var Parser;
                 } 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;
@@ -36797,7 +36786,7 @@ var Parser;
         }
         return parseTagComments(margin, indentText.slice(margin));
       }
-      function parseTagComments(indent2, initialMargin) {
+      function parseTagComments(indent3, initialMargin) {
         const commentsPos2 = getNodePos();
         let comments2 = [];
         const parts2 = [];
@@ -36806,10 +36795,10 @@ var Parser;
         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 !== "") {
@@ -36824,7 +36813,7 @@ var Parser;
               case 4 /* NewLineTrivia */:
                 state = 0 /* BeginningOfLine */;
                 comments2.push(scanner2.getTokenText());
-                indent2 = 0;
+                indent3 = 0;
                 break;
               case 60 /* AtToken */:
                 scanner2.resetTokenState(scanner2.getTokenEnd() - 1);
@@ -36834,11 +36823,11 @@ var Parser;
               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 */;
@@ -36871,7 +36860,7 @@ var Parser;
               case 42 /* AsteriskToken */:
                 if (state === 0 /* BeginningOfLine */) {
                   state = 1 /* SawAsterisk */;
-                  indent2 += 1;
+                  indent3 += 1;
                   break;
                 }
               default:
@@ -36936,8 +36925,8 @@ var Parser;
       function isJSDocLinkTag(kind) {
         return kind === "link" || kind === "linkcode" || kind === "linkplain";
       }
-      function parseUnknownTag(start3, tagName, indent2, indentText) {
-        return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start3, getNodePos(), indent2, indentText)), start3);
+      function parseUnknownTag(start3, tagName, indent3, indentText) {
+        return finishNode(factory2.createJSDocUnknownTag(tagName, parseTrailingTagComments(start3, getNodePos(), indent3, indentText)), start3);
       }
       function addTag(tag) {
         if (!tag) {
@@ -36984,7 +36973,7 @@ var Parser;
             return isTypeReferenceNode(node) && isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
         }
       }
-      function parseParameterOrPropertyTag(start3, tagName, target, indent2) {
+      function parseParameterOrPropertyTag(start3, tagName, target, indent3) {
         let typeExpression = tryParseTypeExpression();
         let isNameFirst = !typeExpression;
         skipWhitespaceOrAsterisk();
@@ -36993,8 +36982,8 @@ var Parser;
         if (isNameFirst && !lookAhead(parseJSDocLinkPrefix)) {
           typeExpression = tryParseTypeExpression();
         }
-        const comment = parseTrailingTagComments(start3, getNodePos(), indent2, indentText);
-        const nestedTypeLiteral = parseNestedTypeLiteral(typeExpression, name, target, indent2);
+        const comment = parseTrailingTagComments(start3, getNodePos(), indent3, indentText);
+        const nestedTypeLiteral = parseNestedTypeLiteral(typeExpression, name, target, indent3);
         if (nestedTypeLiteral) {
           typeExpression = nestedTypeLiteral;
           isNameFirst = true;
@@ -37002,12 +36991,12 @@ var Parser;
         const result2 = target === 1 /* Property */ ? factory2.createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) : factory2.createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment);
         return finishNode(result2, start3);
       }
-      function parseNestedTypeLiteral(typeExpression, name, target, 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 */) {
@@ -37020,14 +37009,14 @@ var Parser;
           }
         }
       }
-      function parseReturnTag(start3, tagName, indent2, indentText) {
+      function parseReturnTag(start3, 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(start3, getNodePos(), indent2, indentText)), start3);
+        return finishNode(factory2.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start3, getNodePos(), indent3, indentText)), start3);
       }
-      function parseTypeTag(start3, tagName, indent2, indentText) {
+      function parseTypeTag(start3, tagName, indent3, indentText) {
         if (some(tags, isJSDocTypeTag)) {
           parseErrorAt(tagName.pos, scanner2.getTokenStart(), Diagnostics._0_tag_already_specified, unescapeLeadingUnderscores(tagName.escapedText));
         }
@@ -37035,25 +37024,25 @@ var Parser;
           /*mayOmitBraces*/
           true
         );
-        const comments2 = indent2 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start3, getNodePos(), indent2, indentText) : void 0;
+        const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start3, getNodePos(), indent3, indentText) : void 0;
         return finishNode(factory2.createJSDocTypeTag(tagName, typeExpression, comments2), start3);
       }
-      function parseSeeTag(start3, tagName, indent2, indentText) {
+      function parseSeeTag(start3, 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(start3, getNodePos(), indent2, indentText) : void 0;
+        const comments2 = indent3 !== void 0 && indentText !== void 0 ? parseTrailingTagComments(start3, getNodePos(), indent3, indentText) : void 0;
         return finishNode(factory2.createJSDocSeeTag(tagName, nameExpression, comments2), start3);
       }
-      function parseThrowsTag(start3, tagName, indent2, indentText) {
+      function parseThrowsTag(start3, tagName, indent3, indentText) {
         const typeExpression = tryParseTypeExpression();
-        const comment = parseTrailingTagComments(start3, getNodePos(), indent2, indentText);
+        const comment = parseTrailingTagComments(start3, getNodePos(), indent3, indentText);
         return finishNode(factory2.createJSDocThrowsTag(tagName, typeExpression, comment), start3);
       }
-      function parseAuthorTag(start3, tagName, indent2, indentText) {
+      function parseAuthorTag(start3, tagName, indent3, indentText) {
         const commentStart = getNodePos();
         const textOnly = parseAuthorNameAndEmail();
         let commentEnd = scanner2.getTokenFullStart();
-        const comments2 = parseTrailingTagComments(start3, commentEnd, indent2, indentText);
+        const comments2 = parseTrailingTagComments(start3, commentEnd, indent3, indentText);
         if (!comments2) {
           commentEnd = scanner2.getTokenFullStart();
         }
@@ -37137,19 +37126,19 @@ var Parser;
         skipWhitespace();
         return finishNode(factory2.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start3, getNodePos(), margin, indentText)), start3);
       }
-      function parseTypedefTag(start3, tagName, indent2, indentText) {
+      function parseTypedefTag(start3, 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;
             }
@@ -37158,7 +37147,7 @@ var Parser;
               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 {
@@ -37177,7 +37166,7 @@ var Parser;
         }
         end2 = end2 || comment !== void 0 ? getNodePos() : (fullName ?? typeExpression ?? tagName).end;
         if (!comment) {
-          comment = parseTrailingTagComments(start3, end2, indent2, indentText);
+          comment = parseTrailingTagComments(start3, end2, indent3, indentText);
         }
         const typedefTag = factory2.createJSDocTypedefTag(tagName, typeExpression, fullName, comment);
         return finishNode(typedefTag, start3, end2);
@@ -37207,11 +37196,11 @@ var Parser;
         }
         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;
@@ -37220,11 +37209,11 @@ var Parser;
         }
         return createNodeArray(parameters || [], pos);
       }
-      function parseJSDocSignature(start3, indent2) {
-        const parameters = parseCallbackTagParameters(indent2);
+      function parseJSDocSignature(start3, 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;
             }
@@ -37237,23 +37226,23 @@ var Parser;
           returnTag
         ), start3);
       }
-      function parseCallbackTag(start3, tagName, indent2, indentText) {
+      function parseCallbackTag(start3, tagName, indent3, indentText) {
         const fullName = parseJSDocTypeNameWithNamespace();
         skipWhitespace();
-        let comment = parseTagComments(indent2);
-        const typeExpression = parseJSDocSignature(start3, indent2);
+        let comment = parseTagComments(indent3);
+        const typeExpression = parseJSDocSignature(start3, indent3);
         if (!comment) {
-          comment = parseTrailingTagComments(start3, getNodePos(), indent2, indentText);
+          comment = parseTrailingTagComments(start3, getNodePos(), indent3, indentText);
         }
         const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
         return finishNode(factory2.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start3, end2);
       }
-      function parseOverloadTag(start3, tagName, indent2, indentText) {
+      function parseOverloadTag(start3, tagName, indent3, indentText) {
         skipWhitespace();
-        let comment = parseTagComments(indent2);
-        const typeExpression = parseJSDocSignature(start3, indent2);
+        let comment = parseTagComments(indent3);
+        const typeExpression = parseJSDocSignature(start3, indent3);
         if (!comment) {
-          comment = parseTrailingTagComments(start3, getNodePos(), indent2, indentText);
+          comment = parseTrailingTagComments(start3, getNodePos(), indent3, indentText);
         }
         const end2 = comment !== void 0 ? getNodePos() : typeExpression.end;
         return finishNode(factory2.createJSDocOverloadTag(tagName, typeExpression, comment), start3, end2);
@@ -37269,17 +37258,17 @@ var Parser;
         }
         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;
                 }
@@ -37305,7 +37294,7 @@ var Parser;
           }
         }
       }
-      function tryParseChildTag(target, indent2) {
+      function tryParseChildTag(target, indent3) {
         Debug.assert(token() === 60 /* AtToken */);
         const start3 = scanner2.getTokenFullStart();
         nextTokenJSDoc();
@@ -37325,14 +37314,14 @@ var Parser;
             t = 2 /* Parameter */ | 4 /* CallbackParameter */;
             break;
           case "template":
-            return parseTemplateTag(start3, tagName, indent2, indentText);
+            return parseTemplateTag(start3, tagName, indent3, indentText);
           default:
             return false;
         }
         if (!(target & t)) {
           return false;
         }
-        return parseParameterOrPropertyTag(start3, tagName, target, indent2);
+        return parseParameterOrPropertyTag(start3, tagName, target, indent3);
       }
       function parseTemplateTagTypeParameter() {
         const typeParameterPos = getNodePos();
@@ -37373,10 +37362,10 @@ var Parser;
         } while (parseOptionalJsdoc(28 /* CommaToken */));
         return createNodeArray(typeParameters, pos);
       }
-      function parseTemplateTag(start3, tagName, indent2, indentText) {
+      function parseTemplateTag(start3, tagName, indent3, indentText) {
         const constraint = token() === 19 /* OpenBraceToken */ ? parseJSDocTypeExpression() : void 0;
         const typeParameters = parseTemplateTagTypeParameters();
-        return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start3, getNodePos(), indent2, indentText)), start3);
+        return finishNode(factory2.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start3, getNodePos(), indent3, indentText)), start3);
       }
       function parseOptionalJsdoc(t) {
         if (token() === t) {
@@ -38513,6 +38502,7 @@ var commandOptionsWithoutBuild = [
   {
     name: "checkJs",
     type: "boolean",
+    affectsModuleResolution: true,
     showInSimplifiedHelpView: true,
     category: Diagnostics.JavaScript_Support,
     description: Diagnostics.Enable_error_reporting_in_type_checked_JavaScript_files,
@@ -40958,19 +40948,19 @@ function getFileNamesFromConfigSpecs(configFileSpecs, basePath, options, host, e
   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("/**/");
@@ -40980,17 +40970,17 @@ function invalidDotDotAfterRecursiveWildcard(s) {
   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))
@@ -41020,9 +41010,9 @@ function specToDiagnostic(spec, disallowTrailingRecursion) {
     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 = [];
@@ -41031,7 +41021,7 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
       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];
@@ -41046,7 +41036,7 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
     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];
           }
         }
@@ -41055,20 +41045,20 @@ function getWildcardDirectories({ validatedIncludeSpecs: include, validatedExclu
   }
   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 */
     };
   }
@@ -41214,6 +41204,18 @@ function formatExtensions(extensions) {
     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;
@@ -41388,8 +41390,8 @@ function getDefaultTypeRoots(currentDirectory) {
 }
 var nodeModulesAtTypes = combinePaths("node_modules", "@types");
 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);
@@ -42666,7 +42668,7 @@ function getEntrypointsFromPackageJsonInfo(packageJsonInfo, options, host, cache
       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,
@@ -42698,23 +42700,42 @@ function loadEntrypointsFromExportMap(scope, exports, state, extensions) {
   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) {
@@ -42923,6 +42944,9 @@ function loadModuleFromSelfNameReference(extensions, moduleName, directory, stat
   }
   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);
@@ -43270,13 +43294,10 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
     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));
@@ -43305,7 +43326,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
         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 */];
@@ -43315,7 +43336,7 @@ function getLoadModuleFromTargetImportOrExport(extensions, state, cache, redirec
                   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,
@@ -43732,6 +43753,9 @@ function traceIfEnabled(state, diagnostic, ...args) {
     trace(state.host, diagnostic, ...args);
   }
 }
+function useCaseSensitiveFileNames(state) {
+  return !state.host.useCaseSensitiveFileNames ? true : typeof state.host.useCaseSensitiveFileNames === "boolean" ? state.host.useCaseSensitiveFileNames : state.host.useCaseSensitiveFileNames();
+}
 
 // src/compiler/binder.ts
 var ModuleInstanceState = /* @__PURE__ */ ((ModuleInstanceState2) => {
@@ -44112,10 +44136,10 @@ function createBinder() {
             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);
@@ -47215,7 +47239,9 @@ function tryGetModuleNameFromPaths(relativeToBaseUrl, paths, allowedEndings, hos
         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))) {
@@ -47287,7 +47313,7 @@ function tryGetModuleNameFromExports(options, targetFilePath, packageDirectory,
       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;
           }
@@ -48444,7 +48470,7 @@ function createTypeChecker(host) {
   };
   var amalgamatedDuplicates;
   var reverseMappedCache = /* @__PURE__ */ new Map();
-  var inInferTypeForHomomorphicMappedType = false;
+  var homomorphicMappedTypeInferenceStack = [];
   var ambientModulesCache;
   var patternAmbientModules;
   var patternAmbientModuleAugmentations;
@@ -48701,7 +48727,7 @@ function createTypeChecker(host) {
     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);
@@ -48896,8 +48922,8 @@ function createTypeChecker(host) {
       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);
@@ -49508,7 +49534,7 @@ function createTypeChecker(host) {
                 if (suggestion.valueDeclaration) {
                   addRelatedInfo(
                     diagnostic,
-                    createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here_Colon, suggestionName)
+                    createDiagnosticForNode(suggestion.valueDeclaration, Diagnostics._0_is_declared_here, suggestionName)
                   );
                 }
               }
@@ -49570,7 +49596,7 @@ function createTypeChecker(host) {
       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
       )
     );
@@ -49707,7 +49733,7 @@ function createTypeChecker(host) {
             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;
       }
     }
@@ -49749,7 +49775,7 @@ function createTypeChecker(host) {
         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;
       }
@@ -49772,7 +49798,7 @@ function createTypeChecker(host) {
         } 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;
       }
@@ -49878,7 +49904,7 @@ function createTypeChecker(host) {
       if (diagnosticMessage) {
         addRelatedInfo(
           diagnosticMessage,
-          createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here_Colon, declarationName)
+          createDiagnosticForNode(declaration, Diagnostics._0_is_declared_here, declarationName)
         );
       }
     }
@@ -49946,7 +49972,7 @@ function createTypeChecker(host) {
       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));
     }
@@ -50268,7 +50294,7 @@ function createTypeChecker(host) {
       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 {
@@ -50298,7 +50324,7 @@ function createTypeChecker(host) {
         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))
           );
         }
       }
@@ -53035,6 +53061,7 @@ function createTypeChecker(host) {
       );
     }
     function signatureToSignatureDeclarationHelper(signature, kind, context, options) {
+      var _a;
       const suppressAny = context.flags & 256 /* SuppressAnyReturnType */;
       if (suppressAny)
         context.flags &= ~256 /* SuppressAnyReturnType */;
@@ -53170,6 +53197,20 @@ function createTypeChecker(host) {
       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;
     }
@@ -56343,11 +56384,11 @@ function createTypeChecker(host) {
               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);
@@ -57582,7 +57623,7 @@ function createTypeChecker(host) {
         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 */);
         }
@@ -62494,7 +62535,7 @@ function createTypeChecker(host) {
         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;
@@ -66255,7 +66296,7 @@ function createTypeChecker(host) {
         );
         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++;
@@ -67833,17 +67874,18 @@ function createTypeChecker(host) {
     );
   }
   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) {
@@ -74030,7 +74072,7 @@ function createTypeChecker(host) {
     if (diagnosticMessage) {
       addRelatedInfo(
         diagnosticMessage,
-        createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here_Colon, declarationName)
+        createDiagnosticForNode(valueDeclaration, Diagnostics._0_is_declared_here, declarationName)
       );
     }
   }
@@ -74117,7 +74159,7 @@ function createTypeChecker(host) {
             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);
@@ -74834,7 +74876,7 @@ function createTypeChecker(host) {
         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);
@@ -75286,7 +75328,7 @@ function createTypeChecker(host) {
           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);
@@ -80426,7 +80468,7 @@ function createTypeChecker(host) {
             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;
           }
@@ -80892,7 +80934,7 @@ function createTypeChecker(host) {
         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)));
         }
       }
     }
@@ -81836,7 +81878,7 @@ function createTypeChecker(host) {
     if (firstDeclaration) {
       addRelatedInfo(
         err,
-        createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here_Colon, declName)
+        createDiagnosticForNode(firstDeclaration, Diagnostics._0_was_also_declared_here, declName)
       );
     }
   }
@@ -82946,7 +82988,7 @@ function createTypeChecker(host) {
           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);
       }
@@ -87281,7 +87323,7 @@ function createTypeChecker(host) {
               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;
         }
@@ -118854,14 +118896,14 @@ function getEmitListItem(emit, parenthesizerRule) {
 }
 
 // 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,
@@ -118983,7 +119025,7 @@ function createCachedDirectoryStructureHost(host, currentDirectory, useCaseSensi
     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) {
@@ -119184,7 +119226,7 @@ function isIgnoredFileFromWildCardWatching({
   program,
   extraFileExtensions,
   currentDirectory,
-  useCaseSensitiveFileNames,
+  useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
   writeLog,
   toPath: toPath3
 }) {
@@ -119200,7 +119242,7 @@ function isIgnoredFileFromWildCardWatching({
     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;
   }
@@ -119263,7 +119305,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo2) {
   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,
@@ -119275,7 +119317,7 @@ function getWatchFactory(host, watchLogLevel, log, getDetailWatchInfo2) {
       ) : 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) {
@@ -119620,7 +119662,7 @@ var gutterSeparator = " ";
 var resetEscapeSequence = "\x1B[0m";
 var ellipsis = "...";
 var halfIndent = "  ";
-var bullet = "\u25CF ";
+var indent = "    ";
 function getCategoryFormat(category) {
   switch (category) {
     case 1 /* Error */:
@@ -119636,49 +119678,39 @@ function getCategoryFormat(category) {
 function formatColorAndReset(text, formatStyle) {
   return formatStyle + text + resetEscapeSequence;
 }
-function formatCodeSpan(file, start2, length2, indent2, underlineColor, host) {
+function formatCodeSpan(file, start2, length2, indent3, squiggleColor, host) {
   const { line: firstLine, character: firstLineChar } = getLineAndCharacterOfPosition(file, start2);
   const { line: lastLine, character: lastLineChar } = getLineAndCharacterOfPosition(file, start2 + 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;
   }
@@ -119696,87 +119728,54 @@ function formatLocation(file, start2, host, color = formatColorAndReset) {
   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: start2 } = diagnostic;
-      const location = formatLocation(file, start2, 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, start2, 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: start2, length: length2, messageText } of diagnostic.relatedInformation) {
-        output += indent2 + trimStringStart(flattenDiagnosticMessageText(
-          messageText,
-          host.getNewLine(),
-          0,
-          /*pretty*/
-          true
-        ));
         if (file) {
-          output += " " + formatLocation(file, start2, host);
           output += host.getNewLine();
-          output += formatCodeSpan(file, start2, length2, indent2 + "  ", "\x1B[96m" /* Cyan */, host);
+          output += halfIndent + formatLocation(file, start2, host);
+          output += formatCodeSpan(file, start2, 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;
@@ -120084,8 +120083,8 @@ var plainJSErrors = /* @__PURE__ */ new Set([
   // 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,
@@ -122882,16 +122881,16 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
       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);
@@ -122915,14 +122914,14 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         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 */:
@@ -122943,23 +122942,23 @@ function createProgram(rootNamesOrOptions, _options, _host, _oldProgram, _config
         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);
@@ -123364,6 +123363,9 @@ function parseConfigHostFromCompilerHostLike(host, directoryStructureHost = host
       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,
@@ -126403,12 +126405,12 @@ function getMatchedIncludeSpec(program, fileName) {
     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) {
@@ -126637,7 +126639,7 @@ function createWatchFactory(host, options) {
   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),
@@ -126653,8 +126655,8 @@ function createCompilerHostFromProgramHost(host, getCompilerOptions, directorySt
       (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),
@@ -126894,7 +126896,7 @@ function createWatchProgram(host) {
   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;
@@ -126902,7 +126904,7 @@ function createWatchProgram(host) {
   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();
@@ -126920,8 +126922,8 @@ function createWatchProgram(host) {
   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);
@@ -127427,7 +127429,7 @@ function createWatchProgram(host) {
           options: compilerOptions,
           program: getCurrentBuilderProgram() || rootFileNames,
           currentDirectory,
-          useCaseSensitiveFileNames,
+          useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
           writeLog,
           toPath: toPath3
         }))
@@ -127517,7 +127519,7 @@ function createWatchProgram(host) {
                 options: config.parsedCommandLine.options,
                 program: config.parsedCommandLine.fileNames,
                 currentDirectory,
-                useCaseSensitiveFileNames,
+                useCaseSensitiveFileNames: useCaseSensitiveFileNames2,
                 writeLog,
                 toPath: toPath3
               }))
@@ -131919,7 +131921,7 @@ function getDisplayPartWriter() {
   const absoluteMaximumLength = defaultMaximumTruncationLength * 10;
   let displayParts;
   let lineStart;
-  let indent2;
+  let indent3;
   let length2;
   resetWriter();
   const unknownWrite = (text) => writeKind(text, 17 /* text */);
@@ -131955,12 +131957,12 @@ function getDisplayPartWriter() {
     hasTrailingWhitespace: () => false,
     hasTrailingComment: () => false,
     rawWrite: notImplemented,
-    getIndent: () => indent2,
+    getIndent: () => indent3,
     increaseIndent: () => {
-      indent2++;
+      indent3++;
     },
     decreaseIndent: () => {
-      indent2--;
+      indent3--;
     },
     clear: resetWriter
   };
@@ -131968,7 +131970,7 @@ function getDisplayPartWriter() {
     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 */));
@@ -132000,7 +132002,7 @@ function getDisplayPartWriter() {
   function resetWriter() {
     displayParts = [];
     lineStart = true;
-    indent2 = 0;
+    indent3 = 0;
     length2 = 0;
   }
 }
@@ -133269,10 +133271,10 @@ function isImportablePath(fromPath, toPath3, getCanonicalFileName, globalCachePa
 }
 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,
@@ -134734,12 +134736,12 @@ var DocumentHighlights;
 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);
@@ -134942,12 +134944,12 @@ function getDocumentRegistryBucketKeyWithMode(key, mode) {
 
 // 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);
   });
 }
@@ -134969,7 +134971,7 @@ function makeCorrespondingRelativeChange(a0, b0, a1, getCanonicalFileName) {
   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;
@@ -134993,10 +134995,10 @@ function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath,
           /*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;
@@ -135044,7 +135046,7 @@ function updateTsconfigFiles(program, changeTracker, oldToNew, oldFileOrDirPath,
       configDir,
       path,
       /*ignoreCase*/
-      !useCaseSensitiveFileNames
+      !useCaseSensitiveFileNames2
     );
   }
 }
@@ -138324,7 +138326,7 @@ function getNewStatementsAndRemoveFromOldFile2(oldFile, targetFile, usage, chang
   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,
@@ -139117,6 +139119,67 @@ function isNonVariableTopLevelDeclaration(node) {
       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;
@@ -143582,10 +143645,10 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       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),
@@ -143633,7 +143696,7 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
       getSourceFileByPath: getOrCreateSourceFileByPath,
       getCancellationToken: () => cancellationToken,
       getCanonicalFileName,
-      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames,
+      useCaseSensitiveFileNames: () => useCaseSensitiveFileNames2,
       getNewLine: () => getNewLineCharacter(newSettings),
       getDefaultLibFileName: (options2) => host.getDefaultLibFileName(options2),
       writeFile: noop,
@@ -143677,9 +143740,12 @@ function createLanguageService(host, documentRegistry = createDocumentRegistry(h
     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,
@@ -149777,7 +149843,7 @@ var errorCodes18 = [
   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
 ];
@@ -161239,16 +161305,18 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   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) {
@@ -161262,8 +161330,10 @@ function getModulesForPathsPattern(fragment, packageDirectory, pattern, extensio
   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, start2, end) {
@@ -167983,6 +168053,9 @@ var ChangeTracker = class _ChangeTracker {
   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);
   }
@@ -167994,8 +168067,8 @@ var ChangeTracker = class _ChangeTracker {
     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) {
@@ -168014,8 +168087,8 @@ var ChangeTracker = class _ChangeTracker {
       }
     }
     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);
@@ -173817,7 +173890,6 @@ __export(ts_exports2, {
   startEndOverlapsWithStartEnd: () => startEndOverlapsWithStartEnd,
   startOnNewLine: () => startOnNewLine,
   startTracing: () => startTracing,
-  startWhitespaceCount: () => startWhitespaceCount,
   startsWith: () => startsWith,
   startsWithDirectory: () => startsWithDirectory,
   startsWithUnderscore: () => startsWithUnderscore,
@@ -174202,7 +174274,7 @@ __export(ts_server_exports3, {
   getLocationInNewDocument: () => getLocationInNewDocument,
   hasArgument: () => hasArgument,
   hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-  indent: () => indent,
+  indent: () => indent2,
   isConfigFile: () => isConfigFile,
   isConfiguredProject: () => isConfiguredProject,
   isDynamicFileName: () => isDynamicFileName,
@@ -174766,7 +174838,7 @@ function removeSorted(array, remove, compare) {
   }
 }
 var indentStr = "\n    ";
-function indent(str) {
+function indent2(str) {
   return indentStr + str.replace(/\n/g, indentStr);
 }
 function stringifyIndented(json) {
@@ -177153,7 +177225,7 @@ var Project3 = class _Project {
     return this.projectService.includePackageJsonAutoImports();
   }
   /** @internal */
-  getModuleResolutionHostForAutoImportProvider() {
+  getHostForAutoImportProvider() {
     var _a, _b;
     if (this.program) {
       return {
@@ -177164,7 +177236,8 @@ var Project3 = class _Project {
         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;
@@ -177192,7 +177265,7 @@ var Project3 = class _Project {
     if (dependencySelection) {
       (_a = tracing) == null ? void 0 : _a.push(tracing.Phase.Session, "getPackageJsonAutoImportProvider");
       const start2 = 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() - start2);
@@ -177430,7 +177503,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     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;
@@ -177460,7 +177533,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
           name,
           hostProject.currentDirectory,
           compilerOptions,
-          moduleResolutionHost,
+          host,
           program.getModuleResolutionCache()
         );
         if (packageJson) {
@@ -177477,7 +177550,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
               `@types/${name}`,
               directory,
               compilerOptions,
-              moduleResolutionHost,
+              host,
               program.getModuleResolutionCache()
             );
             if (typesPackageJson) {
@@ -177517,12 +177590,12 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       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, {
@@ -177540,7 +177613,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
     }
   }
   /** @internal */
-  static create(dependencySelection, hostProject, moduleResolutionHost, documentRegistry) {
+  static create(dependencySelection, hostProject, host, documentRegistry) {
     if (dependencySelection === 0 /* Off */) {
       return void 0;
     }
@@ -177548,7 +177621,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       ...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;
     }
@@ -177567,7 +177640,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
       rootFileNames = _AutoImportProviderProject.getRootFileNames(
         this.hostProject.includePackageJsonAutoImports(),
         this.hostProject,
-        this.hostProject.getModuleResolutionHostForAutoImportProvider(),
+        this.hostProject.getHostForAutoImportProvider(),
         this.getCompilationSettings()
       );
     }
@@ -177606,7 +177679,7 @@ var _AutoImportProviderProject = class _AutoImportProviderProject extends Projec
   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() {
@@ -181434,7 +181507,7 @@ function formatMessage2(msg, logger, byteLength, newLine) {
   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
@@ -182655,9 +182728,9 @@ var Session3 = class _Session {
   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 */)) {
@@ -182669,7 +182742,7 @@ var Session3 = class _Session {
             const text = getSnapshotText(scriptInfo.getSnapshot());
             msg += `
 
-File text of ${fileRequest.file}:${indent(text)}
+File text of ${fileRequest.file}:${indent2(text)}
 `;
           }
         } catch {
@@ -184510,7 +184583,7 @@ ${e.message}`;
     if (this.logger.hasLevel(2 /* requestTime */)) {
       start2 = 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;
@@ -185449,7 +185522,7 @@ __export(ts_server_exports4, {
   getLogLevel: () => getLogLevel,
   hasArgument: () => hasArgument,
   hasNoTypeScriptSource: () => hasNoTypeScriptSource,
-  indent: () => indent,
+  indent: () => indent2,
   initializeNodeSystem: () => initializeNodeSystem,
   isConfigFile: () => isConfigFile,
   isConfiguredProject: () => isConfiguredProject,
@@ -186096,7 +186169,7 @@ function startNodeSession(options, logger, cancellationToken) {
       const verboseLogging = logger.hasLevel(3 /* verbose */);
       if (verboseLogging) {
         const json = JSON.stringify(msg);
-        logger.info(`${msg.type}:${indent(json)}`);
+        logger.info(`${msg.type}:${indent2(json)}`);
       }
       process.send(msg);
     }
@@ -188331,7 +188404,6 @@ start(initializeNodeSystem(), require("os").platform());
   startEndOverlapsWithStartEnd,
   startOnNewLine,
   startTracing,
-  startWhitespaceCount,
   startsWith,
   startsWithDirectory,
   startsWithUnderscore,