Flip imports to case insensitive sorting (#51579)

src/server/editorServices.ts

@@ -1,104 +1,57 @@
 import {
     ActionInvalidate,
     ActionSet,
+    asNormalizedPath,
     AutoImportProviderProject,
     BeginEnablePluginResult,
     BeginInstallTypes,
     ConfiguredProject,
+    countEachFileTypes,
+    createPackageJsonCache,
+    emptyArray,
     EndInstallTypes,
     Errors,
     ExternalProject,
-    ITypingsInstaller,
+    getBaseConfigFileName,
+    hasNoTypeScriptSource,
     InferredProject,
     InvalidateCachedTypings,
-    LogLevel,
+    isConfiguredProject,
+    isDynamicFileName,
+    isInferredProject,
+    isInferredProjectName,
+    ITypingsInstaller,
     Logger,
+    LogLevel,
+    makeAutoImportProviderProjectName,
+    makeAuxiliaryProjectName,
+    makeInferredProjectName,
     Msg,
     NormalizedPath,
+    normalizedPathToPath,
+    nullTypingsInstaller,
     PackageInstalledResponse,
     PackageJsonCache,
     Project,
     ProjectFilesWithTSDiagnostics,
     ProjectKind,
     ProjectOptions,
+    protocol,
     ScriptInfo,
     ScriptInfoVersion,
     ServerHost,
     Session,
     SetTypings,
     ThrottledOperations,
-    TypingsCache,
-    asNormalizedPath,
-    countEachFileTypes,
-    createPackageJsonCache,
-    emptyArray,
-    getBaseConfigFileName,
-    hasNoTypeScriptSource,
-    isConfiguredProject,
-    isDynamicFileName,
-    isInferredProject,
-    isInferredProjectName,
-    makeAutoImportProviderProjectName,
-    makeAuxiliaryProjectName,
-    makeInferredProjectName,
-    normalizedPathToPath,
-    nullTypingsInstaller,
-    protocol,
     toNormalizedPath,
+    TypingsCache,
 } from "./_namespaces/ts.server";
 import {
-    AssertionLevel,
-    CachedDirectoryStructureHost,
-    CommandLineOption,
-    CompilerOptions,
-    CompletionInfo,
-    ConfigFileProgramReloadLevel,
-    Debug,
-    Diagnostic,
-    DirectoryStructureHost,
-    DocumentPosition,
-    DocumentPositionMapper,
-    DocumentRegistry,
-    DocumentRegistryBucketKeyWithMode,
-    ExtendedConfigCacheEntry,
-    FileExtensionInfo,
-    FileWatcher,
-    FileWatcherEventKind,
-    FormatCodeSettings,
-    HostCancellationToken,
-    IncompleteCompletionsCache,
-    IndentStyle,
-    LanguageServiceMode,
-    MultiMap,
-    PackageJsonAutoImportPreference,
-    ParsedCommandLine,
-    Path,
-    PerformanceEvent,
-    PluginImport,
-    PollingInterval,
-    ProjectPackageJsonInfo,
-    ProjectReference,
-    ReadMapFile,
-    ReadonlyCollection,
-    ResolvedProjectReference,
-    ScriptKind,
-    SharedExtendedConfigFileWatcher,
-    SourceFile,
-    SourceFileLike,
-    Ternary,
-    TextChange,
-    TsConfigSourceFile,
-    TypeAcquisition,
-    UserPreferences,
-    WatchDirectoryFlags,
-    WatchFactory,
-    WatchLogLevel,
-    WatchOptions,
-    WatchType,
-    WildcardDirectoryWatcher,
     addToSeen,
     arrayFrom,
     arrayToMap,
+    AssertionLevel,
+    CachedDirectoryStructureHost,
     canJsonReportNoInputFiles,
     canWatchDirectoryOrFile,
     cleanExtendedConfigCache,
@@ -106,6 +59,10 @@ import {
     clearSharedExtendedConfigFileWatcher,
     closeFileWatcherOf,
     combinePaths,
+    CommandLineOption,
+    CompilerOptions,
+    CompletionInfo,
+    ConfigFileProgramReloadLevel,
     contains,
     containsPath,
     convertCompilerOptionsForTelemetry,
@@ -115,10 +72,21 @@ import {
     createDocumentRegistryInternal,
     createGetCanonicalFileName,
     createMultiMap,
+    Debug,
+    Diagnostic,
     directorySeparator,
+    DirectoryStructureHost,
+    DocumentPosition,
+    DocumentPositionMapper,
+    DocumentRegistry,
+    DocumentRegistryBucketKeyWithMode,
     emptyOptions,
     ensureTrailingDirectorySeparator,
+    ExtendedConfigCacheEntry,
+    FileExtensionInfo,
     fileExtensionIs,
+    FileWatcher,
+    FileWatcherEventKind,
     find,
     flatMap,
     forEach,
@@ -126,6 +94,7 @@ import {
     forEachEntry,
     forEachKey,
     forEachResolvedProjectReference,
+    FormatCodeSettings,
     getAnyExtensionFromPath,
     getBaseFileName,
     getDefaultFormatCodeSettings,
@@ -140,7 +109,10 @@ import {
     hasExtension,
     hasProperty,
     hasTSFileExtension,
+    HostCancellationToken,
     identity,
+    IncompleteCompletionsCache,
+    IndentStyle,
     isArray,
     isIgnoredFileFromWildCardWatching,
     isInsideNodeModules,
@@ -148,37 +120,65 @@ import {
     isNodeModulesDirectory,
     isRootedDiskPath,
     isString,
+    LanguageServiceMode,
     length,
     map,
     mapDefinedEntries,
     mapDefinedIterator,
     missingFileModifiedTime,
+    MultiMap,
     noop,
     normalizePath,
     normalizeSlashes,
     optionDeclarations,
     optionsForWatch,
+    PackageJsonAutoImportPreference,
+    ParsedCommandLine,
     parseJsonSourceFileConfigFileContent,
     parseJsonText,
     parsePackageName,
+    Path,
+    PerformanceEvent,
+    PluginImport,
+    PollingInterval,
+    ProjectPackageJsonInfo,
+    ProjectReference,
+    ReadMapFile,
+    ReadonlyCollection,
     removeFileExtension,
     removeIgnoredPath,
     removeMinAndVersionNumbers,
+    ResolvedProjectReference,
     resolveProjectReferencePath,
     returnNoopFileWatcher,
     returnTrue,
+    ScriptKind,
+    SharedExtendedConfigFileWatcher,
     some,
+    SourceFile,
+    SourceFileLike,
     startsWith,
+    Ternary,
+    TextChange,
     toFileNameLowerCase,
     toPath,
     tracing,
     tryAddToSet,
     tryReadFile,
+    TsConfigSourceFile,
+    TypeAcquisition,
     typeAcquisitionDeclarations,
     unorderedRemoveItem,
     updateSharedExtendedConfigFileWatcher,
     updateWatchingWildcardDirectories,
+    UserPreferences,
     version,
+    WatchDirectoryFlags,
+    WatchFactory,
+    WatchLogLevel,
+    WatchOptions,
+    WatchType,
+    WildcardDirectoryWatcher,
 } from "./_namespaces/ts";
 
 export const maxProgramSizeForNonTsFiles = 20 * 1024 * 1024;

src/server/moduleSpecifierCache.ts

@@ -4,10 +4,10 @@ import {
     ModulePath,
     ModuleSpecifierCache,
     ModuleSpecifierOptions,
+    nodeModulesPathPart,
     Path,
     ResolvedModuleSpecifierInfo,
     UserPreferences,
-    nodeModulesPathPart,
 } from "./_namespaces/ts";
 
 /** @internal */

src/server/packageJsonCache.ts

@@ -1,12 +1,12 @@
 import {
+    combinePaths,
+    createPackageJsonInfo,
     Debug,
+    forEachAncestorDirectory,
+    getDirectoryPath,
     Path,
     ProjectPackageJsonInfo,
     Ternary,
-    combinePaths,
-    createPackageJsonInfo,
-    forEachAncestorDirectory,
-    getDirectoryPath,
     tryFileExists,
 } from "./_namespaces/ts";
 import { ProjectService } from "./_namespaces/ts.server";

src/server/project.ts

@@ -1,105 +1,65 @@
 import * as ts from "./_namespaces/ts";
 import {
+    asNormalizedPath,
+    createModuleSpecifierCache,
+    emptyArray,
     Errors,
     FileStats,
+    forEachResolvedProjectReferenceProject,
     LogLevel,
     ModuleImportResult,
     Msg,
     NormalizedPath,
+    projectContainsInfoDirectly,
     ProjectOptions,
     ProjectReferenceProjectLoadKind,
     ProjectService,
+    protocol,
     ScriptInfo,
     ServerHost,
     Session,
-    TypingsCache,
-    asNormalizedPath,
-    createModuleSpecifierCache,
-    emptyArray,
-    forEachResolvedProjectReferenceProject,
-    projectContainsInfoDirectly,
-    protocol,
     toNormalizedPath,
+    TypingsCache,
     updateProjectIfDirty,
 } from "./_namespaces/ts.server";
 import {
-    ApplyCodeActionCommandResult,
-    BuilderState,
-    CachedDirectoryStructureHost,
-    CompilerHost,
-    CompilerOptions,
-    ConfigFileProgramReloadLevel,
-    Debug,
-    Diagnostic,
-    DirectoryStructureHost,
-    DirectoryWatcherCallback,
-    DocumentPositionMapper,
-    DocumentRegistry,
-    ExportInfoMap,
-    Extension,
-    FileReference,
-    FileWatcher,
-    FileWatcherCallback,
-    FileWatcherEventKind,
-    GetCanonicalFileName,
-    HasInvalidatedResolutions,
-    HostCancellationToken,
-    IScriptSnapshot,
-    InstallPackageOptions,
-    JsTyping,
-    LanguageService,
-    LanguageServiceHost,
-    LanguageServiceMode,
-    ModuleResolutionCache,
-    ModuleResolutionHost,
-    ModuleResolutionInfo,
-    PackageJsonAutoImportPreference,
-    PackageJsonInfo,
-    ParsedCommandLine,
-    Path,
-    PerformanceEvent,
-    PluginImport,
-    PollingInterval,
-    Program,
-    ProjectPackageJsonInfo,
-    ProjectReference,
-    ResolutionCache,
-    ResolutionMode,
-    ResolvedModuleFull,
-    ResolvedModuleWithFailedLookupLocations,
-    ResolvedProjectReference,
-    ResolvedTypeReferenceDirective,
-    ScriptKind,
-    SortedReadonlyArray,
-    SourceFile,
-    SourceMapper,
-    StructureIsReused,
-    SymlinkCache,
-    ThrottledCancellationToken,
-    TypeAcquisition,
-    TypeReferenceDirectiveResolutionInfo,
-    WatchDirectoryFlags,
-    WatchOptions,
-    WatchType,
     addRange,
     append,
+    ApplyCodeActionCommandResult,
     arrayFrom,
     arrayToMap,
+    BuilderState,
+    CachedDirectoryStructureHost,
     changesAffectModuleResolution,
     clearMap,
     cloneCompilerOptions,
     closeFileWatcher,
     closeFileWatcherOf,
     combinePaths,
+    CompilerHost,
+    CompilerOptions,
     concatenate,
+    ConfigFileProgramReloadLevel,
     createCacheableExportInfoMap,
     createLanguageService,
     createResolutionCache,
     createSymlinkCache,
+    Debug,
+    Diagnostic,
+    DirectoryStructureHost,
+    DirectoryWatcherCallback,
+    DocumentPositionMapper,
+    DocumentRegistry,
     enumerateInsertsAndDeletes,
     every,
     explainFiles,
+    ExportInfoMap,
+    Extension,
     fileExtensionIs,
+    FileReference,
+    FileWatcher,
+    FileWatcherCallback,
+    FileWatcherEventKind,
     filter,
     firstDefined,
     flatMap,
@@ -109,6 +69,7 @@ import {
     generateDjb2Hash,
     getAllowJSCompilerOption,
     getAutomaticTypeDirectiveNames,
+    GetCanonicalFileName,
     getDeclarationEmitOutputFilePathWorker,
     getDefaultCompilerOptions,
     getDefaultLibFileName,
@@ -120,36 +81,75 @@ import {
     getNormalizedAbsolutePath,
     getOrUpdate,
     getStringComparer,
+    HasInvalidatedResolutions,
+    HostCancellationToken,
     inferredTypesContainingFile,
+    InstallPackageOptions,
+    IScriptSnapshot,
     isDeclarationFileName,
     isExternalModuleNameRelative,
     isInsideNodeModules,
+    JsTyping,
+    LanguageService,
+    LanguageServiceHost,
+    LanguageServiceMode,
     map,
     mapDefined,
     maybeBind,
+    ModuleResolutionCache,
+    ModuleResolutionHost,
+    ModuleResolutionInfo,
     noop,
     noopFileWatcher,
     normalizePath,
     normalizeSlashes,
     orderedRemoveItem,
     outFile,
+    PackageJsonAutoImportPreference,
+    PackageJsonInfo,
+    ParsedCommandLine,
     parsePackageName,
+    Path,
     perfLogger,
+    PerformanceEvent,
+    PluginImport,
+    PollingInterval,
+    Program,
+    ProjectPackageJsonInfo,
+    ProjectReference,
     removeFileExtension,
+    ResolutionCache,
     resolutionExtensionIsTSOrJson,
+    ResolutionMode,
+    ResolvedModuleFull,
+    ResolvedModuleWithFailedLookupLocations,
+    ResolvedProjectReference,
+    ResolvedTypeReferenceDirective,
     resolvePackageNameToPackageJson,
     returnFalse,
     returnTrue,
+    ScriptKind,
     some,
     sort,
     sortAndDeduplicate,
+    SortedReadonlyArray,
+    SourceFile,
+    SourceMapper,
     startsWith,
     stripQuotes,
+    StructureIsReused,
+    SymlinkCache,
+    ThrottledCancellationToken,
     timestamp,
     toPath,
     tracing,
+    TypeAcquisition,
+    TypeReferenceDirectiveResolutionInfo,
     updateErrorForNoInputFiles,
     updateMissingFilePathsWatch,
+    WatchDirectoryFlags,
+    WatchOptions,
+    WatchType,
 } from "./_namespaces/ts";
 
 export enum ProjectKind {

src/server/scriptInfo.ts

@@ -4,32 +4,18 @@ import {
     Errors,
     ExternalProject,
     InferredProject,
-    NormalizedPath,
-    Project,
-    ProjectKind,
-    ScriptVersionCache,
-    ServerHost,
     isConfiguredProject,
     isExternalProject,
     isInferredProject,
     maxFileSize,
+    NormalizedPath,
+    Project,
+    ProjectKind,
     protocol,
+    ScriptVersionCache,
+    ServerHost,
 } from "./_namespaces/ts.server";
 import {
-    Debug,
-    DocumentPositionMapper,
-    DocumentRegistryBucketKeyWithMode,
-    FileWatcher,
-    FileWatcherEventKind,
-    FormatCodeSettings,
-    IScriptSnapshot,
-    LineInfo,
-    Path,
-    ScriptKind,
-    ScriptSnapshot,
-    SourceFile,
-    SourceFileLike,
-    TextSpan,
     assign,
     clear,
     closeFileWatcherOf,
@@ -38,18 +24,32 @@ import {
     computePositionOfLineAndCharacter,
     contains,
     createTextSpanFromBounds,
+    Debug,
     directorySeparator,
+    DocumentPositionMapper,
+    DocumentRegistryBucketKeyWithMode,
     emptyOptions,
+    FileWatcher,
+    FileWatcherEventKind,
     forEach,
+    FormatCodeSettings,
     getBaseFileName,
     getDefaultFormatCodeSettings,
     getLineInfo,
     getScriptKindFromFileName,
     getSnapshotText,
     hasTSFileExtension,
+    IScriptSnapshot,
     isString,
+    LineInfo,
+    Path,
+    ScriptKind,
+    ScriptSnapshot,
     some,
+    SourceFile,
+    SourceFileLike,
     stringContains,
+    TextSpan,
     unorderedRemoveItem,
 } from "./_namespaces/ts";
 

src/server/scriptVersionCache.ts

@@ -1,12 +1,12 @@
 import {
-    Debug,
-    IScriptSnapshot,
-    TextChangeRange,
-    TextSpan,
     collapseTextChangeRangesAcrossMultipleVersions,
     computeLineStarts,
     createTextChangeRange,
     createTextSpan,
+    Debug,
+    IScriptSnapshot,
+    TextChangeRange,
+    TextSpan,
     unchangedTextChangeRange,
 } from "./_namespaces/ts";
 import {

src/server/session.ts

@@ -1,7 +1,11 @@
 import {
+    arrayFrom,
+    arrayIterator,
+    arrayReverseIterator,
     CallHierarchyIncomingCall,
     CallHierarchyItem,
     CallHierarchyOutgoingCall,
+    cast,
     CodeAction,
     CodeActionCommand,
     CodeFixAction,
@@ -12,64 +16,6 @@ import {
     CompletionEntryDetails,
     CompletionInfo,
     CompletionTriggerKind,
-    Debug,
-    DefinitionInfo,
-    DefinitionInfoAndBoundSpan,
-    Diagnostic,
-    DiagnosticRelatedInformation,
-    DocumentHighlights,
-    DocumentPosition,
-    DocumentSpan,
-    EmitOutput,
-    FileTextChanges,
-    FindAllReferences,
-    FormatCodeSettings,
-    GoToDefinition,
-    HostCancellationToken,
-    ImplementationLocation,
-    ImportSpecifier,
-    JSDocLinkDisplayPart,
-    JSDocTagInfo,
-    LanguageServiceMode,
-    LineAndCharacter,
-    ModuleResolutionKind,
-    MultiMap,
-    NavigateToItem,
-    NavigationBarItem,
-    NavigationTree,
-    OperationCanceledException,
-    OrganizeImportsMode,
-    OutliningSpan,
-    Path,
-    PerformanceEvent,
-    PossibleProgramFileInfo,
-    Program,
-    QuickInfo,
-    RefactorEditInfo,
-    ReferenceEntry,
-    ReferencedSymbol,
-    ReferencedSymbolDefinitionInfo,
-    ReferencedSymbolEntry,
-    RenameInfo,
-    RenameLocation,
-    ScriptKind,
-    SelectionRange,
-    SemanticClassificationFormat,
-    SignatureHelpItem,
-    SignatureHelpItems,
-    SourceFile,
-    SymbolDisplayPart,
-    SyntaxKind,
-    TextChange,
-    TextInsertion,
-    TextRange,
-    TextSpan,
-    UserPreferences,
-    WithMetadata,
-    arrayFrom,
-    arrayIterator,
-    arrayReverseIterator,
-    cast,
     computeLineAndCharacterOfPosition,
     computeLineStarts,
     concatenate,
@@ -77,20 +23,32 @@ import {
     createSet,
     createTextSpan,
     createTextSpanFromBounds,
+    Debug,
     decodedTextSpanIntersectsWith,
     deduplicate,
+    DefinitionInfo,
+    DefinitionInfoAndBoundSpan,
+    Diagnostic,
     diagnosticCategoryName,
+    DiagnosticRelatedInformation,
     displayPartsToString,
+    DocumentHighlights,
+    DocumentPosition,
+    DocumentSpan,
     documentSpansEqual,
+    EmitOutput,
     equateValues,
+    FileTextChanges,
     filter,
     find,
+    FindAllReferences,
     first,
     firstOrUndefined,
     flatMap,
     flatMapToMutable,
     flattenDiagnosticMessageText,
     forEachNameInAccessChainWalkingLeft,
+    FormatCodeSettings,
     formatting,
     getDeclarationFromName,
     getDeclarationOfKind,
@@ -110,45 +68,96 @@ import {
     getTemporaryModuleResolutionState,
     getTextOfIdentifierOrLiteral,
     getTouchingPropertyName,
+    GoToDefinition,
+    HostCancellationToken,
     identity,
+    ImplementationLocation,
+    ImportSpecifier,
     isAccessExpression,
     isArray,
     isDeclarationFileName,
     isIdentifier,
     isString,
     isStringLiteralLike,
+    JSDocLinkDisplayPart,
+    JSDocTagInfo,
+    LanguageServiceMode,
+    LineAndCharacter,
     map,
     mapDefined,
     mapDefinedIterator,
     mapIterator,
     mapOneOrMany,
     memoize,
+    ModuleResolutionKind,
+    MultiMap,
+    NavigateToItem,
+    NavigationBarItem,
+    NavigationTree,
     nodeModulesPathPart,
     normalizePath,
+    OperationCanceledException,
+    OrganizeImportsMode,
     outFile,
+    OutliningSpan,
+    Path,
     perfLogger,
+    PerformanceEvent,
+    PossibleProgramFileInfo,
+    Program,
+    QuickInfo,
+    RefactorEditInfo,
+    ReferencedSymbol,
+    ReferencedSymbolDefinitionInfo,
+    ReferencedSymbolEntry,
+    ReferenceEntry,
     removeFileExtension,
+    RenameInfo,
+    RenameLocation,
+    ScriptKind,
+    SelectionRange,
+    SemanticClassificationFormat,
+    SignatureHelpItem,
+    SignatureHelpItems,
     singleIterator,
     some,
+    SourceFile,
     startsWith,
     stringContains,
+    SymbolDisplayPart,
+    SyntaxKind,
+    TextChange,
+    TextInsertion,
+    TextRange,
+    TextSpan,
     textSpanEnd,
     toArray,
     toFileNameLowerCase,
     tracing,
     unmangleScopedPackageName,
+    UserPreferences,
     version,
+    WithMetadata,
 } from "./_namespaces/ts";
 import {
     ConfigFileDiagEvent,
     ConfiguredProject,
+    convertFormatOptions,
+    convertScriptKindName,
+    convertUserPreferences,
     EmitResult,
+    emptyArray,
     Errors,
     GcTimer,
+    indent,
+    isConfigFile,
+    isConfiguredProject,
+    isExternalProject,
+    isInferredProject,
     ITypingsInstaller,
     LargeFileReferencedEvent,
-    LogLevel,
     Logger,
+    LogLevel,
     Msg,
     NormalizedPath,
     Project,
@@ -162,19 +171,10 @@ import {
     ProjectServiceEventHandler,
     ProjectServiceOptions,
     ProjectsUpdatedInBackgroundEvent,
+    protocol,
     ScriptInfo,
     ScriptInfoOrConfig,
     ServerHost,
-    convertFormatOptions,
-    convertScriptKindName,
-    convertUserPreferences,
-    emptyArray,
-    indent,
-    isConfigFile,
-    isConfiguredProject,
-    isExternalProject,
-    isInferredProject,
-    protocol,
     stringifyIndented,
     toNormalizedPath,
     updateProjectIfDirty,

src/server/typingsCache.ts

@@ -1,21 +1,21 @@
 import {
     ApplyCodeActionCommandResult,
-    CompilerOptions,
-    InstallPackageOptions,
-    Path,
-    SortedReadonlyArray,
-    TypeAcquisition,
     arrayIsEqualTo,
+    CompilerOptions,
     getAllowJSCompilerOption,
+    InstallPackageOptions,
     noop,
     notImplemented,
+    Path,
     returnFalse,
     sort,
+    SortedReadonlyArray,
+    TypeAcquisition,
 } from "./_namespaces/ts";
 import {
+    emptyArray,
     Project,
     ProjectService,
-    emptyArray,
 } from "./_namespaces/ts.server";
 
 export interface InstallPackageOptionsWithProject extends InstallPackageOptions {

src/server/utilities.ts

@@ -1,14 +1,14 @@
 import {
-    Comparer,
-    SortedArray,
     binarySearch,
+    Comparer,
     getBaseFileName,
     identity,
     perfLogger,
+    SortedArray,
 } from "./_namespaces/ts";
 import {
-    LogLevel,
     Logger,
+    LogLevel,
     NormalizedPath,
     ServerHost,
 } from "./_namespaces/ts.server";

src/server/utilitiesPublic.ts

@@ -1,11 +1,11 @@
 import {
+    getNormalizedAbsolutePath,
+    isRootedDiskPath,
+    normalizePath,
     Path,
     SortedArray,
     SortedReadonlyArray,
     TypeAcquisition,
-    getNormalizedAbsolutePath,
-    isRootedDiskPath,
-    normalizePath,
 } from "./_namespaces/ts";
 import {
     DiscoverTypings,