azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Do not reuse other caches when analyzing synthetic files inside libraries classes

Browse Source 
This is no longer correct since libraries have dependencies
This commit is contained in:
Pavel V. Talanov
2014-09-30 19:13:39 +04:00
parent b7dbd7a68d
commit 92faee3fd7
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinCacheService.kt
+20 -8
View File
@@ -124,13 +124,8 @@ public class KotlinCacheService(val project: Project) {
)
)
}
else -> {
if (syntheticFileModule.isLibraryClasses()) {
//NOTE: this code should not be called for sdk or library classes
// currently the only known scenario is when we cannot determine that file is a library source
// (file under both classes and sources root)
LOG.warn("Creating cache with synthetic file ($file) in classes of library $syntheticFileModule")
}
syntheticFileModule is LibrarySourceInfo || syntheticFileModule is NotUnderContentRootModuleInfo -> {
KotlinResolveCache(
project,
globalResolveSessionProvider(
@@ -142,8 +137,25 @@ public class KotlinCacheService(val project: Project) {
)
)
}
}
syntheticFileModule.isLibraryClasses() -> {
//NOTE: this code should not be called for sdk or library classes
// currently the only known scenario is when we cannot determine that file is a library source
// (file under both classes and sources root)
LOG.warn("Creating cache with synthetic file ($file) in classes of library $syntheticFileModule")
KotlinResolveCache(
project,
globalResolveSessionProvider(
targetPlatform,
syntheticFiles = listOf(file),
moduleFilter = { true },
dependencies = listOf(PsiModificationTracker.OUT_OF_CODE_BLOCK_MODIFICATION_COUNT)
)
)
}
else -> throw IllegalStateException("Unknown IdeaModuleInfo ${syntheticFileModule.javaClass}")
}
}
}