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

Check type alias expansion for Java 9 module accessibility

Browse Source 
#KT-18598 In Progress
This commit is contained in:
Alexander Udalov
2017-06-28 01:47:15 +03:00
parent 8768500844
commit f8346d21c2
7 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JvmModuleAccessibilityChecker.kt
+15 -7
View File
@@ -117,15 +117,23 @@ class JvmModuleAccessibilityChecker(project: Project) : CallChecker {
element: PsiElement,
languageVersionSettings: LanguageVersionSettings
) {
val targetClassOrPackage = when (targetDescriptor) {
is ClassDescriptor -> targetDescriptor
is TypeAliasDescriptor -> {
DescriptorUtils.getParentOfType(targetDescriptor, ClassOrPackageFragmentDescriptor::class.java) ?: return
val virtualFile = element.containingFile.virtualFile
when (targetDescriptor) {
is ClassDescriptor -> {
diagnosticFor(targetDescriptor, targetDescriptor, virtualFile, element)?.let(trace::report)
}
else -> return
}
is TypeAliasDescriptor -> {
val containingClassOrPackage = DescriptorUtils.getParentOfType(targetDescriptor, ClassOrPackageFragmentDescriptor::class.java)
if (containingClassOrPackage != null) {
diagnosticFor(containingClassOrPackage, targetDescriptor, virtualFile, element)?.let(trace::report)
}
diagnosticFor(targetClassOrPackage, targetDescriptor, element.containingFile.virtualFile, element)?.let(trace::report)
val expandedClass = targetDescriptor.expandedType.constructor.declarationDescriptor as? ClassDescriptor
if (expandedClass != null) {
diagnosticFor(expandedClass, expandedClass, virtualFile, element)?.let(trace::report)
}
}
}
}
}
}