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

Rename: findSyntheticFiles -> filterNotInSource

Browse Source
This commit is contained in:
Mikhail Glukhikh
2017-06-13 20:02:03 +03:00
parent 7734ec3bd5
commit 81a1f26b1d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinCacheServiceImpl.kt
+4 -4
View File
@@ -353,11 +353,11 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
} }
private fun getFacadeToAnalyzeFiles(files: Collection<KtFile>): ResolutionFacade { private fun getFacadeToAnalyzeFiles(files: Collection<KtFile>): ResolutionFacade {
val syntheticFiles = findSyntheticFiles(files) val notInSourceFiles = files.filterNotInProjectSource()
val file = files.first() val file = files.first()
val moduleInfo = file.getModuleInfo() val moduleInfo = file.getModuleInfo()
if (syntheticFiles.isNotEmpty()) { if (notInSourceFiles.isNotEmpty()) {
val projectFacade = getFacadeForSyntheticFiles(syntheticFiles) val projectFacade = getFacadeForSyntheticFiles(notInSourceFiles)
return ResolutionFacadeImpl(projectFacade, moduleInfo) return ResolutionFacadeImpl(projectFacade, moduleInfo)
} }
else { else {
@@ -379,7 +379,7 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
return ResolutionFacadeImpl(projectFacade, moduleInfo) return ResolutionFacadeImpl(projectFacade, moduleInfo)
} }
private fun findSyntheticFiles(files: Collection<KtFile>) = files.mapNotNull { private fun Collection<KtFile>.filterNotInProjectSource() = mapNotNull {
if (it is KtCodeFragment) it.getContextFile() else it if (it is KtCodeFragment) it.getContextFile() else it
}.filter { }.filter {
!ProjectRootsUtil.isInProjectSource(it) !ProjectRootsUtil.isInProjectSource(it)