Self types: diagnostics for annotation classes

JetBrains · Jan 14, 2023 · ec1ca0f · ec1ca0f
1 parent 9cdec30
commit ec1ca0f
Show file tree

Hide file tree

Showing 8 changed files with 50 additions and 2 deletions.
diff --git a/...ow/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java b/...ow/level/api/fir/diagnostic/compiler/based/DiagnosisCompilerFirTestdataTestGenerated.java
diff --git a/...ests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java b/...ests-gen/org/jetbrains/kotlin/fir/LazyBodyIsNotTouchedTilContractsPhaseTestGenerated.java
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/selfTypeForAnnotation.fir.txt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/selfTypeForAnnotation.fir.txt
@@ -0,0 +1,7 @@
+FILE: selfTypeForAnnotation.kt
+    @R|kotlin/Self|() public final annotation class AnnotationClass<out <Self> : R|AnnotationClass<<Self>>|> : R|kotlin/Annotation| {
+        public constructor<out <Self> : R|AnnotationClass<<Self>>|>(): R|AnnotationClass<<Self>>| {
+            super<R|kotlin/Any|>()
+        }
+
+    }
diff --git a/compiler/fir/analysis-tests/testData/resolve/diagnostics/selfTypeForAnnotation.kt b/compiler/fir/analysis-tests/testData/resolve/diagnostics/selfTypeForAnnotation.kt
@@ -0,0 +1,6 @@
+// FIR_DISABLE_LAZY_RESOLVE_CHECKS
+import kotlin.Self
+<!SELF_TYPE_INAPPLICABLE_TARGET!>@Self<!>
+annotation class AnnotationClass {
+
+}
diff --git a/...nalysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java b/...nalysis-tests/tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticTestGenerated.java
diff --git a/...tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java b/...tests-gen/org/jetbrains/kotlin/test/runners/FirDiagnosticsWithLightTreeTestGenerated.java
diff --git a/...eckers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt b/...eckers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt
@@ -21,6 +21,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors
 import org.jetbrains.kotlin.fir.declarations.*
 import org.jetbrains.kotlin.fir.declarations.utils.fromPrimaryConstructor
 import org.jetbrains.kotlin.fir.declarations.utils.hasBackingField
+import org.jetbrains.kotlin.fir.declarations.utils.isAnnotationClass
 import org.jetbrains.kotlin.fir.expressions.FirAnnotation
 import org.jetbrains.kotlin.fir.languageVersionSettings
 import org.jetbrains.kotlin.fir.packageFqName
@@ -71,8 +72,16 @@ object FirAnnotationChecker : FirBasicDeclarationChecker() {
             }
         }
 
-        if (declaration is FirClass && declaration.isEnumClass && self != null) {
-            reporter.reportOn(self.source, FirErrors.SELF_TYPE_INAPPLICABLE_TARGET, "", context)
+        if (self != null) {
+            if (declaration is FirClass) {
+                if (declaration.isEnumClass) {
+                    reporter.reportOn(self.source, FirErrors.SELF_TYPE_INAPPLICABLE_TARGET, "", context)
+                }
+
+                if (declaration.isAnnotationClass) {
+                    reporter.reportOn(self.source, FirErrors.SELF_TYPE_INAPPLICABLE_TARGET, "", context)
+                }
+            }
         }
 
         if (deprecatedSinceKotlin != null) {

diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/FirStatusUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/utils/FirStatusUtils.kt
@@ -55,6 +55,9 @@ inline val FirClass.isInterface: Boolean
 inline val FirClass.isEnumClass: Boolean
     get() = classKind.isEnumClass
 
+inline val FirClass.isAnnotationClass: Boolean
+    get() = classKind.isAnnotationClass
+
 inline val FirRegularClass.isSealed: Boolean get() = status.modality == Modality.SEALED
 
 inline val FirRegularClass.canHaveAbstractDeclaration: Boolean