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

ResolveElementCache: remove dead branch

Browse Source
This commit is contained in:
Mikhail Glukhikh
2018-02-13 14:58:58 +03:00
parent 52166646bb
commit 2038a5567d
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/project/ResolveElementCache.kt
+7 -8
View File
@@ -45,7 +45,6 @@ import org.jetbrains.kotlin.resolve.lazy.*
import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyClassDescriptor
import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor import org.jetbrains.kotlin.resolve.lazy.descriptors.LazyScriptDescriptor
import org.jetbrains.kotlin.resolve.scopes.LexicalScope import org.jetbrains.kotlin.resolve.scopes.LexicalScope
import org.jetbrains.kotlin.utils.addIfNotNull
import java.util.* import java.util.*
class ResolveElementCache( class ResolveElementCache(
@@ -217,14 +216,14 @@ class ResolveElementCache(
var addResolveSessionBindingContext = false var addResolveSessionBindingContext = false
for ((elementOfAdditionalResolve, contextElements) in elementsByAdditionalResolveElement) { for ((elementOfAdditionalResolve, contextElements) in elementsByAdditionalResolveElement) {
if (elementOfAdditionalResolve != null) { if (elementOfAdditionalResolve != null) {
if (elementOfAdditionalResolve !is KtParameter) { if (elementOfAdditionalResolve is KtParameter) {
val bindingContext = getElementsAdditionalResolve(elementOfAdditionalResolve, contextElements, bodyResolveMode) throw AssertionError(
bindingContexts.add(bindingContext) "ResolveElementCache: Element of additional resolve should not be KtParameter: " +
} else { "${elementOfAdditionalResolve.text} for context element ${contextElements.firstOrNull()?.text}"
// Parameters for function literal could be met inside other parameters. We can't make resolveToDescriptors for internal elements. )
declarationsToResolve.addIfNotNull(elementOfAdditionalResolve.getNonStrictParentOfType<KtDeclaration>())
addResolveSessionBindingContext = true
} }
val bindingContext = getElementsAdditionalResolve(elementOfAdditionalResolve, contextElements, bodyResolveMode)
bindingContexts.add(bindingContext)
} else { } else {
contextElements contextElements
.mapNotNull { it.getNonStrictParentOfType<KtDeclaration>() } .mapNotNull { it.getNonStrictParentOfType<KtDeclaration>() }