[FIR] Add NON_INTERNAL_PUBLISHED_API diagnostic
This commit is contained in:
committed by
teamcityserver
parent
46d1b63f70
commit
efce3fc2e0
+2
@@ -1177,6 +1177,8 @@ object DIAGNOSTICS_LIST : DiagnosticList("FirErrors") {
|
|||||||
val DECLARATION_CANT_BE_INLINED by error<KtDeclaration>(PositioningStrategy.DECLARATION_SIGNATURE)
|
val DECLARATION_CANT_BE_INLINED by error<KtDeclaration>(PositioningStrategy.DECLARATION_SIGNATURE)
|
||||||
|
|
||||||
val OVERRIDE_BY_INLINE by warning<KtDeclaration>(PositioningStrategy.DECLARATION_SIGNATURE)
|
val OVERRIDE_BY_INLINE by warning<KtDeclaration>(PositioningStrategy.DECLARATION_SIGNATURE)
|
||||||
|
|
||||||
|
val NON_INTERNAL_PUBLISHED_API by error<KtElement>()
|
||||||
|
|
||||||
val REIFIED_TYPE_PARAMETER_IN_OVERRIDE by error<KtElement>(PositioningStrategy.REIFIED_MODIFIER)
|
val REIFIED_TYPE_PARAMETER_IN_OVERRIDE by error<KtElement>(PositioningStrategy.REIFIED_MODIFIER)
|
||||||
|
|
||||||
|
|||||||
@@ -610,6 +610,7 @@ object FirErrors {
|
|||||||
val SUPER_CALL_FROM_PUBLIC_INLINE by warning1<KtElement, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED)
|
val SUPER_CALL_FROM_PUBLIC_INLINE by warning1<KtElement, FirBasedSymbol<*>>(SourceElementPositioningStrategies.REFERENCE_BY_QUALIFIED)
|
||||||
val DECLARATION_CANT_BE_INLINED by error0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
val DECLARATION_CANT_BE_INLINED by error0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
||||||
val OVERRIDE_BY_INLINE by warning0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
val OVERRIDE_BY_INLINE by warning0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
||||||
|
val NON_INTERNAL_PUBLISHED_API by error0<KtElement>()
|
||||||
val REIFIED_TYPE_PARAMETER_IN_OVERRIDE by error0<KtElement>(SourceElementPositioningStrategies.REIFIED_MODIFIER)
|
val REIFIED_TYPE_PARAMETER_IN_OVERRIDE by error0<KtElement>(SourceElementPositioningStrategies.REIFIED_MODIFIER)
|
||||||
val INLINE_PROPERTY_WITH_BACKING_FIELD by error0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
val INLINE_PROPERTY_WITH_BACKING_FIELD by error0<KtDeclaration>(SourceElementPositioningStrategies.DECLARATION_SIGNATURE)
|
||||||
|
|
||||||
|
|||||||
+1
@@ -130,6 +130,7 @@ object CommonDeclarationCheckers : DeclarationCheckers() {
|
|||||||
override val annotatedDeclarationCheckers: Set<FirAnnotatedDeclarationChecker>
|
override val annotatedDeclarationCheckers: Set<FirAnnotatedDeclarationChecker>
|
||||||
get() = setOf(
|
get() = setOf(
|
||||||
FirAnnotationChecker,
|
FirAnnotationChecker,
|
||||||
|
FirPublishedApiChecker,
|
||||||
)
|
)
|
||||||
|
|
||||||
override val typeAliasCheckers: Set<FirTypeAliasChecker>
|
override val typeAliasCheckers: Set<FirTypeAliasChecker>
|
||||||
|
|||||||
+26
@@ -0,0 +1,26 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2010-2021 JetBrains s.r.o. and Kotlin Programming Language contributors.
|
||||||
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package org.jetbrains.kotlin.fir.analysis.checkers.declaration
|
||||||
|
|
||||||
|
import org.jetbrains.kotlin.builtins.StandardNames
|
||||||
|
import org.jetbrains.kotlin.descriptors.Visibilities
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.checkers.context.CheckerContext
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.FirMemberDeclaration
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.getAnnotationsByFqName
|
||||||
|
import org.jetbrains.kotlin.fir.declarations.utils.visibility
|
||||||
|
|
||||||
|
object FirPublishedApiChecker : FirAnnotatedDeclarationChecker() {
|
||||||
|
override fun check(declaration: FirAnnotatedDeclaration, context: CheckerContext, reporter: DiagnosticReporter) {
|
||||||
|
if (declaration !is FirMemberDeclaration) return
|
||||||
|
if (declaration.visibility == Visibilities.Internal) return
|
||||||
|
val annotation = declaration.getAnnotationsByFqName(StandardNames.FqNames.publishedApi).firstOrNull() ?: return
|
||||||
|
reporter.reportOn(annotation.source, FirErrors.NON_INTERNAL_PUBLISHED_API, context)
|
||||||
|
}
|
||||||
|
}
|
||||||
+2
@@ -264,6 +264,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_ABSTRACT_FUNC
|
|||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_EXHAUSTIVE_WHEN_STATEMENT
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_EXHAUSTIVE_WHEN_STATEMENT
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_FINAL_MEMBER_IN_FINAL_CLASS
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_FINAL_MEMBER_IN_FINAL_CLASS
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_FINAL_MEMBER_IN_OBJECT
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_FINAL_MEMBER_IN_OBJECT
|
||||||
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_INTERNAL_PUBLISHED_API
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_LOCAL_RETURN_NOT_ALLOWED
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_LOCAL_RETURN_NOT_ALLOWED
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_LOCAL_SUSPENSION_POINT
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_LOCAL_SUSPENSION_POINT
|
||||||
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_MEMBER_FUNCTION_NO_BODY
|
import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.NON_MEMBER_FUNCTION_NO_BODY
|
||||||
@@ -936,6 +937,7 @@ class FirDefaultErrorMessages {
|
|||||||
map.put(OVERRIDE_BY_INLINE, "Override by an inline function")
|
map.put(OVERRIDE_BY_INLINE, "Override by an inline function")
|
||||||
map.put(REIFIED_TYPE_PARAMETER_IN_OVERRIDE, "Override by a function with reified type parameter")
|
map.put(REIFIED_TYPE_PARAMETER_IN_OVERRIDE, "Override by a function with reified type parameter")
|
||||||
map.put(INLINE_PROPERTY_WITH_BACKING_FIELD, "Inline property cannot have backing field")
|
map.put(INLINE_PROPERTY_WITH_BACKING_FIELD, "Inline property cannot have backing field")
|
||||||
|
map.put(NON_INTERNAL_PUBLISHED_API, "@PublishedApi annotation is only applicable for internal declaration")
|
||||||
map.put(RESERVED_MEMBER_INSIDE_INLINE_CLASS, "Member with the name ''{0}'' is reserved for future releases", TO_STRING)
|
map.put(RESERVED_MEMBER_INSIDE_INLINE_CLASS, "Member with the name ''{0}'' is reserved for future releases", TO_STRING)
|
||||||
map.put(
|
map.put(
|
||||||
SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_INLINE_CLASS,
|
SECONDARY_CONSTRUCTOR_WITH_BODY_INSIDE_INLINE_CLASS,
|
||||||
|
|||||||
@@ -1,71 +0,0 @@
|
|||||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
class A
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal class B
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
private class C
|
|
||||||
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
fun a() {}
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal fun b() {}
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal fun c() {}
|
|
||||||
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
var ap = 1
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal var bp = 1
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal var c = 1
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class E {
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
fun a() {}
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal fun b() {}
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
private fun c() {}
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
protected fun d() {}
|
|
||||||
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
val ap = 1
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal val bp = 1
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
protected val c = 1
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
private val d = 1
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
class D @kotlin.PublishedApi constructor() {
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
constructor(a: String) : this()
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
private constructor(a: String, b: String): this()
|
|
||||||
|
|
||||||
@kotlin.PublishedApi
|
|
||||||
internal constructor(a: String, b: String, c: String): this()
|
|
||||||
}
|
|
||||||
@@ -1,3 +1,4 @@
|
|||||||
|
// FIR_IDENTICAL
|
||||||
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
// !DIAGNOSTICS: -UNUSED_PARAMETER
|
||||||
<!NON_INTERNAL_PUBLISHED_API!>@kotlin.PublishedApi<!>
|
<!NON_INTERNAL_PUBLISHED_API!>@kotlin.PublishedApi<!>
|
||||||
class A
|
class A
|
||||||
|
|||||||
+6
@@ -3179,6 +3179,12 @@ internal val KT_DIAGNOSTIC_CONVERTER = KtDiagnosticConverterBuilder.buildConvert
|
|||||||
token,
|
token,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
add(FirErrors.NON_INTERNAL_PUBLISHED_API) { firDiagnostic ->
|
||||||
|
NonInternalPublishedApiImpl(
|
||||||
|
firDiagnostic as FirPsiDiagnostic,
|
||||||
|
token,
|
||||||
|
)
|
||||||
|
}
|
||||||
add(FirErrors.REIFIED_TYPE_PARAMETER_IN_OVERRIDE) { firDiagnostic ->
|
add(FirErrors.REIFIED_TYPE_PARAMETER_IN_OVERRIDE) { firDiagnostic ->
|
||||||
ReifiedTypeParameterInOverrideImpl(
|
ReifiedTypeParameterInOverrideImpl(
|
||||||
firDiagnostic as FirPsiDiagnostic,
|
firDiagnostic as FirPsiDiagnostic,
|
||||||
|
|||||||
+4
@@ -2218,6 +2218,10 @@ sealed class KtFirDiagnostic<PSI : PsiElement> : KtDiagnosticWithPsi<PSI> {
|
|||||||
override val diagnosticClass get() = OverrideByInline::class
|
override val diagnosticClass get() = OverrideByInline::class
|
||||||
}
|
}
|
||||||
|
|
||||||
|
abstract class NonInternalPublishedApi : KtFirDiagnostic<KtElement>() {
|
||||||
|
override val diagnosticClass get() = NonInternalPublishedApi::class
|
||||||
|
}
|
||||||
|
|
||||||
abstract class ReifiedTypeParameterInOverride : KtFirDiagnostic<KtElement>() {
|
abstract class ReifiedTypeParameterInOverride : KtFirDiagnostic<KtElement>() {
|
||||||
override val diagnosticClass get() = ReifiedTypeParameterInOverride::class
|
override val diagnosticClass get() = ReifiedTypeParameterInOverride::class
|
||||||
}
|
}
|
||||||
|
|||||||
+7
@@ -3581,6 +3581,13 @@ internal class OverrideByInlineImpl(
|
|||||||
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal class NonInternalPublishedApiImpl(
|
||||||
|
firDiagnostic: FirPsiDiagnostic,
|
||||||
|
override val token: ValidityToken,
|
||||||
|
) : KtFirDiagnostic.NonInternalPublishedApi(), KtAbstractFirDiagnostic<KtElement> {
|
||||||
|
override val firDiagnostic: FirPsiDiagnostic by weakRef(firDiagnostic)
|
||||||
|
}
|
||||||
|
|
||||||
internal class ReifiedTypeParameterInOverrideImpl(
|
internal class ReifiedTypeParameterInOverrideImpl(
|
||||||
firDiagnostic: FirPsiDiagnostic,
|
firDiagnostic: FirPsiDiagnostic,
|
||||||
override val token: ValidityToken,
|
override val token: ValidityToken,
|
||||||
|
|||||||
Reference in New Issue
Block a user