[FIR] KT-54410: Report API_NOT_AVAILABLE for classifiers

Callable symbols with SinceKotlin are filtered out by a resolution stage, but in K1 classifiers and property accessors report API_NOT_AVAILABLE. K2 filters out properties with unavailable accessors, but does nothing for classifiers. This change fixes it. ^KT-54410 Fixed
2023-01-18 19:13:42 +02:00
parent fd52cc4224
commit 9be819087a
22 changed files with 144 additions and 12 deletions
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.checkers.generator.diagnostics
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageVersionSettings
 import org.jetbrains.kotlin.contracts.description.EventOccurrencesRange
@@ -120,6 +121,11 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
            parameter<String>("message")
        }

+        val API_NOT_AVAILABLE by error<PsiElement>(PositioningStrategy.SELECTOR_BY_QUALIFIED) {
+            parameter<ApiVersion>("sinceKotlinVersion")
+            parameter<ApiVersion>("currentVersion")
+        }
+
        val UNRESOLVED_REFERENCE_WRONG_RECEIVER by error<PsiElement> {
            parameter<Collection<Symbol>>("candidates")
        }
@@ -8,6 +8,7 @@ package org.jetbrains.kotlin.fir.analysis.diagnostics
 import com.intellij.psi.PsiElement
 import com.intellij.psi.impl.source.tree.LeafPsiElement
 import org.jetbrains.kotlin.KtSourceElement
+import org.jetbrains.kotlin.config.ApiVersion
 import org.jetbrains.kotlin.config.LanguageFeature
 import org.jetbrains.kotlin.config.LanguageFeature.ForbidExposingTypesInPrimaryConstructorProperties
 import org.jetbrains.kotlin.config.LanguageFeature.ForbidUsingExtensionPropertyTypeParameterInDelegate
@@ -151,6 +152,7 @@ object FirErrors {
    val NO_THIS by error0<PsiElement>()
    val DEPRECATION_ERROR by error2<PsiElement, FirBasedSymbol<*>, String>(SourceElementPositioningStrategies.REFERENCED_NAME_BY_QUALIFIED)
    val DEPRECATION by warning2<PsiElement, FirBasedSymbol<*>, String>(SourceElementPositioningStrategies.REFERENCED_NAME_BY_QUALIFIED)
+    val API_NOT_AVAILABLE by error2<PsiElement, ApiVersion, ApiVersion>(SourceElementPositioningStrategies.SELECTOR_BY_QUALIFIED)
    val UNRESOLVED_REFERENCE_WRONG_RECEIVER by error1<PsiElement, Collection<FirBasedSymbol<*>>>()
    val UNRESOLVED_IMPORT by error1<PsiElement, String>(SourceElementPositioningStrategies.IMPORT_LAST_NAME)

@@ -38,7 +38,7 @@ object FirImportsChecker : FirFileChecker() {
                    checkOperatorRename(import, context, reporter)
                }
            }
-            checkDeprecatedImport(import, context, reporter)
+            checkImportApiStatus(import, context, reporter)
        }
        checkConflictingImports(declaration.imports, context, reporter)
    }
@@ -241,11 +241,11 @@ object FirImportsChecker : FirFileChecker() {
        else ImportStatus.UNRESOLVED
    }

-    private fun checkDeprecatedImport(import: FirImport, context: CheckerContext, reporter: DiagnosticReporter) {
+    private fun checkImportApiStatus(import: FirImport, context: CheckerContext, reporter: DiagnosticReporter) {
        val importedFqName = import.importedFqName ?: return
        if (importedFqName.isRoot || importedFqName.shortName().asString().isEmpty()) return
        val classId = (import as? FirResolvedImport)?.resolvedParentClassId ?: ClassId.topLevel(importedFqName)
        val classLike: FirRegularClassSymbol = classId.resolveToClass(context) ?: return
-        FirDeprecationChecker.reportDeprecationIfNeeded(import.source, classLike, null, context, reporter)
+        FirDeprecationChecker.reportApiStatusIfNeeded(import.source, classLike, null, context, reporter)
    }
 }
@@ -14,11 +14,11 @@ import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol
 object FirDeprecatedQualifierChecker : FirResolvedQualifierChecker() {
    override fun check(expression: FirResolvedQualifier, context: CheckerContext, reporter: DiagnosticReporter) {
        expression.nonFatalDiagnostics.filterIsInstance<ConeDeprecated>().forEach { diagnostic ->
-            FirDeprecationChecker.reportDeprecation(diagnostic.source, diagnostic.symbol, diagnostic.deprecationInfo, reporter, context)
+            FirDeprecationChecker.reportApiStatus(diagnostic.source, diagnostic.symbol, diagnostic.deprecationInfo, reporter, context)
        }
        if (expression.resolvedToCompanionObject) {
            val companionSymbol = (expression.symbol as? FirRegularClassSymbol)?.companionObjectSymbol ?: return
-            FirDeprecationChecker.reportDeprecationIfNeeded(expression.source, companionSymbol, null, context, reporter)
+            FirDeprecationChecker.reportApiStatusIfNeeded(expression.source, companionSymbol, null, context, reporter)
        }
    }
 }
