diff --git a/plugins/kotlin/base/fe10/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/PerFileAnalysisCache.kt b/plugins/kotlin/base/fe10/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/PerFileAnalysisCache.kt index 811c7e16f6bb..8ccf6c9cc7a6 100644 --- a/plugins/kotlin/base/fe10/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/PerFileAnalysisCache.kt +++ b/plugins/kotlin/base/fe10/analysis/src/org/jetbrains/kotlin/idea/caches/resolve/PerFileAnalysisCache.kt @@ -471,7 +471,11 @@ private class StackedCompositeBindingContextTrace( } override fun getSliceContents(slice: ReadOnlySlice): ImmutableMap { - return ImmutableMap.copyOf(parentContext.getSliceContents(slice) + map.getSliceContents(slice)) + val parentSliceContents = parentContext.getSliceContents(slice).filter { + (it.key as? PsiElement)?.parentsWithSelf?.none { e -> e == element } != false + } + val mapSliceContents = map.getSliceContents(slice) + return ImmutableMap.copyOf(parentSliceContents + mapSliceContents) } override fun addOwnDataTo(trace: BindingTrace, commitDiagnostics: Boolean) = throw UnsupportedOperationException()