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

Do not use KtClassInitializer as analyzable parent

Browse Source 
Fixes analyzeFully() semantics making it closer to compiler
Fixes two flaky tests for "leaking this" quick-fixes
This commit is contained in:
Mikhail Glukhikh
2017-04-06 17:26:57 +03:00
parent 55d304a9a5
commit aed98a745e
2 changed files with 15 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
+13 -5
View File
@@ -52,11 +52,14 @@ fun KtFile.resolveImportReference(fqName: FqName): Collection<DeclarationDescrip
return facade.resolveImportReference(facade.moduleDescriptor, fqName) 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 // This and next function are used for 'normal' element analysis
// analyze - see ResolveSessionForBodies, ResolveElementCache // Their exact semantics is a bit unclear and depends on 'bodyResolveMode'
// analyzeFully - see KotlinResolveCache, KotlinResolveDataProvider // They are expected to provide correct descriptors for the element
// In the future these two approaches should be unified // 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 { @JvmOverloads fun KtElement.analyze(bodyResolveMode: BodyResolveMode = BodyResolveMode.FULL): BindingContext {
return getResolutionFacade().analyze(this, bodyResolveMode) return getResolutionFacade().analyze(this, bodyResolveMode)
} }
@@ -70,6 +73,11 @@ fun KtElement.findModuleDescriptor(): ModuleDescriptor {
return getResolutionFacade().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 { fun KtElement.analyzeFully(): BindingContext {
return analyzeFullyAndGetResult().bindingContext return analyzeFullyAndGetResult().bindingContext
} }
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/KotlinResolveCache.kt
+2
View File
@@ -142,6 +142,8 @@ private object KotlinResolveDataProvider {
} }
// Primary constructor should never be returned // Primary constructor should never be returned
if (analyzableElement is KtPrimaryConstructor) return analyzableElement.getContainingClassOrObject() 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 return analyzableElement
// if none of the above worked, take the outermost declaration // if none of the above worked, take the outermost declaration
?: PsiTreeUtil.getTopmostParentOfType(element, KtDeclaration::class.java) ?: PsiTreeUtil.getTopmostParentOfType(element, KtDeclaration::class.java)