@typescript-deploys/pr-build 5.5.0-pr-57267-12 → 5.5.0-pr-57717-2

package/lib/tsserver.js

@@ -161,6 +161,7 @@ __export(server_exports, {
   SignatureKind: () => SignatureKind,
   SmartSelectionRange: () => ts_SmartSelectionRange_exports,
   SnippetKind: () => SnippetKind,
+  SortKind: () => SortKind,
   StructureIsReused: () => StructureIsReused,
   SymbolAccessibility: () => SymbolAccessibility,
   SymbolDisplay: () => ts_SymbolDisplay_exports,
@@ -495,6 +496,7 @@ __export(server_exports, {
   defaultIncludeSpec: () => defaultIncludeSpec,
   defaultInitCompilerOptions: () => defaultInitCompilerOptions,
   defaultMaximumTruncationLength: () => defaultMaximumTruncationLength,
+  detectSortCaseSensitivity: () => detectSortCaseSensitivity,
   diagnosticCategoryName: () => diagnosticCategoryName,
   diagnosticToString: () => diagnosticToString,
   directoryProbablyExists: () => directoryProbablyExists,
@@ -2323,7 +2325,7 @@ module.exports = __toCommonJS(server_exports);
 
 // src/compiler/corePublic.ts
 var versionMajorMinor = "5.5";
-var version = `${versionMajorMinor}.0-insiders.20240309`;
+var version = `${versionMajorMinor}.0-insiders.20240311`;
 var Comparison = /* @__PURE__ */ ((Comparison3) => {
   Comparison3[Comparison3["LessThan"] = -1] = "LessThan";
   Comparison3[Comparison3["EqualTo"] = 0] = "EqualTo";
@@ -2872,6 +2874,30 @@ function arrayIsSorted(array, comparer) {
   }
   return true;
 }
+var SortKind = /* @__PURE__ */ ((SortKind2) => {
+  SortKind2[SortKind2["None"] = 0] = "None";
+  SortKind2[SortKind2["CaseSensitive"] = 1] = "CaseSensitive";
+  SortKind2[SortKind2["CaseInsensitive"] = 2] = "CaseInsensitive";
+  SortKind2[SortKind2["Both"] = 3] = "Both";
+  return SortKind2;
+})(SortKind || {});
+function detectSortCaseSensitivity(array, getString, compareStringsCaseSensitive2, compareStringsCaseInsensitive2) {
+  let kind = 3 /* Both */;
+  if (array.length < 2)
+    return kind;
+  let prevElement = getString(array[0]);
+  for (let i = 1, len = array.length; i < len && kind !== 0 /* None */; i++) {
+    const element = getString(array[i]);
+    if (kind & 1 /* CaseSensitive */ && compareStringsCaseSensitive2(prevElement, element) > 0) {
+      kind &= ~1 /* CaseSensitive */;
+    }
+    if (kind & 2 /* CaseInsensitive */ && compareStringsCaseInsensitive2(prevElement, element) > 0) {
+      kind &= ~2 /* CaseInsensitive */;
+    }
+    prevElement = element;
+  }
+  return kind;
+}
 function arrayIsEqualTo(array1, array2, equalityComparer = equateValues) {
   if (!array1 || !array2) {
     return array1 === array2;
@@ -58256,7 +58282,7 @@ function createTypeChecker(host) {
         if (!lateSymbol)
           lateSymbols.set(memberName, lateSymbol = createSymbol(0 /* None */, memberName, 4096 /* Late */));
         const earlySymbol = earlySymbols && earlySymbols.get(memberName);
-        if (!(parent2.flags & 32 /* Class */) && (lateSymbol.flags & getExcludedSymbolFlags(symbolFlags) || earlySymbol)) {
+        if (!(parent2.flags & 32 /* Class */) && lateSymbol.flags & getExcludedSymbolFlags(symbolFlags)) {
           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, name));
@@ -132952,13 +132978,15 @@ function insertImports(changes, sourceFile, imports, blankLineBetween, preferenc
   const decl = isArray(imports) ? imports[0] : imports;
   const importKindPredicate = decl.kind === 243 /* VariableStatement */ ? isRequireVariableStatement : isAnyImportSyntax;
   const existingImportStatements = filter(sourceFile.statements, importKindPredicate);
-  const { comparer, isSorted } = ts_OrganizeImports_exports.getOrganizeImportsStringComparerWithDetection(existingImportStatements, preferences);
+  let sortKind = isArray(imports) ? ts_OrganizeImports_exports.detectImportDeclarationSorting(imports, preferences) : 3 /* Both */;
+  const comparer = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, sortKind === 2 /* CaseInsensitive */);
   const sortedNewImports = isArray(imports) ? stableSort(imports, (a, b) => ts_OrganizeImports_exports.compareImportsOrRequireStatements(a, b, comparer)) : [imports];
   if (!existingImportStatements.length) {
     changes.insertNodesAtTopOfFile(sourceFile, sortedNewImports, blankLineBetween);
-  } else if (existingImportStatements && isSorted) {
+  } else if (existingImportStatements && (sortKind = ts_OrganizeImports_exports.detectImportDeclarationSorting(existingImportStatements, preferences))) {
+    const comparer2 = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, sortKind === 2 /* CaseInsensitive */);
     for (const newImport of sortedNewImports) {
-      const insertionIndex = ts_OrganizeImports_exports.getImportDeclarationInsertionIndex(existingImportStatements, newImport, comparer);
+      const insertionIndex = ts_OrganizeImports_exports.getImportDeclarationInsertionIndex(existingImportStatements, newImport, comparer2);
       if (insertionIndex === 0) {
         const options = existingImportStatements[0] === sourceFile.statements[0] ? { leadingTriviaOption: ts_textChanges_exports.LeadingTriviaOption.Exclude } : {};
         changes.insertNodeBefore(
@@ -151224,7 +151252,8 @@ function promoteFromTypeOnly(changes, aliasDeclaration, program, sourceFile, pre
   switch (aliasDeclaration.kind) {
     case 276 /* ImportSpecifier */:
       if (aliasDeclaration.isTypeOnly) {
-        if (aliasDeclaration.parent.elements.length > 1) {
+        const sortKind = ts_OrganizeImports_exports.detectImportSpecifierSorting(aliasDeclaration.parent.elements, preferences);
+        if (aliasDeclaration.parent.elements.length > 1 && sortKind) {
           const newSpecifier = factory.updateImportSpecifier(
             aliasDeclaration,
             /*isTypeOnly*/
@@ -151232,8 +151261,8 @@ function promoteFromTypeOnly(changes, aliasDeclaration, program, sourceFile, pre
             aliasDeclaration.propertyName,
             aliasDeclaration.name
           );
-          const { specifierComparer } = ts_OrganizeImports_exports.getNamedImportSpecifierComparerWithDetection(aliasDeclaration.parent.parent.parent, preferences, sourceFile);
-          const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, specifierComparer);
+          const comparer = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, sortKind === 2 /* CaseInsensitive */);
+          const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(aliasDeclaration.parent.elements, newSpecifier, comparer, preferences);
           if (insertionIndex !== aliasDeclaration.parent.elements.indexOf(aliasDeclaration)) {
             changes.delete(sourceFile, aliasDeclaration);
             changes.insertImportSpecifierAtIndex(sourceFile, newSpecifier, aliasDeclaration.parent, insertionIndex);
@@ -151273,8 +151302,7 @@ function promoteFromTypeOnly(changes, aliasDeclaration, program, sourceFile, pre
     if (convertExistingToTypeOnly) {
       const namedImports = tryCast(importClause.namedBindings, isNamedImports);
       if (namedImports && namedImports.elements.length > 1) {
-        const sortState = ts_OrganizeImports_exports.getNamedImportSpecifierComparerWithDetection(importClause.parent, preferences, sourceFile);
-        if (sortState.isSorted !== false && aliasDeclaration.kind === 276 /* ImportSpecifier */ && namedImports.elements.indexOf(aliasDeclaration) !== 0) {
+        if (ts_OrganizeImports_exports.detectImportSpecifierSorting(namedImports.elements, preferences) && aliasDeclaration.kind === 276 /* ImportSpecifier */ && namedImports.elements.indexOf(aliasDeclaration) !== 0) {
           changes.delete(sourceFile, aliasDeclaration);
           changes.insertImportSpecifierAtIndex(sourceFile, aliasDeclaration, namedImports, 0);
         }
@@ -151310,7 +151338,19 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
     changes.insertNodeAt(sourceFile, clause.getStart(sourceFile), factory.createIdentifier(defaultImport.name), { suffix: ", " });
   }
   if (namedImports.length) {
-    const { specifierComparer, isSorted } = ts_OrganizeImports_exports.getNamedImportSpecifierComparerWithDetection(clause.parent, preferences, sourceFile);
+    let ignoreCaseForSorting;
+    if (typeof preferences.organizeImportsIgnoreCase === "boolean") {
+      ignoreCaseForSorting = preferences.organizeImportsIgnoreCase;
+    } else if (existingSpecifiers) {
+      const targetImportSorting = ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
+      if (targetImportSorting !== 3 /* Both */) {
+        ignoreCaseForSorting = targetImportSorting === 2 /* CaseInsensitive */;
+      }
+    }
+    if (ignoreCaseForSorting === void 0) {
+      ignoreCaseForSorting = ts_OrganizeImports_exports.detectSorting(sourceFile, preferences) === 2 /* CaseInsensitive */;
+    }
+    const comparer = ts_OrganizeImports_exports.getOrganizeImportsComparer(preferences, ignoreCaseForSorting);
     const newSpecifiers = stableSort(
       namedImports.map(
         (namedImport) => factory.createImportSpecifier(
@@ -151320,11 +151360,12 @@ function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImpor
           factory.createIdentifier(namedImport.name)
         )
       ),
-      specifierComparer
+      (s1, s2) => ts_OrganizeImports_exports.compareImportOrExportSpecifiers(s1, s2, comparer)
     );
-    if ((existingSpecifiers == null ? void 0 : existingSpecifiers.length) && isSorted !== false) {
+    const specifierSort = (existingSpecifiers == null ? void 0 : existingSpecifiers.length) && ts_OrganizeImports_exports.detectImportSpecifierSorting(existingSpecifiers, preferences);
+    if (specifierSort && !(ignoreCaseForSorting && specifierSort === 1 /* CaseSensitive */)) {
       for (const spec of newSpecifiers) {
-        const insertionIndex = ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, specifierComparer);
+        const insertionIndex = promoteFromTypeOnly2 && !spec.isTypeOnly ? 0 : ts_OrganizeImports_exports.getImportSpecifierInsertionIndex(existingSpecifiers, spec, comparer, preferences);
         changes.insertImportSpecifierAtIndex(sourceFile, spec, clause.namedBindings, insertionIndex);
       }
     } else if (existingSpecifiers == null ? void 0 : existingSpecifiers.length) {
@@ -166498,16 +166539,18 @@ function getRightHandSideOfAssignment(rightHandSide) {
 // src/services/_namespaces/ts.OrganizeImports.ts
 var ts_OrganizeImports_exports = {};
 __export(ts_OrganizeImports_exports, {
+  coalesceExports: () => coalesceExports,
+  coalesceImports: () => coalesceImports,
+  compareImportOrExportSpecifiers: () => compareImportOrExportSpecifiers,
   compareImportsOrRequireStatements: () => compareImportsOrRequireStatements,
   compareModuleSpecifiers: () => compareModuleSpecifiers2,
-  getDetectionLists: () => getDetectionLists,
+  detectImportDeclarationSorting: () => detectImportDeclarationSorting,
+  detectImportSpecifierSorting: () => detectImportSpecifierSorting,
+  detectSorting: () => detectSorting,
   getImportDeclarationInsertionIndex: () => getImportDeclarationInsertionIndex,
   getImportSpecifierInsertionIndex: () => getImportSpecifierInsertionIndex,
-  getNamedImportSpecifierComparerWithDetection: () => getNamedImportSpecifierComparerWithDetection,
-  getOrganizeImportsStringComparerWithDetection: () => getOrganizeImportsStringComparerWithDetection,
-  organizeImports: () => organizeImports,
-  testCoalesceExports: () => testCoalesceExports,
-  testCoalesceImports: () => testCoalesceImports
+  getOrganizeImportsComparer: () => getOrganizeImportsComparer,
+  organizeImports: () => organizeImports
 });
 
 // src/services/organizeImports.ts
@@ -166516,48 +166559,39 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
   const shouldSort = mode === "SortAndCombine" /* SortAndCombine */ || mode === "All" /* All */;
   const shouldCombine = shouldSort;
   const shouldRemove = mode === "RemoveUnused" /* RemoveUnused */ || mode === "All" /* All */;
-  const topLevelImportDecls = sourceFile.statements.filter(isImportDeclaration);
-  const topLevelImportGroupDecls = groupByNewlineContiguous(sourceFile, topLevelImportDecls);
-  const { comparersToTest, typeOrdersToTest } = getDetectionLists(preferences);
-  const defaultComparer = comparersToTest[0];
-  const comparer = {
-    moduleSpecifierComparer: typeof preferences.organizeImportsIgnoreCase === "boolean" ? defaultComparer : void 0,
-    namedImportComparer: typeof preferences.organizeImportsIgnoreCase === "boolean" ? defaultComparer : void 0,
-    typeOrder: preferences.organizeImportsTypeOrder
+  const topLevelImportGroupDecls = groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration));
+  const comparer = getOrganizeImportsComparerWithDetection(preferences, shouldSort ? () => detectSortingWorker(topLevelImportGroupDecls, preferences) === 2 /* CaseInsensitive */ : void 0);
+  const processImportsOfSameModuleSpecifier = (importGroup) => {
+    if (shouldRemove)
+      importGroup = removeUnusedImports(importGroup, sourceFile, program);
+    if (shouldCombine)
+      importGroup = coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
+    if (shouldSort)
+      importGroup = stableSort(importGroup, (s1, s2) => compareImportsOrRequireStatements(s1, s2, comparer));
+    return importGroup;
   };
-  if (typeof preferences.organizeImportsIgnoreCase !== "boolean") {
-    ({ comparer: comparer.moduleSpecifierComparer } = detectModuleSpecifierCaseBySort(topLevelImportGroupDecls, comparersToTest));
-  }
-  if (!comparer.typeOrder || typeof preferences.organizeImportsIgnoreCase !== "boolean") {
-    const namedImportSort = detectNamedImportOrganizationBySort(topLevelImportDecls, comparersToTest, typeOrdersToTest);
-    if (namedImportSort) {
-      const { namedImportComparer, typeOrder } = namedImportSort;
-      comparer.namedImportComparer = comparer.namedImportComparer ?? namedImportComparer;
-      comparer.typeOrder = comparer.typeOrder ?? typeOrder;
-    }
-  }
-  topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, comparer));
+  topLevelImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
   if (mode !== "RemoveUnused" /* RemoveUnused */) {
-    getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeExportsWorker(exportGroupDecl, comparer.namedImportComparer));
+    getTopLevelExportGroups(sourceFile).forEach((exportGroupDecl) => organizeImportsWorker(exportGroupDecl, (group2) => coalesceExportsWorker(group2, comparer, preferences)));
   }
   for (const ambientModule of sourceFile.statements.filter(isAmbientModule)) {
     if (!ambientModule.body)
       continue;
     const ambientModuleImportGroupDecls = groupByNewlineContiguous(sourceFile, ambientModule.body.statements.filter(isImportDeclaration));
-    ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, comparer));
+    ambientModuleImportGroupDecls.forEach((importGroupDecl) => organizeImportsWorker(importGroupDecl, processImportsOfSameModuleSpecifier));
     if (mode !== "RemoveUnused" /* RemoveUnused */) {
       const ambientModuleExportDecls = ambientModule.body.statements.filter(isExportDeclaration);
-      organizeExportsWorker(ambientModuleExportDecls, comparer.namedImportComparer);
+      organizeImportsWorker(ambientModuleExportDecls, (group2) => coalesceExportsWorker(group2, comparer, preferences));
     }
   }
   return changeTracker.getChanges();
-  function organizeDeclsWorker(oldImportDecls, coalesce) {
+  function organizeImportsWorker(oldImportDecls, coalesce) {
     if (length(oldImportDecls) === 0) {
       return;
     }
     setEmitFlags(oldImportDecls[0], 1024 /* NoLeadingComments */);
     const oldImportGroups = shouldCombine ? group(oldImportDecls, (importDecl) => getExternalModuleName2(importDecl.moduleSpecifier)) : [oldImportDecls];
-    const sortedImportGroups = shouldSort ? stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiersWorker(group1[0].moduleSpecifier, group2[0].moduleSpecifier, comparer.moduleSpecifierComparer ?? defaultComparer)) : oldImportGroups;
+    const sortedImportGroups = shouldSort ? stableSort(oldImportGroups, (group1, group2) => compareModuleSpecifiersWorker(group1[0].moduleSpecifier, group2[0].moduleSpecifier, comparer)) : oldImportGroups;
     const newImportDecls = flatMap(sortedImportGroups, (importGroup) => getExternalModuleName2(importGroup[0].moduleSpecifier) || importGroup[0].moduleSpecifier === void 0 ? coalesce(importGroup) : importGroup);
     if (newImportDecls.length === 0) {
       changeTracker.deleteNodes(
@@ -166584,40 +166618,6 @@ function organizeImports(sourceFile, formatContext, host, program, preferences,
       }, hasTrailingComment);
     }
   }
-  function organizeImportsWorker(oldImportDecls, comparer2) {
-    const detectedModuleCaseComparer = comparer2.moduleSpecifierComparer ?? defaultComparer;
-    const detectedNamedImportCaseComparer = comparer2.namedImportComparer ?? defaultComparer;
-    const detectedTypeOrder = comparer2.typeOrder ?? "last";
-    const specifierComparer = getNamedImportSpecifierComparer({ organizeImportsTypeOrder: detectedTypeOrder }, detectedNamedImportCaseComparer);
-    const processImportsOfSameModuleSpecifier = (importGroup) => {
-      if (shouldRemove)
-        importGroup = removeUnusedImports(importGroup, sourceFile, program);
-      if (shouldCombine)
-        importGroup = coalesceImportsWorker(importGroup, detectedModuleCaseComparer, specifierComparer, sourceFile);
-      if (shouldSort)
-        importGroup = stableSort(importGroup, (s1, s2) => compareImportsOrRequireStatements(s1, s2, detectedModuleCaseComparer));
-      return importGroup;
-    };
-    organizeDeclsWorker(oldImportDecls, processImportsOfSameModuleSpecifier);
-  }
-  function organizeExportsWorker(oldExportDecls, specifierCaseComparer) {
-    const useComparer = getNamedImportSpecifierComparer(preferences, specifierCaseComparer);
-    organizeDeclsWorker(oldExportDecls, (group2) => coalesceExportsWorker(group2, useComparer));
-  }
-}
-function getDetectionLists(preferences) {
-  return {
-    comparersToTest: typeof preferences.organizeImportsIgnoreCase === "boolean" ? [getOrganizeImportsStringComparer(preferences, preferences.organizeImportsIgnoreCase)] : [getOrganizeImportsStringComparer(
-      preferences,
-      /*ignoreCase*/
-      true
-    ), getOrganizeImportsStringComparer(
-      preferences,
-      /*ignoreCase*/
-      false
-    )],
-    typeOrdersToTest: preferences.organizeImportsTypeOrder ? [preferences.organizeImportsTypeOrder] : ["last", "inline", "first"]
-  };
 }
 function groupByNewlineContiguous(sourceFile, decls) {
   const scanner2 = createScanner(
@@ -166655,33 +166655,6 @@ function isNewGroup(sourceFile, decl, scanner2) {
   }
   return false;
 }
-function getTopLevelExportGroups(sourceFile) {
-  const topLevelExportGroups = [];
-  const statements = sourceFile.statements;
-  const len = length(statements);
-  let i = 0;
-  let groupIndex = 0;
-  while (i < len) {
-    if (isExportDeclaration(statements[i])) {
-      if (topLevelExportGroups[groupIndex] === void 0) {
-        topLevelExportGroups[groupIndex] = [];
-      }
-      const exportDecl = statements[i];
-      if (exportDecl.moduleSpecifier) {
-        topLevelExportGroups[groupIndex].push(exportDecl);
-        i++;
-      } else {
-        while (i < len && isExportDeclaration(statements[i])) {
-          topLevelExportGroups[groupIndex].push(statements[i++]);
-        }
-        groupIndex++;
-      }
-    } else {
-      i++;
-    }
-  }
-  return flatMap(topLevelExportGroups, (exportGroupDecls) => groupByNewlineContiguous(sourceFile, exportGroupDecls));
-}
 function removeUnusedImports(oldImports, sourceFile, program) {
   const typeChecker = program.getTypeChecker();
   const compilerOptions = program.getCompilerOptions();
@@ -166733,38 +166706,18 @@ function removeUnusedImports(oldImports, sourceFile, program) {
     return jsxElementsPresent && (identifier.text === jsxNamespace || jsxFragmentFactory && identifier.text === jsxFragmentFactory) && jsxModeNeedsExplicitImport(compilerOptions.jsx) || ts_FindAllReferences_exports.Core.isSymbolReferencedInFile(identifier, typeChecker, sourceFile);
   }
 }
+function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
+  const moduleSpecifierText = isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
+  return isString(moduleSpecifierText) && some(sourceFile.moduleAugmentations, (moduleName) => isStringLiteral(moduleName) && moduleName.text === moduleSpecifierText);
+}
 function getExternalModuleName2(specifier) {
   return specifier !== void 0 && isStringLiteralLike(specifier) ? specifier.text : void 0;
 }
-function getCategorizedImports(importGroup) {
-  let importWithoutClause;
-  const typeOnlyImports = { defaultImports: [], namespaceImports: [], namedImports: [] };
-  const regularImports = { defaultImports: [], namespaceImports: [], namedImports: [] };
-  for (const importDeclaration of importGroup) {
-    if (importDeclaration.importClause === void 0) {
-      importWithoutClause = importWithoutClause || importDeclaration;
-      continue;
-    }
-    const group2 = importDeclaration.importClause.isTypeOnly ? typeOnlyImports : regularImports;
-    const { name, namedBindings } = importDeclaration.importClause;
-    if (name) {
-      group2.defaultImports.push(importDeclaration);
-    }
-    if (namedBindings) {
-      if (isNamespaceImport(namedBindings)) {
-        group2.namespaceImports.push(importDeclaration);
-      } else {
-        group2.namedImports.push(importDeclaration);
-      }
-    }
-  }
-  return {
-    importWithoutClause,
-    typeOnlyImports,
-    regularImports
-  };
+function coalesceImports(importGroup, ignoreCase, sourceFile, preferences) {
+  const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
+  return coalesceImportsWorker(importGroup, comparer, sourceFile, preferences);
 }
-function coalesceImportsWorker(importGroup, comparer, specifierComparer, sourceFile) {
+function coalesceImportsWorker(importGroup, comparer, sourceFile, preferences) {
   if (importGroup.length === 0) {
     return importGroup;
   }
@@ -166831,7 +166784,7 @@ function coalesceImportsWorker(importGroup, comparer, specifierComparer, sourceF
       }
       newImportSpecifiers.push(...getNewImportSpecifiers(namedImports));
       const sortedImportSpecifiers = factory.createNodeArray(
-        stableSort(newImportSpecifiers, specifierComparer),
+        sortSpecifiers(newImportSpecifiers, comparer, preferences),
         firstNamedImport == null ? void 0 : firstNamedImport.importClause.namedBindings.elements.hasTrailingComma
       );
       const newNamedImports = sortedImportSpecifiers.length === 0 ? newDefaultImport ? void 0 : factory.createNamedImports(emptyArray) : firstNamedImport ? factory.updateNamedImports(firstNamedImport.importClause.namedBindings, sortedImportSpecifiers) : factory.createNamedImports(sortedImportSpecifiers);
@@ -166864,7 +166817,39 @@ function coalesceImportsWorker(importGroup, comparer, specifierComparer, sourceF
   }
   return coalescedImports;
 }
-function coalesceExportsWorker(exportGroup, specifierComparer) {
+function getCategorizedImports(importGroup) {
+  let importWithoutClause;
+  const typeOnlyImports = { defaultImports: [], namespaceImports: [], namedImports: [] };
+  const regularImports = { defaultImports: [], namespaceImports: [], namedImports: [] };
+  for (const importDeclaration of importGroup) {
+    if (importDeclaration.importClause === void 0) {
+      importWithoutClause = importWithoutClause || importDeclaration;
+      continue;
+    }
+    const group2 = importDeclaration.importClause.isTypeOnly ? typeOnlyImports : regularImports;
+    const { name, namedBindings } = importDeclaration.importClause;
+    if (name) {
+      group2.defaultImports.push(importDeclaration);
+    }
+    if (namedBindings) {
+      if (isNamespaceImport(namedBindings)) {
+        group2.namespaceImports.push(importDeclaration);
+      } else {
+        group2.namedImports.push(importDeclaration);
+      }
+    }
+  }
+  return {
+    importWithoutClause,
+    typeOnlyImports,
+    regularImports
+  };
+}
+function coalesceExports(exportGroup, ignoreCase, preferences) {
+  const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
+  return coalesceExportsWorker(exportGroup, comparer, preferences);
+}
+function coalesceExportsWorker(exportGroup, comparer, preferences) {
   if (exportGroup.length === 0) {
     return exportGroup;
   }
@@ -166879,7 +166864,7 @@ function coalesceExportsWorker(exportGroup, specifierComparer) {
     }
     const newExportSpecifiers = [];
     newExportSpecifiers.push(...flatMap(exportGroup2, (i) => i.exportClause && isNamedExports(i.exportClause) ? i.exportClause.elements : emptyArray));
-    const sortedExportSpecifiers = stableSort(newExportSpecifiers, specifierComparer);
+    const sortedExportSpecifiers = sortSpecifiers(newExportSpecifiers, comparer, preferences);
     const exportDecl = exportGroup2[0];
     coalescedExports.push(
       factory.updateExportDeclaration(
@@ -166923,6 +166908,9 @@ function updateImportDeclarationAndClause(importDeclaration, name, namedBindings
     importDeclaration.attributes
   );
 }
+function sortSpecifiers(specifiers, comparer, preferences) {
+  return stableSort(specifiers, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
+}
 function compareImportOrExportSpecifiers(s1, s2, comparer, preferences) {
   switch (preferences == null ? void 0 : preferences.organizeImportsTypeOrder) {
     case "first":
@@ -166933,14 +166921,15 @@ function compareImportOrExportSpecifiers(s1, s2, comparer, preferences) {
       return compareBooleans(s1.isTypeOnly, s2.isTypeOnly) || comparer(s1.name.text, s2.name.text);
   }
 }
+function compareModuleSpecifiers2(m1, m2, ignoreCase) {
+  const comparer = getOrganizeImportsOrdinalStringComparer(!!ignoreCase);
+  return compareModuleSpecifiersWorker(m1, m2, comparer);
+}
 function compareModuleSpecifiersWorker(m1, m2, comparer) {
   const name1 = m1 === void 0 ? void 0 : getExternalModuleName2(m1);
   const name2 = m2 === void 0 ? void 0 : getExternalModuleName2(m2);
   return compareBooleans(name1 === void 0, name2 === void 0) || compareBooleans(isExternalModuleNameRelative(name1), isExternalModuleNameRelative(name2)) || comparer(name1, name2);
 }
-function getModuleNamesFromDecls(decls) {
-  return decls.map((s) => getExternalModuleName2(getModuleSpecifierExpression(s)) || "");
-}
 function getModuleSpecifierExpression(declaration) {
   var _a;
   switch (declaration.kind) {
@@ -166952,114 +166941,164 @@ function getModuleSpecifierExpression(declaration) {
       return declaration.declarationList.declarations[0].initializer.arguments[0];
   }
 }
-function hasModuleDeclarationMatchingSpecifier(sourceFile, moduleSpecifier) {
-  const moduleSpecifierText = isStringLiteral(moduleSpecifier) && moduleSpecifier.text;
-  return isString(moduleSpecifierText) && some(sourceFile.moduleAugmentations, (moduleName) => isStringLiteral(moduleName) && moduleName.text === moduleSpecifierText);
-}
-function getNewImportSpecifiers(namedImports) {
-  return flatMap(namedImports, (namedImport) => map(tryGetNamedBindingElements(namedImport), (importSpecifier) => importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText ? factory.updateImportSpecifier(
-    importSpecifier,
-    importSpecifier.isTypeOnly,
-    /*propertyName*/
-    void 0,
-    importSpecifier.name
-  ) : importSpecifier));
-}
-function tryGetNamedBindingElements(namedImport) {
-  var _a;
-  return ((_a = namedImport.importClause) == null ? void 0 : _a.namedBindings) && isNamedImports(namedImport.importClause.namedBindings) ? namedImport.importClause.namedBindings.elements : void 0;
-}
-function detectModuleSpecifierCaseBySort(importDeclsByGroup, comparersToTest) {
-  const moduleSpecifiersByGroup = [];
-  importDeclsByGroup.forEach((importGroup) => {
-    moduleSpecifiersByGroup.push(getModuleNamesFromDecls(importGroup));
-  });
-  return detectCaseSensitivityBySort(moduleSpecifiersByGroup, comparersToTest);
+function detectSorting(sourceFile, preferences) {
+  return detectSortingWorker(
+    groupByNewlineContiguous(sourceFile, sourceFile.statements.filter(isImportDeclaration)),
+    preferences
+  );
 }
-function detectNamedImportOrganizationBySort(originalGroups, comparersToTest, typesToTest) {
-  let bothNamedImports = false;
-  const importDeclsWithNamed = originalGroups.filter((i) => {
-    var _a, _b;
-    const namedImports = (_b = tryCast((_a = i.importClause) == null ? void 0 : _a.namedBindings, isNamedImports)) == null ? void 0 : _b.elements;
-    if (!(namedImports == null ? void 0 : namedImports.length))
-      return false;
-    if (!bothNamedImports && namedImports.some((n) => n.isTypeOnly) && namedImports.some((n) => !n.isTypeOnly)) {
-      bothNamedImports = true;
-    }
-    return true;
-  });
-  if (importDeclsWithNamed.length === 0)
-    return;
-  const namedImportsByDecl = importDeclsWithNamed.map((importDecl) => {
-    var _a, _b;
-    return (_b = tryCast((_a = importDecl.importClause) == null ? void 0 : _a.namedBindings, isNamedImports)) == null ? void 0 : _b.elements;
-  }).filter((elements) => elements !== void 0);
-  if (!bothNamedImports || typesToTest.length === 0) {
-    const sortState = detectCaseSensitivityBySort(namedImportsByDecl.map((i) => i.map((n) => n.name.text)), comparersToTest);
-    return {
-      namedImportComparer: sortState.comparer,
-      typeOrder: typesToTest.length === 1 ? typesToTest[0] : void 0,
-      isSorted: sortState.isSorted
-    };
-  }
-  const bestDiff = { first: Infinity, last: Infinity, inline: Infinity };
-  const bestComparer = { first: comparersToTest[0], last: comparersToTest[0], inline: comparersToTest[0] };
-  for (const curComparer of comparersToTest) {
-    const currDiff = { first: 0, last: 0, inline: 0 };
-    for (const importDecl of namedImportsByDecl) {
-      for (const typeOrder of typesToTest) {
-        currDiff[typeOrder] = (currDiff[typeOrder] ?? 0) + measureSortedness(importDecl, (n1, n2) => compareImportOrExportSpecifiers(n1, n2, curComparer, { organizeImportsTypeOrder: typeOrder }));
+function detectSortingWorker(importGroups, preferences) {
+  const collateCaseSensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    false
+  );
+  const collateCaseInsensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    true
+  );
+  let sortState = 3 /* Both */;
+  let seenUnsortedGroup = false;
+  for (const importGroup of importGroups) {
+    if (importGroup.length > 1) {
+      const moduleSpecifierSort = detectSortCaseSensitivity(
+        importGroup,
+        (i) => {
+          var _a;
+          return ((_a = tryCast(i.moduleSpecifier, isStringLiteral)) == null ? void 0 : _a.text) ?? "";
+        },
+        collateCaseSensitive,
+        collateCaseInsensitive
+      );
+      if (moduleSpecifierSort) {
+        sortState &= moduleSpecifierSort;
+        seenUnsortedGroup = true;
       }
-    }
-    for (const key of typesToTest) {
-      const typeOrder = key;
-      if (currDiff[typeOrder] < bestDiff[typeOrder]) {
-        bestDiff[typeOrder] = currDiff[typeOrder];
-        bestComparer[typeOrder] = curComparer;
+      if (!sortState) {
+        return sortState;
       }
     }
-  }
-  outer:
-    for (const bestKey of typesToTest) {
-      const bestTypeOrder = bestKey;
-      for (const testKey of typesToTest) {
-        const testTypeOrder = testKey;
-        if (bestDiff[testTypeOrder] < bestDiff[bestTypeOrder])
-          continue outer;
+    const declarationWithNamedImports = find(
+      importGroup,
+      (i) => {
+        var _a, _b;
+        return ((_b = tryCast((_a = i.importClause) == null ? void 0 : _a.namedBindings, isNamedImports)) == null ? void 0 : _b.elements.length) > 1;
+      }
+    );
+    if (declarationWithNamedImports) {
+      const namedImportSort = detectImportSpecifierSorting(declarationWithNamedImports.importClause.namedBindings.elements, preferences);
+      if (namedImportSort) {
+        sortState &= namedImportSort;
+        seenUnsortedGroup = true;
+      }
+      if (!sortState) {
+        return sortState;
       }
-      return { namedImportComparer: bestComparer[bestTypeOrder], typeOrder: bestTypeOrder, isSorted: bestDiff[bestTypeOrder] === 0 };
     }
-  return { namedImportComparer: bestComparer.last, typeOrder: "last", isSorted: bestDiff.last === 0 };
-}
-function measureSortedness(arr, comparer) {
-  let i = 0;
-  for (let j = 0; j < arr.length - 1; j++) {
-    if (comparer(arr[j], arr[j + 1]) > 0) {
-      i++;
+    if (sortState !== 3 /* Both */) {
+      return sortState;
     }
   }
-  return i;
+  return seenUnsortedGroup ? 0 /* None */ : sortState;
 }
-function detectCaseSensitivityBySort(originalGroups, comparersToTest) {
-  let bestComparer;
-  let bestDiff = Infinity;
-  for (const curComparer of comparersToTest) {
-    let diffOfCurrentComparer = 0;
-    for (const listToSort of originalGroups) {
-      if (listToSort.length <= 1)
-        continue;
-      const diff = measureSortedness(listToSort, curComparer);
-      diffOfCurrentComparer += diff;
+function detectImportDeclarationSorting(imports, preferences) {
+  const collateCaseSensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    false
+  );
+  const collateCaseInsensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    true
+  );
+  return detectSortCaseSensitivity(
+    imports,
+    (s) => getExternalModuleName2(getModuleSpecifierExpression(s)) || "",
+    collateCaseSensitive,
+    collateCaseInsensitive
+  );
+}
+var ImportSpecifierSortingCache = class {
+  has([specifiers, preferences]) {
+    if (this._lastPreferences !== preferences || !this._cache)
+      return false;
+    return this._cache.has(specifiers);
+  }
+  get([specifiers, preferences]) {
+    if (this._lastPreferences !== preferences || !this._cache)
+      return void 0;
+    return this._cache.get(specifiers);
+  }
+  set([specifiers, preferences], value) {
+    if (this._lastPreferences !== preferences) {
+      this._lastPreferences = preferences;
+      this._cache = void 0;
+    }
+    this._cache ?? (this._cache = /* @__PURE__ */ new WeakMap());
+    this._cache.set(specifiers, value);
+  }
+};
+var detectImportSpecifierSorting = memoizeCached((specifiers, preferences) => {
+  switch (preferences.organizeImportsTypeOrder) {
+    case "first":
+      if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s2.isTypeOnly, s1.isTypeOnly)))
+        return 0 /* None */;
+      break;
+    case "inline":
+      if (!arrayIsSorted(specifiers, (s1, s2) => {
+        const comparer = getStringComparer(
+          /*ignoreCase*/
+          true
+        );
+        return comparer(s1.name.text, s2.name.text);
+      })) {
+        return 0 /* None */;
+      }
+      break;
+    default:
+      if (!arrayIsSorted(specifiers, (s1, s2) => compareBooleans(s1.isTypeOnly, s2.isTypeOnly)))
+        return 0 /* None */;
+      break;
+  }
+  const collateCaseSensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    false
+  );
+  const collateCaseInsensitive = getOrganizeImportsComparer(
+    preferences,
+    /*ignoreCase*/
+    true
+  );
+  if (preferences.organizeImportsTypeOrder !== "inline") {
+    const { type: regularImports, regular: typeImports } = groupBy(specifiers, (s) => s.isTypeOnly ? "type" : "regular");
+    const regularCaseSensitivity = (regularImports == null ? void 0 : regularImports.length) ? detectSortCaseSensitivity(regularImports, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive) : void 0;
+    const typeCaseSensitivity = (typeImports == null ? void 0 : typeImports.length) ? detectSortCaseSensitivity(typeImports, (specifier) => specifier.name.text ?? "", collateCaseSensitive, collateCaseInsensitive) : void 0;
+    if (regularCaseSensitivity === void 0) {
+      return typeCaseSensitivity ?? 0 /* None */;
     }
-    if (diffOfCurrentComparer < bestDiff) {
-      bestDiff = diffOfCurrentComparer;
-      bestComparer = curComparer;
+    if (typeCaseSensitivity === void 0) {
+      return regularCaseSensitivity;
     }
+    if (regularCaseSensitivity === 0 /* None */ || typeCaseSensitivity === 0 /* None */) {
+      return 0 /* None */;
+    }
+    return typeCaseSensitivity & regularCaseSensitivity;
   }
-  return {
-    comparer: bestComparer ?? comparersToTest[0],
-    isSorted: bestDiff === 0
-  };
+  return detectSortCaseSensitivity(specifiers, (specifier) => specifier.name.text, collateCaseSensitive, collateCaseInsensitive);
+}, new ImportSpecifierSortingCache());
+function getImportDeclarationInsertionIndex(sortedImports, newImport, comparer) {
+  const index = binarySearch(sortedImports, newImport, identity, (a, b) => compareImportsOrRequireStatements(a, b, comparer));
+  return index < 0 ? ~index : index;
+}
+function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer, preferences) {
+  const index = binarySearch(sortedImports, newImport, identity, (s1, s2) => compareImportOrExportSpecifiers(s1, s2, comparer, preferences));
+  return index < 0 ? ~index : index;
+}
+function compareImportsOrRequireStatements(s1, s2, comparer) {
+  return compareModuleSpecifiersWorker(getModuleSpecifierExpression(s1), getModuleSpecifierExpression(s2), comparer) || compareImportKind(s1, s2);
 }
 function compareImportKind(s1, s2) {
   return compareValues(getImportKindOrder(s1), getImportKindOrder(s2));
@@ -167083,6 +167122,19 @@ function getImportKindOrder(s1) {
       return 6;
   }
 }
+function getNewImportSpecifiers(namedImports) {
+  return flatMap(namedImports, (namedImport) => map(tryGetNamedBindingElements(namedImport), (importSpecifier) => importSpecifier.name && importSpecifier.propertyName && importSpecifier.name.escapedText === importSpecifier.propertyName.escapedText ? factory.updateImportSpecifier(
+    importSpecifier,
+    importSpecifier.isTypeOnly,
+    /*propertyName*/
+    void 0,
+    importSpecifier.name
+  ) : importSpecifier));
+}
+function tryGetNamedBindingElements(namedImport) {
+  var _a;
+  return ((_a = namedImport.importClause) == null ? void 0 : _a.namedBindings) && isNamedImports(namedImport.importClause.namedBindings) ? namedImport.importClause.namedBindings.elements : void 0;
+}
 function getOrganizeImportsOrdinalStringComparer(ignoreCase) {
   return ignoreCase ? compareStringsCaseInsensitiveEslintCompatible : compareStringsCaseSensitive;
 }
@@ -167110,61 +167162,40 @@ function getOrganizeImportsLocale(preferences) {
   const resolvedLocale = supportedLocales.length ? supportedLocales[0] : "en";
   return resolvedLocale;
 }
-function getOrganizeImportsStringComparer(preferences, ignoreCase) {
+function getOrganizeImportsComparer(preferences, ignoreCase) {
   const collation = preferences.organizeImportsCollation ?? "ordinal";
   return collation === "unicode" ? getOrganizeImportsUnicodeStringComparer(ignoreCase, preferences) : getOrganizeImportsOrdinalStringComparer(ignoreCase);
 }
-function getOrganizeImportsStringComparerWithDetection(originalImportDecls, preferences) {
-  return detectModuleSpecifierCaseBySort([originalImportDecls], getDetectionLists(preferences).comparersToTest);
+function getOrganizeImportsComparerWithDetection(preferences, detectIgnoreCase) {
+  const ignoreCase = typeof preferences.organizeImportsIgnoreCase === "boolean" ? preferences.organizeImportsIgnoreCase : (detectIgnoreCase == null ? void 0 : detectIgnoreCase()) ?? false;
+  return getOrganizeImportsComparer(preferences, ignoreCase);
 }
-function getNamedImportSpecifierComparer(preferences, comparer) {
-  const stringComparer = comparer ?? getOrganizeImportsOrdinalStringComparer(!!preferences.organizeImportsIgnoreCase);
-  return (s1, s2) => compareImportOrExportSpecifiers(s1, s2, stringComparer, preferences);
-}
-function getNamedImportSpecifierComparerWithDetection(importDecl, preferences, sourceFile) {
-  const { comparersToTest, typeOrdersToTest } = getDetectionLists(preferences);
-  const detectFromDecl = detectNamedImportOrganizationBySort([importDecl], comparersToTest, typeOrdersToTest);
-  let specifierComparer = getNamedImportSpecifierComparer(preferences, comparersToTest[0]);
-  let isSorted;
-  if (typeof preferences.organizeImportsIgnoreCase !== "boolean" || !preferences.organizeImportsTypeOrder) {
-    if (detectFromDecl) {
-      const { namedImportComparer, typeOrder, isSorted: isDetectedSorted } = detectFromDecl;
-      isSorted = isDetectedSorted;
-      specifierComparer = getNamedImportSpecifierComparer({ organizeImportsTypeOrder: typeOrder }, namedImportComparer);
-    } else if (sourceFile) {
-      const detectFromFile = detectNamedImportOrganizationBySort(sourceFile.statements.filter(isImportDeclaration), comparersToTest, typeOrdersToTest);
-      if (detectFromFile) {
-        const { namedImportComparer, typeOrder, isSorted: isDetectedSorted } = detectFromFile;
-        isSorted = isDetectedSorted;
-        specifierComparer = getNamedImportSpecifierComparer({ organizeImportsTypeOrder: typeOrder }, namedImportComparer);
+function getTopLevelExportGroups(sourceFile) {
+  const topLevelExportGroups = [];
+  const statements = sourceFile.statements;
+  const len = length(statements);
+  let i = 0;
+  let groupIndex = 0;
+  while (i < len) {
+    if (isExportDeclaration(statements[i])) {
+      if (topLevelExportGroups[groupIndex] === void 0) {
+        topLevelExportGroups[groupIndex] = [];
       }
+      const exportDecl = statements[i];
+      if (exportDecl.moduleSpecifier) {
+        topLevelExportGroups[groupIndex].push(exportDecl);
+        i++;
+      } else {
+        while (i < len && isExportDeclaration(statements[i])) {
+          topLevelExportGroups[groupIndex].push(statements[i++]);
+        }
+        groupIndex++;
+      }
+    } else {
+      i++;
     }
   }
-  return { specifierComparer, isSorted };
-}
-function getImportDeclarationInsertionIndex(sortedImports, newImport, comparer) {
-  const index = binarySearch(sortedImports, newImport, identity, (a, b) => compareImportsOrRequireStatements(a, b, comparer));
-  return index < 0 ? ~index : index;
-}
-function getImportSpecifierInsertionIndex(sortedImports, newImport, comparer) {
-  const index = binarySearch(sortedImports, newImport, identity, comparer);
-  return index < 0 ? ~index : index;
-}
-function compareImportsOrRequireStatements(s1, s2, comparer) {
-  return compareModuleSpecifiersWorker(getModuleSpecifierExpression(s1), getModuleSpecifierExpression(s2), comparer) || compareImportKind(s1, s2);
-}
-function testCoalesceImports(importGroup, ignoreCase, sourceFile, preferences) {
-  const comparer = getOrganizeImportsOrdinalStringComparer(ignoreCase);
-  const specifierComparer = getNamedImportSpecifierComparer({ organizeImportsTypeOrder: preferences == null ? void 0 : preferences.organizeImportsTypeOrder }, comparer);
-  return coalesceImportsWorker(importGroup, comparer, specifierComparer, sourceFile);
-}
-function testCoalesceExports(exportGroup, ignoreCase, preferences) {
-  const comparer = (s1, s2) => compareImportOrExportSpecifiers(s1, s2, getOrganizeImportsOrdinalStringComparer(ignoreCase), { organizeImportsTypeOrder: (preferences == null ? void 0 : preferences.organizeImportsTypeOrder) ?? "last" });
-  return coalesceExportsWorker(exportGroup, comparer);
-}
-function compareModuleSpecifiers2(m1, m2, ignoreCase) {
-  const comparer = getOrganizeImportsOrdinalStringComparer(!!ignoreCase);
-  return compareModuleSpecifiersWorker(m1, m2, comparer);
+  return flatMap(topLevelExportGroups, (exportGroupDecls) => groupByNewlineContiguous(sourceFile, exportGroupDecls));
 }
 
 // src/services/_namespaces/ts.OutliningElementsCollector.ts
@@ -173317,6 +173348,7 @@ __export(ts_exports2, {
   SignatureKind: () => SignatureKind,
   SmartSelectionRange: () => ts_SmartSelectionRange_exports,
   SnippetKind: () => SnippetKind,
+  SortKind: () => SortKind,
   StructureIsReused: () => StructureIsReused,
   SymbolAccessibility: () => SymbolAccessibility,
   SymbolDisplay: () => ts_SymbolDisplay_exports,
@@ -173651,6 +173683,7 @@ __export(ts_exports2, {
   defaultIncludeSpec: () => defaultIncludeSpec,
   defaultInitCompilerOptions: () => defaultInitCompilerOptions,
   defaultMaximumTruncationLength: () => defaultMaximumTruncationLength,
+  detectSortCaseSensitivity: () => detectSortCaseSensitivity,
   diagnosticCategoryName: () => diagnosticCategoryName,
   diagnosticToString: () => diagnosticToString,
   directoryProbablyExists: () => directoryProbablyExists,
@@ -188090,6 +188123,7 @@ start(initializeNodeSystem(), require("os").platform());
   SignatureKind,
   SmartSelectionRange,
   SnippetKind,
+  SortKind,
   StructureIsReused,
   SymbolAccessibility,
   SymbolDisplay,
@@ -188424,6 +188458,7 @@ start(initializeNodeSystem(), require("os").platform());
   defaultIncludeSpec,
   defaultInitCompilerOptions,
   defaultMaximumTruncationLength,
+  detectSortCaseSensitivity,
   diagnosticCategoryName,
   diagnosticToString,
   directoryProbablyExists,