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

filterNotInSource: retains only files in contentScope

Browse Source 
So #KT-18221 Fixed
This commit is contained in:
Mikhail Glukhikh
2017-06-13 21:56:59 +03:00
parent 81a1f26b1d
commit 94dcadbec7
1 changed files with 4 additions and 3 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 -3
View File
@@ -45,6 +45,7 @@ import org.jetbrains.kotlin.idea.project.outOfBlockModificationCount
import org.jetbrains.kotlin.idea.resolve.ResolutionFacade
import org.jetbrains.kotlin.idea.util.ProjectRootsUtil
import org.jetbrains.kotlin.psi.*
import org.jetbrains.kotlin.psi.psiUtil.contains
import org.jetbrains.kotlin.resolve.BindingContext
import org.jetbrains.kotlin.resolve.TargetPlatform
import org.jetbrains.kotlin.resolve.diagnostics.KotlinSuppressCache
@@ -353,9 +354,9 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
}
private fun getFacadeToAnalyzeFiles(files: Collection<KtFile>): ResolutionFacade {
val notInSourceFiles = files.filterNotInProjectSource()
val file = files.first()
val moduleInfo = file.getModuleInfo()
val notInSourceFiles = files.filterNotInProjectSource(moduleInfo)
if (notInSourceFiles.isNotEmpty()) {
val projectFacade = getFacadeForSyntheticFiles(notInSourceFiles)
return ResolutionFacadeImpl(projectFacade, moduleInfo)
@@ -379,10 +380,10 @@ class KotlinCacheServiceImpl(val project: Project) : KotlinCacheService {
return ResolutionFacadeImpl(projectFacade, moduleInfo)
}
private fun Collection<KtFile>.filterNotInProjectSource() = mapNotNull {
private fun Collection<KtFile>.filterNotInProjectSource(moduleInfo: IdeaModuleInfo) = mapNotNull {
if (it is KtCodeFragment) it.getContextFile() else it
}.filter {
!ProjectRootsUtil.isInProjectSource(it)
!ProjectRootsUtil.isInProjectSource(it) || !moduleInfo.contentScope().contains(it)
}.toSet()
private fun KtCodeFragment.getContextFile(): KtFile? {