From dd32c4e66a3b344ebe53dadc611665c6bb793ac1 Mon Sep 17 00:00:00 2001 From: "Pavel V. Talanov" Date: Wed, 27 Dec 2017 16:15:04 +0300 Subject: [PATCH] Revert minor semantic differences introduced in c030a047aafa3b38f31de515c3e7415fd48a2bb9 Fix 'pull members up' and 'kotlin injected into kotlin' tests --- .../kotlin/idea/caches/resolve/ProjectResolutionFacade.kt | 1 + .../kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt index 35011864e2a..15dd47a25ea 100644 --- a/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt +++ b/idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt @@ -80,6 +80,7 @@ internal class ProjectResolutionFacade( fun resolverForElement(element: PsiElement): ResolverForModule { val infos = element.getModuleInfos() return infos.firstNotNullResult { resolverForProject.tryGetResolverForModule(it) } + ?: resolverForProject.tryGetResolverForModule(NotUnderContentRootModuleInfo) ?: resolverForProject.diagnoseUnknownModuleInfo(infos) } diff --git a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt index 6650dde9bc2..1264b8b9f53 100644 --- a/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt +++ b/idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt @@ -67,7 +67,7 @@ fun KotlinMemberInfo.getChildrenToAnalyze(): List { } internal fun KtNamedDeclaration.resolveToDescriptorWrapperAware(resolutionFacade: ResolutionFacade? = null): DeclarationDescriptor { - if (this is KtPsiClassWrapper) return psiClass.getJavaClassDescriptor(resolutionFacade ?: javaResolutionFacade())!! + if (this is KtPsiClassWrapper) return psiClass.getJavaClassDescriptor(resolutionFacade ?: psiClass.javaResolutionFacade())!! return (resolutionFacade ?: getResolutionFacade()).resolveToDescriptor(this) }