More cleanup

Author: sheetalkamat

src/compiler/program.ts

@@ -956,13 +956,13 @@ namespace ts {
         oldProgram = undefined;
 
         const program: Program = {
-            getRootFileNames,
+            getRootFileNames: () => rootNames,
             getSourceFile,
             getSourceFileByPath,
             getSourceFiles: () => files,
             getMissingFilePaths: () => missingFilePaths!, // TODO: GH#18217
             getFilesByNameMap: () => filesByName,
-            getCompilerOptions,
+            getCompilerOptions: () => options,
             getSyntacticDiagnostics,
             getOptionsDiagnostics,
             getGlobalDiagnostics,
@@ -976,8 +976,7 @@ namespace ts {
             getDiagnosticsProducingTypeChecker,
             getCommonSourceDirectory,
             emit,
-            getCurrentDirectory,
-            getCanonicalFileName,
+            getCurrentDirectory: () => currentDirectory,
             getNodeCount: () => getDiagnosticsProducingTypeChecker().getNodeCount(),
             getIdentifierCount: () => getDiagnosticsProducingTypeChecker().getIdentifierCount(),
             getSymbolCount: () => getDiagnosticsProducingTypeChecker().getSymbolCount(),
@@ -1035,18 +1034,6 @@ namespace ts {
 
         return program;
 
-        function getRootFileNames() {
-            return rootNames;
-        }
-
-        function getCompilerOptions() {
-            return options;
-        }
-
-        function getCurrentDirectory() {
-            return currentDirectory;
-        }
-
         function resolveModuleNamesWorker(moduleNames: string[], containingFile: string, reusedNames?: string[], redirectedReference?: ResolvedProjectReference) {
             performance.mark("beforeResolveModule");
             const result = actualResolveModuleNamesWorker(moduleNames, containingFile, reusedNames, redirectedReference);
@@ -3319,7 +3306,7 @@ namespace ts {
                     if (!options.configFile.configFileSpecs) return undefined;
                     const { basePath, includeSpecs } = getFileFromConfigExplainInfo(programForExplaination);
                     const rootName = rootNames[reason.index];
-                    const fileName = getNormalizedAbsolutePath(rootName, getCurrentDirectory());
+                    const fileName = getNormalizedAbsolutePath(rootName, currentDirectory);
                     const filePath = getCanonicalFileName(fileName);
                     const matchedByFiles = find(options.configFile.configFileSpecs.validatedFilesSpec || emptyArray, fileSpec => getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
                     if (matchedByFiles) {

src/compiler/types.ts

@@ -3864,7 +3864,6 @@ namespace ts {
         /** Is the file emitted file */
         /* @internal */ isEmittedFile(file: string): boolean;
         /* @internal */ getFileIncludeReasons(): MultiMap<Path, FileIncludeReason>;
-        /* @internal */ getCanonicalFileName(fileName: string): string;
         /* @internal */ useCaseSensitiveFileNames(): boolean;
 
         /* @internal */ getResolvedModuleWithFailedLookupLocationsFromCache(moduleName: string, containingFile: string): ResolvedModuleWithFailedLookupLocations | undefined;

src/compiler/watch.ts

@@ -158,11 +158,8 @@ namespace ts {
         return result;
     }
 
-    export interface FileFromConfigExplainInfo {
-        basePath: string | undefined;
-        includeSpecs: { include: string; regExp: RegExp; }[] | undefined;
-    }
-    export function getFileFromConfigExplainInfo(program: Program): FileFromConfigExplainInfo {
+    export type FileFromConfigExplainInfo = ReturnType<typeof getFileFromConfigExplainInfo>;
+    export function getFileFromConfigExplainInfo(program: Program) {
         const options = program.getCompilerOptions();
         const { validatedIncludeSpecs } = options.configFile?.configFileSpecs || {};
         const useCaseSensitiveFileNames = program.useCaseSensitiveFileNames();
@@ -176,7 +173,8 @@ namespace ts {
                 regExp: getRegexFromPattern(`(${pattern})$`, useCaseSensitiveFileNames)
             });
         });
-        return { basePath, includeSpecs };
+        const getCanonicalFileName = createGetCanonicalFileName(useCaseSensitiveFileNames)
+        return { basePath, includeSpecs, getCanonicalFileName };
     }
 
     export function fileIncludeReasonToDiagnostics(
@@ -223,12 +221,12 @@ namespace ts {
         switch (reason.kind) {
             case FileIncludeKind.RootFile:
                 if (!options.configFile?.configFileSpecs) return chainDiagnosticMessages(/*details*/ undefined, Diagnostics.Root_file_specified_for_compilation);
-                const { basePath, includeSpecs } = configFileExplainInfo || getFileFromConfigExplainInfo(program);
+                const { basePath, includeSpecs, getCanonicalFileName } = configFileExplainInfo || getFileFromConfigExplainInfo(program);
                 if (includeSpecs) {
                     const rootName = program.getRootFileNames()[reason.index];
                     const fileName = getNormalizedAbsolutePath(rootName, program.getCurrentDirectory());
-                    const filePath = program.getCanonicalFileName(fileName);
-                    const matchedByFiles = forEach(options.configFile.configFileSpecs.validatedFilesSpec, fileSpec => program.getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
+                    const filePath = getCanonicalFileName(fileName);
+                    const matchedByFiles = forEach(options.configFile.configFileSpecs.validatedFilesSpec, fileSpec => getCanonicalFileName(getNormalizedAbsolutePath(fileSpec, basePath)) === filePath);
                     if (!matchedByFiles) {
                         const isJsonFile = fileExtensionIs(fileName, Extension.Json);
                         const matchedByInclude = find(includeSpecs, spec => (!isJsonFile || endsWith(spec.include, Extension.Json)) && spec.regExp.test(fileName));
@@ -291,7 +289,7 @@ namespace ts {
     function toFileName(program: Program, file: SourceFile | string, relativeFileName: boolean | undefined) {
         const fileName = isString(file) ? file : file.fileName;
         return relativeFileName ?
-            convertToRelativePath(fileName, program.getCurrentDirectory(), fileName => program.getCanonicalFileName(fileName)) :
+            convertToRelativePath(fileName, program.getCurrentDirectory(), fileName => createGetCanonicalFileName(program.useCaseSensitiveFileNames())(fileName)) :
             fileName;
     }