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

Use indexOf and substr to exclude node_modules and bowerComponents instead of using loop

Browse Source
This commit is contained in:
Sheetal Nandi 2018-04-18 11:44:28 -07:00
parent 67bb67edf1
commit 56b618b9fc
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/server/typingsInstaller/typingsInstaller.ts
View File

@ -69,8 +69,13 @@ namespace ts.server.typingsInstaller {
return base === "package.json" || base === "bower.json";
}
function isInNodeModulesOrBowerComponents(f: string) {
return stringContains(f, "/node_modules/") || stringContains(f, "/bower_components/");
function getDirectoryExcludingNodeModulesOrBowerComponents(f: string) {
const indexOfNodeModules = f.indexOf("/node_modules/");
const indexOfBowerComponents = f.indexOf("/bower_components/");
const subStrLength = indexOfNodeModules === -1 || indexOfBowerComponents === -1 ?
Math.max(indexOfNodeModules, indexOfBowerComponents) :
Math.min(indexOfNodeModules, indexOfBowerComponents);
return subStrLength === -1 ? f : f.substr(0, subStrLength);
}
type ProjectWatchers = Map<FileWatcher> & { isInvoked?: boolean; };
@ -478,12 +483,7 @@ namespace ts.server.typingsInstaller {
}
// Get path without node_modules and bower_components
let pathToWatch = getDirectoryPath(filePath);
while (isInNodeModulesOrBowerComponents(pathToWatch)) {
pathToWatch = getDirectoryPath(pathToWatch);
}
createProjectWatcher(pathToWatch, createProjectDirectoryWatcher);
createProjectWatcher(getDirectoryExcludingNodeModulesOrBowerComponents(getDirectoryPath(filePath)), createProjectDirectoryWatcher);
}
// Remove unused watches