KT-11398

- turn INACCESSIBLE_TYPE into a warning;
- improve diagnostic message for INACCESSIBLE_TYPE.

compiler/frontend.java/src/org/jetbrains/kotlin/resolve/jvm/checkers/JavaTypeAccessibilityChecker.kt

@@ -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)
+        }
     }
 
 }

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/Errors.java

@@ -112,7 +112,7 @@ public interface Errors {
     DiagnosticFactory3<KtSuperTypeListEntry, EffectiveVisibility, DescriptorWithRelation, EffectiveVisibility> EXPOSED_SUPER_INTERFACE = DiagnosticFactory3.create(ERROR);
     DiagnosticFactory3<PsiElement, EffectiveVisibility, DescriptorWithRelation, EffectiveVisibility> EXPOSED_TYPEALIAS_EXPANDED_TYPE = DiagnosticFactory3.create(ERROR);
 
-    DiagnosticFactory2<KtExpression, KotlinType, Collection<KotlinType>> INACCESSIBLE_TYPE = DiagnosticFactory2.create(ERROR);
+    DiagnosticFactory2<KtExpression, KotlinType, Collection<ClassDescriptor>> INACCESSIBLE_TYPE = DiagnosticFactory2.create(WARNING);
 
     DiagnosticFactory1<KtElement, Collection<ClassDescriptor>> PLATFORM_CLASS_MAPPED_TO_KOTLIN = DiagnosticFactory1.create(WARNING);
 

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/DefaultErrorMessages.java

@@ -114,7 +114,7 @@ public class DefaultErrorMessages {
         MAP.put(EXPOSED_SUPER_INTERFACE, "''{0}'' sub-interface exposes its ''{2}'' supertype{1}", TO_STRING, TO_STRING, TO_STRING);
         MAP.put(EXPOSED_TYPEALIAS_EXPANDED_TYPE, "''{0}'' typealias exposes ''{2}'' in expanded type{1}", TO_STRING, TO_STRING, TO_STRING);
 
-        MAP.put(INACCESSIBLE_TYPE, "Type {0} is inaccessible in this context due to: {1}", RENDER_TYPE, RENDER_COLLECTION_OF_TYPES);
+        MAP.put(INACCESSIBLE_TYPE, "Type {0} is inaccessible in this context due to: {1}", RENDER_TYPE, commaSeparated(FQ_NAMES_IN_TYPES));
 
         MAP.put(REDECLARATION, "Conflicting declarations: {0}", commaSeparated(COMPACT_WITH_MODIFIERS));
         MAP.put(PACKAGE_OR_CLASSIFIER_REDECLARATION, "Redeclaration: {0}", STRING);

compiler/frontend/src/org/jetbrains/kotlin/diagnostics/rendering/Renderers.kt

@@ -39,9 +39,7 @@ import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.Bound
 import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.LOWER_BOUND
 import org.jetbrains.kotlin.resolve.calls.inference.TypeBounds.BoundKind.UPPER_BOUND
 import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPosition
-import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind
 import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.ConstraintPositionKind.*
-import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.derivedFrom
 import org.jetbrains.kotlin.resolve.calls.inference.constraintPosition.getValidityConstraintForConstituentType
 import org.jetbrains.kotlin.resolve.calls.model.ResolvedCall
 import org.jetbrains.kotlin.types.*