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

Revert minor semantic differences introduced in c030a047aa

Browse Source 
Fix 'pull members up' and 'kotlin injected into kotlin' tests
This commit is contained in:
Pavel V. Talanov
2017-12-27 16:15:04 +03:00
parent 2df85ae4a9
commit dd32c4e66a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/idea-analysis/src/org/jetbrains/kotlin/idea/caches/resolve/ProjectResolutionFacade.kt
+1
View File
@@ -80,6 +80,7 @@ internal class ProjectResolutionFacade(
fun resolverForElement(element: PsiElement): ResolverForModule { fun resolverForElement(element: PsiElement): ResolverForModule {
val infos = element.getModuleInfos() val infos = element.getModuleInfos()
return infos.firstNotNullResult { resolverForProject.tryGetResolverForModule(it) } return infos.firstNotNullResult { resolverForProject.tryGetResolverForModule(it) }
?: resolverForProject.tryGetResolverForModule(NotUnderContentRootModuleInfo)
?: resolverForProject.diagnoseUnknownModuleInfo(infos) ?: resolverForProject.diagnoseUnknownModuleInfo(infos)
} }
idea/src/org/jetbrains/kotlin/idea/refactoring/memberInfo/memberInfoUtils.kt
+1 -1
View File
@@ -67,7 +67,7 @@ fun KotlinMemberInfo.getChildrenToAnalyze(): List<PsiElement> {
} }
internal fun KtNamedDeclaration.resolveToDescriptorWrapperAware(resolutionFacade: ResolutionFacade? = null): DeclarationDescriptor { 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) return (resolutionFacade ?: getResolutionFacade()).resolveToDescriptor(this)
} }