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

KotlinCacheService: Correctly deal with code fragments in getAnalysisResults()

Browse Source 
Fix evaluate expression for breakpoints in library source
This commit is contained in:
Pavel V. Talanov
2014-10-20 17:17:57 +04:00
parent 8d9f17d09d
commit a0ad05983a
1 changed files with 16 additions and 5 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
+16 -5
View File
@@ -182,17 +182,28 @@ public class KotlinCacheService(val project: Project) {
val files = elements.map { it.getContainingJetFile() }.toSet()
assertAreInSameModule(files)
if (files.all { !ProjectRootsUtil.isInProjectSource(it) }
// TODO: decide what to do with this
// && files.all { it !is JetCodeFragment }
) {
return getCacheForSyntheticFile(files).getAnalysisResultsForElements(elements)
val syntheticFiles = findSyntheticFiles(files)
if (syntheticFiles.isNotEmpty()) {
return getCacheForSyntheticFile(syntheticFiles).getAnalysisResultsForElements(elements)
}
val firstFile = elements.first().getContainingJetFile()
return getGlobalCache(TargetPlatformDetector.getPlatform(firstFile)).getAnalysisResultsForElements(elements)
}
private fun findSyntheticFiles(files: Collection<JetFile>) = files.map {
if (it is JetCodeFragment) it.getContextFile() else it
}.filter {
!ProjectRootsUtil.isInProjectSource(it)
}.toSet()
private fun JetCodeFragment.getContextFile(): JetFile {
val contextElement = getContext() ?: throw AssertionError("Analyzing code fragment of type $javaClass with no context")
val contextFile = (contextElement as? JetElement)?.getContainingJetFile()
?: throw AssertionError("Analyzing kotlin code fragment of type $javaClass with java context of type ${contextElement.javaClass}")
return if (contextFile is JetCodeFragment) contextFile.getContextFile() else contextFile
}
private fun assertAreInSameModule(elements: Collection<JetElement>) {
if (elements.size <= 1) {
return