@@ -14,6 +14,7 @@ import org.jetbrains.kotlin.fir.FirElement
 import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
 import org.jetbrains.kotlin.fir.analysis.checkers.toRegularClassSymbol
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
+import org.jetbrains.kotlin.fir.declarations.FutureApiDeprecationInfo
 import org.jetbrains.kotlin.fir.declarations.getDeprecation
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
 import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall
@@ -39,10 +40,10 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
        val reference = resolvable.calleeReference.resolved ?: return
        val referencedSymbol = reference.resolvedSymbol

-        reportDeprecationIfNeeded(reference.source, referencedSymbol, expression, context, reporter)
+        reportApiStatusIfNeeded(reference.source, referencedSymbol, expression, context, reporter)
    }

-    internal fun reportDeprecationIfNeeded(
+    internal fun reportApiStatusIfNeeded(
        source: KtSourceElement?,
        referencedSymbol: FirBasedSymbol<*>,
        callSite: FirElement?,
@@ -50,10 +51,24 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
        reporter: DiagnosticReporter
    ) {
        val deprecation = getWorstDeprecation(callSite, referencedSymbol, context) ?: return
-        reportDeprecation(source, referencedSymbol, deprecation, reporter, context)
+        reportApiStatus(source, referencedSymbol, deprecation, reporter, context)
    }

-    internal fun reportDeprecation(
+    internal fun reportApiStatus(
+        source: KtSourceElement?,
+        referencedSymbol: FirBasedSymbol<*>,
+        deprecationInfo: DeprecationInfo,
+        reporter: DiagnosticReporter,
+        context: CheckerContext,
+    ) {
+        if (deprecationInfo is FutureApiDeprecationInfo) {
+            reportApiNotAvailable(source, deprecationInfo, reporter, context)
+        } else {
+            reportDeprecation(source, referencedSymbol, deprecationInfo, reporter, context)
+        }
+    }
+
+    private fun reportDeprecation(
        source: KtSourceElement?,
        referencedSymbol: FirBasedSymbol<*>,
        deprecationInfo: DeprecationInfo,
@@ -67,6 +82,21 @@ object FirDeprecationChecker : FirBasicExpressionChecker() {
        reporter.reportOn(source, diagnostic, referencedSymbol, deprecationInfo.message ?: "", context)
    }

+    private fun reportApiNotAvailable(
+        source: KtSourceElement?,
+        deprecationInfo: FutureApiDeprecationInfo,
+        reporter: DiagnosticReporter,
+        context: CheckerContext,
+    ) {
+        reporter.reportOn(
+            source,
+            FirErrors.API_NOT_AVAILABLE,
+            deprecationInfo.sinceVersion,
+            context.languageVersionSettings.apiVersion,
+            context,
+        )
+    }
+
    private fun getWorstDeprecation(
        callSite: FirElement?,
        symbol: FirBasedSymbol<*>,
@@ -21,6 +21,6 @@ object FirDeprecatedTypeChecker : FirTypeRefChecker() {
        val resolved = typeRef.coneTypeSafe<ConeClassLikeType>() ?: return
        val symbol = resolved.lookupTag.toSymbol(context.session) ?: return

-        FirDeprecationChecker.reportDeprecationIfNeeded(source, symbol, null, context, reporter)
+        FirDeprecationChecker.reportApiStatusIfNeeded(source, symbol, null, context, reporter)
    }
 }
@@ -75,6 +75,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANNOTATION_USED_A
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANONYMOUS_FUNCTION_PARAMETER_WITH_DEFAULT_VALUE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANONYMOUS_FUNCTION_WITH_NAME
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ANONYMOUS_INITIALIZER_IN_INTERFACE
+import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.API_NOT_AVAILABLE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ARGUMENT_PASSED_TWICE
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ARGUMENT_TYPE_MISMATCH
 import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.ARRAY_EQUALITY_OPERATOR_CAN_BE_REPLACED_WITH_EQUALS
@@ -640,6 +641,12 @@ object FirErrorsDefaultMessages : BaseDiagnosticRendererFactory() {
        map.put(VAL_OR_VAR_ON_SECONDARY_CONSTRUCTOR_PARAMETER, "''{0}'' on secondary constructor parameter is not allowed", TO_STRING)
        map.put(DEPRECATION, "''{0}'' is deprecated. {1}", SYMBOL, STRING)
        map.put(DEPRECATION_ERROR, "''{0}'' is deprecated. {1}", SYMBOL, STRING)
+        map.put(
+            API_NOT_AVAILABLE,
+            "This declaration is only available since Kotlin {0} and cannot be used with the specified API version {1}",
+            TO_STRING,
+            TO_STRING,
+        )
        map.put(ASSIGNMENT_IN_EXPRESSION_CONTEXT, "Assignments are not expressions, and only expressions are allowed in this context")
        map.put(EXPRESSION_EXPECTED, "Only expressions are allowed here")