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

Fixed partial resolve caching to cache only for statements that are guaranteed to be processed

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-07-14 12:44:27 +03:00
parent 58f2d37d95
commit 8d1499197e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+5 -3
View File
@@ -66,9 +66,11 @@ public class ResolveElementCache(resolveSession: ResolveSession, private val pro
val (bindingContext, statementFilter) = performElementAdditionalResolve(resolveElement, contextElement, BodyResolveMode.PARTIAL) val (bindingContext, statementFilter) = performElementAdditionalResolve(resolveElement, contextElement, BodyResolveMode.PARTIAL)
for (statement in (statementFilter as PartialBodyResolveFilter).allStatementsToResolve) { if (statementFilter is PartialBodyResolveFilter) {
if (!map.containsKey(statement)) { for (statement in statementFilter.allStatementsToResolve) {
map[statement] = bindingContext if (!map.containsKey(statement) && bindingContext[BindingContext.PROCESSED, statement] == true) {
map[statement] = bindingContext
}
} }
} }
map[resolveElement] = bindingContext // we use the whole declaration key in the map to obtain resolve not inside any block (e.g. default parameter values) map[resolveElement] = bindingContext // we use the whole declaration key in the map to obtain resolve not inside any block (e.g. default parameter values)