Added host.useCaseSens..., memoized getDefaultLibFileName.

Armando Aguirre · Armando Aguirre · commit 9dd574b1a92d · 2017-08-15T18:44:28.000-07:00
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -325,12 +325,12 @@ namespace ts {
                 }
 
                 output += sys.newLine;
-                output += `${ relativeFileName }(${ firstLine + 1 },${ firstLineChar + 1 }): `;
+                output += `${relativeFileName}(${firstLine + 1},${firstLineChar + 1}): `;
             }
 
             const categoryColor = getCategoryFormat(diagnostic.category);
             const category = DiagnosticCategory[diagnostic.category].toLowerCase();
-            output += `${ formatAndReset(category, categoryColor) } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }`;
+            output += `${formatAndReset(category, categoryColor)} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine)}`;
             output += sys.newLine;
         }
         return output;
@@ -436,7 +436,8 @@ namespace ts {
         host = host || createCompilerHost(options);
 
         let skipDefaultLib = options.noLib;
-        const defaultLibraryPath = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(host.getDefaultLibFileName(options));
+        const getDefaultLibraryFileName = memoize(() => host.getDefaultLibFileName(options));
+        const defaultLibraryPath = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(getDefaultLibraryFileName());
         const programDiagnostics = createDiagnosticCollection();
         const currentDirectory = host.getCurrentDirectory();
         const supportedExtensions = getSupportedExtensions(options);
@@ -512,12 +513,11 @@ namespace ts {
                 // If '--lib' is not specified, include default library file according to '--target'
                 // otherwise, using options specified in '--lib' instead of '--target' default library file
                 if (!options.lib) {
-                    processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
+                    processRootFile(getDefaultLibraryFileName(), /*isDefaultLib*/ true);
                 }
                 else {
-                    const libDirectory = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(host.getDefaultLibFileName(options));
                     forEach(options.lib, libFileName => {
-                        processRootFile(combinePaths(libDirectory, libFileName), /*isDefaultLib*/ true);
+                        processRootFile(combinePaths(defaultLibraryPath, libFileName), /*isDefaultLib*/ true);
                     });
                 }
             }
@@ -982,11 +982,11 @@ namespace ts {
                 return true;
             }
 
-            if (defaultLibraryPath !== undefined && defaultLibraryPath.length !== 0) {
-                return comparePaths(defaultLibraryPath, file.path, currentDirectory, /*ignoreCase*/ true) === Comparison.EqualTo;
+            if (defaultLibraryPath && defaultLibraryPath.length !== 0) {
+                return containsPath(defaultLibraryPath, file.path, currentDirectory, /*ignoreCase*/ !host.useCaseSensitiveFileNames());
             }
 
-            return compareStrings(file.fileName, host.getDefaultLibFileName(options), /*ignoreCase*/ true) === Comparison.EqualTo;
+            return compareStrings(file.fileName, getDefaultLibraryFileName(), /*ignoreCase*/ !host.useCaseSensitiveFileNames()) === Comparison.EqualTo;
         }
 
         function getDiagnosticsProducingTypeChecker() {

Original file line number	Diff line number	Diff line change
`@@ -325,12 +325,12 @@ namespace ts {`
`325`	`325`	`}`
`326`	`326`
`327`	`327`	`output += sys.newLine;`
`328`		- output += `${ relativeFileName }(${ firstLine + 1 },${ firstLineChar + 1 }): `;
	`328`	+ output += `${relativeFileName}(${firstLine + 1},${firstLineChar + 1}): `;
`329`	`329`	`}`
`330`	`330`
`331`	`331`	`const categoryColor = getCategoryFormat(diagnostic.category);`
`332`	`332`	`const category = DiagnosticCategory[diagnostic.category].toLowerCase();`
`333`		- output += `${ formatAndReset(category, categoryColor) } TS${ diagnostic.code }: ${ flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine) }`;
	`333`	+ output += `${formatAndReset(category, categoryColor)} TS${diagnostic.code}: ${flattenDiagnosticMessageText(diagnostic.messageText, sys.newLine)}`;
`334`	`334`	`output += sys.newLine;`
`335`	`335`	`}`
`336`	`336`	`return output;`
`@@ -436,7 +436,8 @@ namespace ts {`
`436`	`436`	`host = host \|\| createCompilerHost(options);`
`437`	`437`
`438`	`438`	`let skipDefaultLib = options.noLib;`
`439`		`- const defaultLibraryPath = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(host.getDefaultLibFileName(options));`
	`439`	`+ const getDefaultLibraryFileName = memoize(() => host.getDefaultLibFileName(options));`
	`440`	`+ const defaultLibraryPath = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(getDefaultLibraryFileName());`
`440`	`441`	`const programDiagnostics = createDiagnosticCollection();`
`441`	`442`	`const currentDirectory = host.getCurrentDirectory();`
`442`	`443`	`const supportedExtensions = getSupportedExtensions(options);`
`@@ -512,12 +513,11 @@ namespace ts {`
`512`	`513`	`// If '--lib' is not specified, include default library file according to '--target'`
`513`	`514`	`// otherwise, using options specified in '--lib' instead of '--target' default library file`
`514`	`515`	`if (!options.lib) {`
`515`		`- processRootFile(host.getDefaultLibFileName(options), /isDefaultLib/ true);`
	`516`	`+ processRootFile(getDefaultLibraryFileName(), /isDefaultLib/ true);`
`516`	`517`	`}`
`517`	`518`	`else {`
`518`		`- const libDirectory = host.getDefaultLibLocation ? host.getDefaultLibLocation() : getDirectoryPath(host.getDefaultLibFileName(options));`
`519`	`519`	`forEach(options.lib, libFileName => {`
`520`		`- processRootFile(combinePaths(libDirectory, libFileName), /isDefaultLib/ true);`
	`520`	`+ processRootFile(combinePaths(defaultLibraryPath, libFileName), /isDefaultLib/ true);`
`521`	`521`	`});`
`522`	`522`	`}`
`523`	`523`	`}`
`@@ -982,11 +982,11 @@ namespace ts {`
`982`	`982`	`return true;`
`983`	`983`	`}`
`984`	`984`
`985`		`- if (defaultLibraryPath !== undefined && defaultLibraryPath.length !== 0) {`
`986`		`- return comparePaths(defaultLibraryPath, file.path, currentDirectory, /ignoreCase/ true) === Comparison.EqualTo;`
	`985`	`+ if (defaultLibraryPath && defaultLibraryPath.length !== 0) {`
	`986`	`+ return containsPath(defaultLibraryPath, file.path, currentDirectory, /ignoreCase/ !host.useCaseSensitiveFileNames());`
`987`	`987`	`}`
`988`	`988`
`989`		`- return compareStrings(file.fileName, host.getDefaultLibFileName(options), /ignoreCase/ true) === Comparison.EqualTo;`
	`989`	`+ return compareStrings(file.fileName, getDefaultLibraryFileName(), /ignoreCase/ !host.useCaseSensitiveFileNames()) === Comparison.EqualTo;`
`990`	`990`	`}`
`991`	`991`
`992`	`992`	`function getDiagnosticsProducingTypeChecker() {`