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

Add helper function

Browse Source
This commit is contained in:
Andy Hanson 2016-10-31 11:08:09 -07:00
parent 03ce7b0145
commit ebebac9c4e
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/harness/harness.ts
View File

@ -1037,21 +1037,7 @@ namespace Harness {
if (path[path.length - 1] === "/") {
path = <ts.Path>path.substr(0, path.length - 1);
}
let exists = false;
fileMap.forEachValue(fileName => {
if (!exists && pathStartsWithDirectory(fileName, path)) {
exists = true;
}
});
if (!exists && realPathMap) {
realPathMap.forEachValue(fileName => {
if (!exists && pathStartsWithDirectory(fileName, path)) {
exists = true;
}
});
}
return exists;
return mapHasFileInDirectory(path, fileMap) || mapHasFileInDirectory(path, realPathMap);
},
getDirectories: d => {
const path = ts.toPath(d, currentDirectory, getCanonicalFileName);
@ -1072,8 +1058,17 @@ namespace Harness {
};
}
function pathStartsWithDirectory(fileName: string, directory: string) {
return ts.startsWith(fileName, directory) && fileName[directory.length] === "/";
function mapHasFileInDirectory(directoryPath: ts.Path, map: ts.FileMap<any>): boolean {
if (!map) {
return false;
}
let exists = false;
map.forEachValue(fileName => {
if (!exists && ts.startsWith(fileName, directoryPath) && fileName[directoryPath.length] === "/") {
exists = true;
}
});
return exists;
}
interface HarnessOptions {