Microsoft/TypeScript
1
0
Fork 0
mirror of https://github.com/microsoft/TypeScript.git synced 2025-11-18 17:21:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

make it work for root directory

Browse Source
This commit is contained in:
Klaus Meinhardt
2018-08-08 20:29:59 +02:00
parent 27d2a2d564
commit 95082e4743
2 changed files with 73 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/compiler/moduleNameResolver.ts
+15 -17
View File
@@ -407,7 +407,7 @@ namespace ts {
// directory: /a/b/c/d/e
// resolvedFileName: /a/b/foo.d.ts
const commonPrefix = getCommonPrefix(path, resolvedFileName);
if (commonPrefix === undefined) {
if (!commonPrefix) {
return;
}
let current = path;
@@ -427,23 +427,21 @@ namespace ts {
}
const resolutionDirectory = toPath(getDirectoryPath(resolution), currentDirectory, getCanonicalFileName);
// find first position where directory and resolution differs
let i = 0;
while (i < Math.min(directory.length, resolutionDirectory.length) && directory.charCodeAt(i) === resolutionDirectory.charCodeAt(i)) {
i++;
let current = directory;
let parent = getDirectoryPath(current);
while (
// keep going until we find a matching prefix
!startsWith(resolutionDirectory, current) ||
// keep going if the prefix is not a complete directory segment, e.g. '/dir' as prefix of '/directory'
resolutionDirectory.length > current.length && resolutionDirectory[current.length] !== directorySeparator && current !== parent
) {
if (current === parent) {
return undefined;
}
current = parent;
parent = getDirectoryPath(current);
}
if (i === directory.length && resolutionDirectory.length > i && resolutionDirectory[i] === directorySeparator) {
return directory;
}
// find last directory separator before position i
const sep = directory.lastIndexOf(directorySeparator, i);
if (sep < 0) {
return undefined;
}
return directory.substr(0, sep);
return current;
}
}
}