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

Force resolution of file annotations before element analysis

Browse Source 
^KT-37219 In Progress
This commit is contained in:
Pavel Kirpichenkov
2020-06-23 11:16:48 +03:00
parent e4c8c14e3e
commit 5c70f973a5
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+12 -1
View File
@@ -238,11 +238,14 @@ class ResolveElementCache(
} }
fun resolveToElements(elements: Collection<KtElement>, bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext { fun resolveToElements(elements: Collection<KtElement>, bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext {
val elementsByAdditionalResolveElement: Map<KtElement?, List<KtElement>> = elements.groupBy { findElementOfAdditionalResolve(it, bodyResolveMode) } val elementsByAdditionalResolveElement: Map<KtElement?, List<KtElement>> =
elements.groupBy { findElementOfAdditionalResolve(it, bodyResolveMode) }
val bindingContexts = ArrayList<BindingContext>() val bindingContexts = ArrayList<BindingContext>()
val declarationsToResolve = ArrayList<KtDeclaration>() val declarationsToResolve = ArrayList<KtDeclaration>()
var addResolveSessionBindingContext = false var addResolveSessionBindingContext = false
ensureFileAnnotationsResolved(elements)
for ((elementOfAdditionalResolve, contextElements) in elementsByAdditionalResolveElement) { for ((elementOfAdditionalResolve, contextElements) in elementsByAdditionalResolveElement) {
if (elementOfAdditionalResolve != null) { if (elementOfAdditionalResolve != null) {
if (elementOfAdditionalResolve is KtParameter) { if (elementOfAdditionalResolve is KtParameter) {
@@ -272,6 +275,14 @@ class ResolveElementCache(
return CompositeBindingContext.create(bindingContexts) return CompositeBindingContext.create(bindingContexts)
} }
private fun ensureFileAnnotationsResolved(elements: Collection<KtElement>) {
val filesToBeAnalyzed = elements.map { it.containingKtFile }.toSet()
for (file in filesToBeAnalyzed) {
val fileLevelAnnotations = resolveSession.getFileAnnotations(file)
doResolveAnnotations(fileLevelAnnotations)
}
}
private fun findElementOfAdditionalResolve(element: KtElement, bodyResolveMode: BodyResolveMode): KtElement? { private fun findElementOfAdditionalResolve(element: KtElement, bodyResolveMode: BodyResolveMode): KtElement? {
if (element is KtAnnotationEntry && bodyResolveMode == BodyResolveMode.PARTIAL_NO_ADDITIONAL) if (element is KtAnnotationEntry && bodyResolveMode == BodyResolveMode.PARTIAL_NO_ADDITIONAL)
return element return element