From aed98a745e2f2c6d35be2e32dc69233fc891683f Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <Mikhail.Glukhikh@jetbrains.com>
Date: Thu, 6 Apr 2017 17:26:57 +0300
Subject: [PATCH] Do not use KtClassInitializer as analyzable parent

Fixes analyzeFully() semantics making it closer to compiler
Fixes two flaky tests for "leaking this" quick-fixes
---
 .../idea/caches/resolve/resolutionApi.kt       | 18 +++++++++++++-----
 .../idea/caches/resolve/KotlinResolveCache.kt  |  2 ++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt b/idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
index 54d99d001bd..4370733c4d8 100644
--- a/idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
+++ b/idea/ide-common/src/org/jetbrains/kotlin/idea/caches/resolve/resolutionApi.kt
@@ -52,11 +52,14 @@ fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescrip
     return facade.resolveImportReference(facade.moduleDescriptor, fqName)
 }
 
-//NOTE: the difference between analyze and analyzeFully is 'intentionally' unclear
-// in theory they do the same thing via different code
-// analyze - see ResolveSessionForBodies, ResolveElementCache
-// analyzeFully - see KotlinResolveCache, KotlinResolveDataProvider
-// In the future these two approaches should be unified
+
+// This and next function are used for 'normal' element analysis
+// Their exact semantics is a bit unclear and depends on 'bodyResolveMode'
+// They are expected to provide correct descriptors for the element
+// but not diagnostics, trace slices are provided only partially
+// Element body analysis, if any, is not guaranteed
+// For compiler-compatible analysis, analyzeFully is recommended
+// See ResolveSessionForBodies, ResolveElementCache
 @JvmOverloads fun KtElement.analyze(bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext {
     return getResolutionFacade().analyze(this, bodyResolveMode)
 }
@@ -70,6 +73,11 @@ fun KtElement.findModuleDescriptor(): ModuleDescriptor {
     return getResolutionFacade().moduleDescriptor
 }
 
+// This and next function are expected to produce the same result as compiler
+// for the given element and its children (including diagnostics, trace slices, descriptors, etc.)
+// Not recommended to call both of them without real need
+// See also KotlinResolveCache, KotlinResolveDataProvider
+// In the future should be unified with 'analyze`
 fun KtElement.analyzeFully(): BindingContext {
     return analyzeFullyAndGetResult().bindingContext
 }
diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
index 7d3cd231772..42c1f96adb3 100644
--- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
@@ -142,6 +142,8 @@ private object KotlinResolveDataProvider {
         }
         // Primary constructor should never be returned
         if (analyzableElement is KtPrimaryConstructor) return analyzableElement.getContainingClassOrObject()
+        // Class initializer should be replaced by containing class to provide full analysis
+        if (analyzableElement is KtClassInitializer) return analyzableElement.containingDeclaration
         return analyzableElement
                     // if none of the above worked, take the outermost declaration
                     ?: PsiTreeUtil.getTopmostParentOfType(element, KtDeclaration::class.java)