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

(Resolve) lightweight resolve annotations

Browse Source 
relates to #KT-38653
This commit is contained in:
Vladimir Ilmov
2020-06-03 14:09:24 +02:00
parent 46ab338ea6
commit 4f1b7b38b2
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+1 -1
View File
@@ -94,7 +94,7 @@ fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescrip
} }
fun KtAnnotationEntry.resolveToDescriptorIfAny( fun KtAnnotationEntry.resolveToDescriptorIfAny(
bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL bodyResolveMode: BodyResolveMode = BodyResolveMode.PARTIAL_NO_ADDITIONAL
): AnnotationDescriptor? = ): AnnotationDescriptor? =
resolveToDescriptorIfAny(getResolutionFacade(), bodyResolveMode) resolveToDescriptorIfAny(getResolutionFacade(), bodyResolveMode)
idea/ide-common/src/org/jetbrains/kotlin/resolve/lazy/BodyResolveMode.kt
+4 -2
View File
@@ -7,7 +7,7 @@ package org.jetbrains.kotlin.resolve.lazy
import org.jetbrains.kotlin.resolve.BindingTraceFilter import org.jetbrains.kotlin.resolve.BindingTraceFilter
enum class BodyResolveMode(val bindingTraceFilter: BindingTraceFilter, val doControlFlowAnalysis: Boolean) { enum class BodyResolveMode(val bindingTraceFilter: BindingTraceFilter, val doControlFlowAnalysis: Boolean, val resolveAdditionals: Boolean = true) {
// All body statements are analyzed, diagnostics included // All body statements are analyzed, diagnostics included
FULL(BindingTraceFilter.ACCEPT_ALL, doControlFlowAnalysis = true), FULL(BindingTraceFilter.ACCEPT_ALL, doControlFlowAnalysis = true),
@@ -21,8 +21,10 @@ enum class BodyResolveMode(val bindingTraceFilter: BindingTraceFilter, val doCon
PARTIAL_WITH_CFA(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = true), PARTIAL_WITH_CFA(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = true),
// Analyzes only dependent statements, including only used declaration statements, does not perform control flow analysis // Analyzes only dependent statements, including only used declaration statements, does not perform control flow analysis
PARTIAL(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = false) PARTIAL(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = false),
// Resolve mode to resolve only the element itself without the additional elements (annotation resolve would not lead to function resolve or default parameters)
PARTIAL_NO_ADDITIONAL(BindingTraceFilter.NO_DIAGNOSTICS, doControlFlowAnalysis = false, resolveAdditionals = false)
; ;
fun doesNotLessThan(other: BodyResolveMode): Boolean { fun doesNotLessThan(other: BodyResolveMode): Boolean {
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+5 -2
View File
@@ -238,7 +238,7 @@ 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) } 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>()
@@ -272,7 +272,10 @@ class ResolveElementCache(
return CompositeBindingContext.create(bindingContexts) return CompositeBindingContext.create(bindingContexts)
} }
private fun findElementOfAdditionalResolve(element: KtElement): KtElement? { private fun findElementOfAdditionalResolve(element: KtElement, bodyResolveMode: BodyResolveMode): KtElement? {
if (element is KtAnnotationEntry && bodyResolveMode == BodyResolveMode.PARTIAL_NO_ADDITIONAL)
return element
val elementOfAdditionalResolve = KtPsiUtil.getTopmostParentOfTypes( val elementOfAdditionalResolve = KtPsiUtil.getTopmostParentOfTypes(
element, element,
KtNamedFunction::class.java, KtNamedFunction::class.java,