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

KT-11398

Browse Source 
- turn INACCESSIBLE_TYPE into a warning;
- improve diagnostic message for INACCESSIBLE_TYPE.
This commit is contained in:
Dmitry Petrov
2017-01-09 17:17:44 +03:00
parent 80af30fb4f
commit 7a8ec86cb9
4 changed files with 23 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt
+21 -23
View File
@@ -16,7 +16,6 @@
package org.jetbrains.kotlin.resolve.jvm.checkers
import com.intellij.util.SmartList
import org.jetbrains.kotlin.descriptors.ClassDescriptor
import org.jetbrains.kotlin.descriptors.DeclarationDescriptor
import org.jetbrains.kotlin.descriptors.Visibilities
@@ -42,45 +41,44 @@ class JavaTypeAccessibilityChecker : AdditionalTypeChecker {
if (c.isDebuggerContext) return
val inaccessibleTypes = findInaccessibleJavaTypes(expressionType, c)
if (inaccessibleTypes.isNotEmpty()) {
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleTypes))
val inaccessibleClasses = findInaccessibleJavaClasses(expressionType, c)
if (inaccessibleClasses.isNotEmpty()) {
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleClasses))
return
}
if (expressionTypeWithSmartCast != expressionType) {
val inaccessibleTypesWithSmartCast = findInaccessibleJavaTypes(expressionTypeWithSmartCast, c)
if (inaccessibleTypesWithSmartCast.isNotEmpty()) {
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleTypes))
val inaccessibleClassesWithSmartCast = findInaccessibleJavaClasses(expressionTypeWithSmartCast, c)
if (inaccessibleClassesWithSmartCast.isNotEmpty()) {
c.trace.report(Errors.INACCESSIBLE_TYPE.on(expression, expressionType, inaccessibleClassesWithSmartCast))
}
}
}
private fun findInaccessibleJavaTypes(type: KotlinType, c: ResolutionContext<*>): List<KotlinType> {
private fun findInaccessibleJavaClasses(type: KotlinType, c: ResolutionContext<*>): Collection<ClassDescriptor> {
val scopeOwner = c.scope.ownerDescriptor
val inaccessibleTypes = SmartList<KotlinType>()
findInaccessibleJavaTypesRec(type, scopeOwner, inaccessibleTypes, hashSetOf())
return inaccessibleTypes
val inaccessibleJavaClasses = LinkedHashSet<ClassDescriptor>()
findInaccessibleJavaClassesRec(type, scopeOwner, inaccessibleJavaClasses)
return inaccessibleJavaClasses
}
private fun findInaccessibleJavaTypesRec(
private fun findInaccessibleJavaClassesRec(
type: KotlinType,
scopeOwner: DeclarationDescriptor,
inaccessibleTypes: SmartList<KotlinType>,
visitedTypeConstructors: MutableSet<DeclarationDescriptor>
inaccessibleClasses: MutableCollection<ClassDescriptor>
) {
val typeConstructor = type.constructor.declarationDescriptor
if (typeConstructor is ClassDescriptor) {
if (visitedTypeConstructors.contains(typeConstructor)) return
visitedTypeConstructors.add(typeConstructor)
val declarationDescriptor = type.constructor.declarationDescriptor
if (typeConstructor is JavaClassDescriptor && !Visibilities.isVisibleIgnoringReceiver(typeConstructor, scopeOwner)) {
inaccessibleTypes.add(type)
}
for (typeProjection in type.arguments) {
findInaccessibleJavaTypesRec(typeProjection.type, scopeOwner, inaccessibleTypes, visitedTypeConstructors)
if (declarationDescriptor is JavaClassDescriptor) {
if (!Visibilities.isVisibleIgnoringReceiver(declarationDescriptor, scopeOwner)) {
inaccessibleClasses.add(declarationDescriptor)
}
}
for (typeProjection in type.arguments) {
if (typeProjection.isStarProjection) continue
findInaccessibleJavaClassesRec(typeProjection.type, scopeOwner, inaccessibleClasses)
}
}
}