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

Convert AnalyzeExhaust to Kotlin and make it a data class

Browse Source
This commit is contained in:
Pavel V. Talanov
2014-11-19 19:43:05 +03:00
parent 341d4a7a26
commit 1991f0119e
14 changed files with 77 additions and 104 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
+1 -1
View File
@@ -47,7 +47,7 @@ public fun JetElement.getAnalysisResults(vararg extraFiles: JetFile): AnalyzeExh
}
public fun JetElement.getBindingContext(): BindingContext {
return getAnalysisResults().getBindingContext()
return getAnalysisResults().bindingContext
}
public fun getAnalysisResultsForElements(elements: Collection<JetElement>): AnalyzeExhaust {
idea/idea-analysis/src/org/jetbrains/jet/plugin/caches/resolve/KotlinResolveCache.kt
+4 -4
View File
@@ -110,10 +110,10 @@ private class KotlinResolveCache(
}
perFileCache.getAnalysisResults(it)
}
val error = results.firstOrNull { it.isError() }
val bindingContext = CompositeBindingContext.create(results.map { it.getBindingContext() })
return if (error != null)
AnalyzeExhaust.error(bindingContext, error.getError())
val withError = results.firstOrNull { it.isError() }
val bindingContext = CompositeBindingContext.create(results.map { it.bindingContext })
return if (withError != null)
AnalyzeExhaust.error(bindingContext, withError.error)
else
//TODO: (module refactoring) several elements are passed here in debugger
AnalyzeExhaust.success(bindingContext, getLazyResolveSession(elements.first()).getModuleDescriptor())