microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2026-02-06 02:33:53 -06:00
Code Issues Packages Projects Releases 212 Wiki Activity

Go all the way back to the original solution

Browse Source
This commit is contained in:
Wesley Wigham 2015-11-12 16:22:35 -08:00
parent 52fbf9e12b
commit ecd4435986
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/compiler/program.ts
View File

@ -910,7 +910,7 @@ namespace ts {
return;
}
const sourcePathComponents = getNormalizedPathComponents(getCanonicalFileName(sourceFile.fileName), currentDirectory);
const sourcePathComponents = getNormalizedPathComponents(sourceFile.fileName, currentDirectory);
sourcePathComponents.pop(); // The base file name is not part of the common directory path
if (!commonPathComponents) {
@ -919,8 +919,9 @@ namespace ts {
return;
}
const caseSensitive = host.useCaseSensitiveFileNames();
for (let i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
if (commonPathComponents[i] !== sourcePathComponents[i]) {
if (caseSensitive ? commonPathComponents[i] !== sourcePathComponents[i] : commonPathComponents[i].toLocaleLowerCase() !== sourcePathComponents[i].toLocaleLowerCase()) {
if (i === 0) {
// Failed to find any common path component
return true;
@ -947,9 +948,7 @@ namespace ts {
return currentDirectory;
}
const path = getNormalizedPathFromPathComponents(commonPathComponents);
const relativePath = convertToRelativePath(path, currentDirectory, getCanonicalFileName);
return relativePath;
return getNormalizedPathFromPathComponents(commonPathComponents);
}
function checkSourceFilesBelongToPath(sourceFiles: SourceFile[], rootDirectory: string): boolean {