maxmustermann/TypeScript
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

addressed PR feedback

Browse source
This commit is contained in:
Vladimir Matveev 2015-06-24 18:12:02 -07:00
parent c968b3653e
commit 66f673618a
1 changed files with 4 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/compiler/program.ts
View file

@ -582,37 +582,12 @@ namespace ts {
function processImportedModules(file: SourceFile, basePath: string) {
collectExternalModuleReferences(file);
if (file.imports.length) {
let allImportsInTheCache = false;
// try to grab existing module resolutions from the old source file
let oldSourceFile: SourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
if (oldSourceFile) {
file.resolvedModules = oldSourceFile.resolvedModules;
// check that all imports are contained in resolved modules cache
// if at least one of imports in not in the cache - cache needs to be reinitialized
checkImports: {
if (file.resolvedModules) {
for (let moduleName of file.imports) {
if (!hasResolvedModuleName(file, moduleName.text)) {
break checkImports;
}
}
allImportsInTheCache = true;
}
}
file.resolvedModules = {};
let oldSourceFile = oldProgram && oldProgram.getSourceFile(file.fileName);
for (let moduleName of file.imports) {
resolveModule(moduleName, oldSourceFile && oldSourceFile.resolvedModules);
}
if (!allImportsInTheCache) {
// initialize resolvedModules with empty map
// old module resolutions still can be used to avoid actual file system probing
let resolvedModules = file.resolvedModules;
file.resolvedModules = {};
for (let moduleName of file.imports) {
resolveModule(moduleName, resolvedModules);
}
}
}
else {
// no imports - drop cached module resolutions