diff --git a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt index 1b8aced049d..54ba7f2b530 100644 --- a/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt +++ b/compiler/fir/checkers/checkers-component-generator/src/org/jetbrains/kotlin/fir/checkers/generator/Main.kt @@ -39,7 +39,7 @@ fun main(args: Array) { alias("LogicExpressionChecker") alias("ReturnExpressionChecker") alias("BlockChecker") - alias("AnnotationCallChecker") + alias("AnnotationCallChecker") alias("CheckNotNullCallChecker") alias("ElvisExpressionChecker") alias("GetClassCallChecker") diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmDefaultChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmDefaultChecker.kt index 7def3b67e84..cbe5abc47fa 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmDefaultChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmDefaultChecker.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.containingClass import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isInterface import org.jetbrains.kotlin.fir.declarations.utils.modality -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.java.jvmDefaultModeState import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.scopes.getDirectOverriddenFunctions @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.name.JvmNames.JVM_DEFAULT_NO_COMPATIBILITY_CLASS_ID object FirJvmDefaultChecker : FirBasicDeclarationChecker() { override fun check(declaration: FirDeclaration, context: CheckerContext, reporter: DiagnosticReporter) { val jvmDefaultMode = context.session.jvmDefaultModeState - var defaultAnnotation: FirAnnotationCall? = null + var defaultAnnotation: FirAnnotation? = null val containingDeclaration = context.findClosest() if (declaration is FirAnnotatedDeclaration) { @@ -121,7 +121,7 @@ object FirJvmDefaultChecker : FirBasicDeclarationChecker() { } private fun checkNonJvmDefaultOverridesJavaDefault( - defaultAnnotation: FirAnnotationCall?, + defaultAnnotation: FirAnnotation?, jvmDefaultMode: JvmDefaultMode, declaration: FirDeclaration, containingDeclaration: FirClassLikeDeclaration?, @@ -175,4 +175,4 @@ object FirJvmDefaultChecker : FirBasicDeclarationChecker() { // TODO: Fix support for all cases return isCompiledToJvmDefault(jvmDefaultMode) } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmNameChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmNameChecker.kt index 8c6ec4fd4db..61d744006a3 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmNameChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmNameChecker.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isInline import org.jetbrains.kotlin.fir.declarations.utils.isOpen import org.jetbrains.kotlin.fir.declarations.utils.isOverride -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.resolve.getContainingClass @@ -60,7 +60,7 @@ object FirJvmNameChecker : FirBasicDeclarationChecker() { } } - private fun FirAnnotatedDeclaration.findJvmNameAnnotation(): FirAnnotationCall? { + private fun FirAnnotatedDeclaration.findJvmNameAnnotation(): FirAnnotation? { return annotations.firstOrNull { it.calleeReference.safeAs()?.name == StandardClassIds.JvmName.shortClassName } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt index 5dc3a6d43ed..af537a280ec 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirJvmStaticChecker.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.SymbolInternals @@ -242,7 +242,7 @@ object FirJvmStaticChecker : FirAnnotatedDeclarationChecker() { return findAnnotation(classId) != null } - private fun FirAnnotatedDeclaration.findAnnotation(classId: ClassId): FirAnnotationCall? { + private fun FirAnnotatedDeclaration.findAnnotation(classId: ClassId): FirAnnotation? { return annotations.firstOrNull { it.calleeReference.safeAs()?.name == classId.shortClassName } diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt index 091538397d3..fceaf2afb0b 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/declaration/FirRepeatableAnnotationChecker.kt @@ -106,7 +106,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { return repeatableAnnotation.resolveContainerAnnotation() } - private fun FirAnnotationCall.resolveContainerAnnotation(): ClassId? { + private fun FirAnnotation.resolveContainerAnnotation(): ClassId? { val value = findArgumentByName(REPEATABLE_PARAMETER_NAME) ?: return null val classCallArgument = (value as? FirGetClassCall)?.argument ?: return null if (classCallArgument is FirResolvedQualifier) { @@ -119,7 +119,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { } private fun checkJavaRepeatableAnnotationDeclaration( - javaRepeatable: FirAnnotationCall, + javaRepeatable: FirAnnotation, annotationClass: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter @@ -131,7 +131,7 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { } private fun checkKotlinRepeatableAnnotationDeclaration( - kotlinRepeatable: FirAnnotationCall, + kotlinRepeatable: FirAnnotation, declaration: FirRegularClass, context: CheckerContext, reporter: DiagnosticReporter @@ -253,4 +253,4 @@ object FirRepeatableAnnotationChecker : FirAnnotatedDeclarationChecker() { } } } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirDeprecatedJavaAnnotationsChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirDeprecatedJavaAnnotationsChecker.kt index 407a756720e..a1b78293808 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirDeprecatedJavaAnnotationsChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirDeprecatedJavaAnnotationsChecker.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.expression.FirAnnotationCallCh import org.jetbrains.kotlin.fir.analysis.diagnostics.DiagnosticReporter import org.jetbrains.kotlin.fir.analysis.diagnostics.jvm.FirJvmErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.coneTypeSafe import org.jetbrains.kotlin.load.java.JvmAnnotationNames @@ -29,7 +29,7 @@ object FirDeprecatedJavaAnnotationsChecker : FirAnnotationCallChecker() { ClassId.topLevel(JvmAnnotationNames.DOCUMENTED_ANNOTATION) to StandardNames.FqNames.mustBeDocumented ) - override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { + override fun check(expression: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter) { if (context.containingDeclarations.lastOrNull()?.source?.kind != FirRealSourceElementKind) return val lookupTag = expression.annotationTypeRef.coneTypeSafe()?.lookupTag ?: return @@ -37,4 +37,4 @@ object FirDeprecatedJavaAnnotationsChecker : FirAnnotationCallChecker() { reporter.reportOn(expression.source, FirJvmErrors.DEPRECATED_JAVA_ANNOTATION, betterName, context) } } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmPackageNameAnnotationsChecker.kt b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmPackageNameAnnotationsChecker.kt index 1f6bd5c7244..d81e6a06326 100644 --- a/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmPackageNameAnnotationsChecker.kt +++ b/compiler/fir/checkers/checkers.jvm/src/org/jetbrains/kotlin/fir/analysis/jvm/checkers/expression/FirJvmPackageNameAnnotationsChecker.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirClass import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.getStringArgument -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeClassLikeType import org.jetbrains.kotlin.fir.types.coneTypeSafe import org.jetbrains.kotlin.name.* @@ -23,7 +23,7 @@ object FirJvmPackageNameAnnotationsChecker : FirAnnotationCallChecker() { private val jvmPackageNameClassId = ClassId.topLevel(FqName("kotlin.jvm.JvmPackageName")) private val stringParameterName = Name.identifier("name") - override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { + override fun check(expression: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter) { val lookupTag = expression.annotationTypeRef.coneTypeSafe()?.lookupTag ?: return if (lookupTag.classId != jvmPackageNameClassId) return @@ -39,4 +39,4 @@ object FirJvmPackageNameAnnotationsChecker : FirAnnotationCallChecker() { reporter.reportOn(expression.source, FirJvmErrors.JVM_PACKAGE_NAME_NOT_SUPPORTED_IN_FILES_WITH_CLASSES, context) } } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionCheckerAliases.kt b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionCheckerAliases.kt index ed76ddb915f..367d3f12a7c 100644 --- a/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionCheckerAliases.kt +++ b/compiler/fir/checkers/gen/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirExpressionCheckerAliases.kt @@ -10,7 +10,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.expression * DO NOT MODIFY IT MANUALLY */ -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirBlock @@ -53,7 +53,7 @@ typealias FirLoopJumpChecker = FirExpressionChecker typealias FirLogicExpressionChecker = FirExpressionChecker typealias FirReturnExpressionChecker = FirExpressionChecker typealias FirBlockChecker = FirExpressionChecker -typealias FirAnnotationCallChecker = FirExpressionChecker +typealias FirAnnotationCallChecker = FirExpressionChecker typealias FirCheckNotNullCallChecker = FirExpressionChecker typealias FirElvisExpressionChecker = FirExpressionChecker typealias FirGetClassCallChecker = FirExpressionChecker diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt index e87fb4f3423..040781d9881 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/FirAnnotationHelpers.kt @@ -25,6 +25,7 @@ import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.resolve.symbolProvider import org.jetbrains.kotlin.fir.resolve.toSymbol +import org.jetbrains.kotlin.fir.symbols.SymbolInternals import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -42,11 +43,21 @@ private val JAVA_REPEATABLE_ANNOTATION = FqName("java.lang.annotation.Repeatable private val JAVA_REPEATABLE_ANNOTATION_CLASS_ID = ClassId.topLevel(JAVA_REPEATABLE_ANNOTATION) private val JVM_REPEATABLE_ANNOTATION_CLASS_ID = ClassId.fromString("kotlin/jvm/JvmRepeatable") +@OptIn(SymbolInternals::class) +fun FirAnnotation.getRetention(session: FirSession): AnnotationRetention { + val annotationClassSymbol = + (this.annotationTypeRef.coneType as? ConeClassLikeType)?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol + ?: return AnnotationRetention.RUNTIME + annotationClassSymbol.ensureResolved(FirResolvePhase.BODY_RESOLVE) + val annotationClass = annotationClassSymbol.fir + return annotationClass.getRetention() +} + fun FirRegularClass.getRetention(): AnnotationRetention { return getRetentionAnnotation()?.getRetention() ?: AnnotationRetention.RUNTIME } -fun FirAnnotationCall.getRetention(): AnnotationRetention { +fun FirAnnotation.getRetention(): AnnotationRetention { val retentionArgument = findArgumentByName(RETENTION_PARAMETER_NAME) as? FirQualifiedAccessExpression ?: return AnnotationRetention.RUNTIME val retentionName = (retentionArgument.calleeReference as? FirResolvedNamedReference)?.name?.asString() @@ -56,7 +67,7 @@ fun FirAnnotationCall.getRetention(): AnnotationRetention { private val defaultAnnotationTargets = KotlinTarget.DEFAULT_TARGET_SET -fun FirAnnotationCall.getAllowedAnnotationTargets(session: FirSession): Set { +fun FirAnnotation.getAllowedAnnotationTargets(session: FirSession): Set { if (annotationTypeRef is FirErrorTypeRef) return KotlinTarget.values().toSet() val annotationClassSymbol = (this.annotationTypeRef.coneType as? ConeClassLikeType) ?.fullyExpandedType(session)?.lookupTag?.toSymbol(session) ?: return defaultAnnotationTargets @@ -80,15 +91,15 @@ fun FirClassLikeSymbol<*>.getAllowedAnnotationTargets(): Set { } } -fun FirAnnotatedDeclaration.getRetentionAnnotation(): FirAnnotationCall? { +fun FirAnnotatedDeclaration.getRetentionAnnotation(): FirAnnotation? { return getAnnotationByClassId(StandardNames.FqNames.retentionClassId) } -fun FirAnnotatedDeclaration.getTargetAnnotation(): FirAnnotationCall? { +fun FirAnnotatedDeclaration.getTargetAnnotation(): FirAnnotation? { return getAnnotationByClassId(StandardNames.FqNames.targetClassId) } -fun FirClassLikeSymbol<*>.getTargetAnnotation(): FirAnnotationCall? { +fun FirClassLikeSymbol<*>.getTargetAnnotation(): FirAnnotation? { return getAnnotationByClassId(StandardNames.FqNames.targetClassId) } @@ -103,7 +114,7 @@ fun FirExpression.extractClassesFromArgument(): List { fun checkRepeatedAnnotation( useSiteTarget: AnnotationUseSiteTarget?, existingTargetsForAnnotation: MutableList, - annotation: FirAnnotationCall, + annotation: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter, ) { @@ -114,7 +125,7 @@ fun checkRepeatedAnnotation( } } -fun FirAnnotationCall.isRepeatable(session: FirSession): Boolean { +fun FirAnnotation.isRepeatable(session: FirSession): Boolean { val annotationClassId = this.toAnnotationClassId() ?: return false if (annotationClassId.isLocal) return false val annotationClass = session.symbolProvider.getClassLikeSymbolByClassId(annotationClassId) ?: return false @@ -138,7 +149,7 @@ fun FirClassLikeSymbol<*>.getAnnotationRetention(): AnnotationRetention { } fun FirAnnotationContainer.getDefaultUseSiteTarget( - annotation: FirAnnotationCall, + annotation: FirAnnotation, context: CheckerContext ): AnnotationUseSiteTarget? { return getImplicitUseSiteTargetList(context).firstOrNull { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt index 38c07316146..64db01d7d94 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/declaration/FirAnnotationChecker.kt @@ -5,6 +5,7 @@ package org.jetbrains.kotlin.fir.analysis.checkers.declaration +import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.config.LanguageFeature import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.descriptors.annotations.KotlinTarget @@ -16,7 +17,7 @@ import org.jetbrains.kotlin.fir.analysis.checkers.context.findClosest import org.jetbrains.kotlin.fir.analysis.diagnostics.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.hasBackingField -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.argumentMapping import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.packageFqName @@ -35,24 +36,24 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { context: CheckerContext, reporter: DiagnosticReporter ) { - var deprecatedCall: FirAnnotationCall? = null - var deprecatedSinceKotlinCall: FirAnnotationCall? = null + var deprecated: FirAnnotation? = null + var deprecatedSinceKotlin: FirAnnotation? = null for (annotation in declaration.annotations) { val fqName = annotation.fqName(context.session) ?: continue if (fqName == deprecatedClassId) { - deprecatedCall = annotation + deprecated = annotation } else if (fqName == deprecatedSinceKotlinClassId) { - deprecatedSinceKotlinCall = annotation + deprecatedSinceKotlin = annotation } withSuppressedDiagnostics(annotation, context) { checkAnnotationTarget(declaration, annotation, context, reporter) } } - if (deprecatedSinceKotlinCall != null) { - withSuppressedDiagnostics(deprecatedSinceKotlinCall, context) { - checkDeprecatedCalls(deprecatedSinceKotlinCall, deprecatedCall, context, reporter) + if (deprecatedSinceKotlin != null) { + withSuppressedDiagnostics(deprecatedSinceKotlin, context) { + checkDeprecatedCalls(deprecatedSinceKotlin, deprecated, context, reporter) } } @@ -67,7 +68,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkAnnotationTarget( declaration: FirAnnotatedDeclaration, - annotation: FirAnnotationCall, + annotation: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter ) { @@ -119,7 +120,7 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { private fun checkAnnotationUseSiteTarget( annotated: FirAnnotatedDeclaration, - annotation: FirAnnotationCall, + annotation: FirAnnotation, target: AnnotationUseSiteTarget, context: CheckerContext, reporter: DiagnosticReporter @@ -176,28 +177,28 @@ object FirAnnotationChecker : FirAnnotatedDeclarationChecker() { } private fun checkDeprecatedCalls( - deprecatedSinceKotlinCall: FirAnnotationCall, - deprecatedCall: FirAnnotationCall?, + deprecatedSinceKotlin: FirAnnotation, + deprecated: FirAnnotation?, context: CheckerContext, reporter: DiagnosticReporter ) { val closestFirFile = context.findClosest() if (closestFirFile != null && !closestFirFile.packageFqName.startsWith(StandardClassIds.BASE_KOTLIN_PACKAGE.shortName())) { reporter.reportOn( - deprecatedSinceKotlinCall.source, + deprecatedSinceKotlin.source, FirErrors.DEPRECATED_SINCE_KOTLIN_OUTSIDE_KOTLIN_SUBPACKAGE, context ) } - if (deprecatedCall == null) { - reporter.reportOn(deprecatedSinceKotlinCall.source, FirErrors.DEPRECATED_SINCE_KOTLIN_WITHOUT_DEPRECATED, context) + if (deprecated == null) { + reporter.reportOn(deprecatedSinceKotlin.source, FirErrors.DEPRECATED_SINCE_KOTLIN_WITHOUT_DEPRECATED, context) } else { - val argumentMapping = deprecatedCall.argumentMapping ?: return + val argumentMapping = deprecated.argumentMapping ?: return for (value in argumentMapping.values) { if (value.name.identifier == "level") { reporter.reportOn( - deprecatedSinceKotlinCall.source, + deprecatedSinceKotlin.source, FirErrors.DEPRECATED_SINCE_KOTLIN_WITH_DEPRECATED_LEVEL, context ) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt index d61abef122a..c4c9bd244b6 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirAnnotationArgumentChecker.kt @@ -34,7 +34,7 @@ object FirAnnotationArgumentChecker : FirAnnotationCallChecker() { sinceKotlinFqName, ) - override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { + override fun check(expression: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter) { val argumentMapping = expression.argumentMapping ?: return val fqName = expression.fqName(context.session) for ((arg, _) in argumentMapping) { @@ -130,12 +130,12 @@ object FirAnnotationArgumentChecker : FirAnnotationCallChecker() { private fun checkAnnotationsWithVersion( fqName: FqName?, - annotationCall: FirAnnotationCall, + annotation: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter ) { if (!annotationFqNamesWithVersion.contains(fqName)) return - val versionExpression = annotationCall.findArgumentByName(versionArgumentName) ?: return + val versionExpression = annotation.findArgumentByName(versionArgumentName) ?: return val version = parseVersionExpressionOrReport(versionExpression, context, reporter) ?: return if (fqName == sinceKotlinFqName) { val specified = context.session.languageVersionSettings.apiVersion diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConstructorCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConstructorCallChecker.kt index 22fdc5e7034..c2944760846 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConstructorCallChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirConstructorCallChecker.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.utils.isAbstract -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference import org.jetbrains.kotlin.fir.symbols.impl.FirConstructorSymbol @@ -31,7 +31,7 @@ object FirConstructorCallChecker : FirFunctionCallChecker() { } if (declarationClass.classKind == ClassKind.ANNOTATION_CLASS && context.qualifiedAccessOrAnnotationCalls.all { call -> - call !is FirAnnotationCall + call !is FirAnnotation } && context.containingDeclarations.all { klass -> klass !is FirRegularClass || klass.classKind != ClassKind.ANNOTATION_CLASS diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt index 6f68144adc7..5c2c5e52fe8 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirDeprecationChecker.kt @@ -32,7 +32,7 @@ object FirDeprecationChecker : FirBasicExpressionChecker() { override fun check(expression: FirStatement, context: CheckerContext, reporter: DiagnosticReporter) { if (!allowedSourceKinds.contains(expression.source?.kind)) return - if (expression is FirAnnotationCall || expression is FirDelegatedConstructorCall) return //checked by FirDeprecatedTypeChecker + if (expression is FirAnnotation || expression is FirDelegatedConstructorCall) return //checked by FirDeprecatedTypeChecker val resolvable = expression as? FirResolvable ?: return val reference = resolvable.calleeReference as? FirResolvedNamedReference ?: return val referencedSymbol = reference.resolvedSymbol diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirNamedVarargChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirNamedVarargChecker.kt index 3c31f39a12a..e9c93aee499 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirNamedVarargChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirNamedVarargChecker.kt @@ -22,8 +22,8 @@ import org.jetbrains.kotlin.fir.types.isArrayType object FirNamedVarargChecker : FirCallChecker() { override fun check(expression: FirCall, context: CheckerContext, reporter: DiagnosticReporter) { - if (expression !is FirFunctionCall && expression !is FirAnnotationCall && expression !is FirDelegatedConstructorCall) return - val isAnnotation = expression is FirAnnotationCall + if (expression !is FirFunctionCall && expression !is FirAnnotation && expression !is FirDelegatedConstructorCall) return + val isAnnotation = expression is FirAnnotation val errorFactory = if (isAnnotation) FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_ANNOTATION else FirErrors.ASSIGNING_SINGLE_ELEMENT_TO_VARARG_IN_NAMED_FORM_FUNCTION @@ -56,4 +56,4 @@ object FirNamedVarargChecker : FirCallChecker() { } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt index 2572c904b33..6d46bff7a2f 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/expression/FirOptInAnnotationCallChecker.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.types.coneTypeSafe import org.jetbrains.kotlin.resolve.checkers.OptInNames object FirOptInAnnotationCallChecker : FirAnnotationCallChecker() { - override fun check(expression: FirAnnotationCall, context: CheckerContext, reporter: DiagnosticReporter) { + override fun check(expression: FirAnnotation, context: CheckerContext, reporter: DiagnosticReporter) { val lookupTag = expression.annotationTypeRef.coneTypeSafe()?.lookupTag ?: return val classId = lookupTag.classId val isMarker = classId == OptInNames.REQUIRES_OPT_IN_CLASS_ID diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt index d7626eaf69e..4002daf47a5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/extended/UnusedChecker.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.utils.isLocal -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess import org.jetbrains.kotlin.fir.references.FirResolvedNamedReference @@ -251,7 +251,7 @@ object UnusedChecker : FirControlFlowChecker() { private fun visitAnnotation( dataForNode: PathAwareVariableStatusInfo, - annotation: FirAnnotationCall, + annotation: FirAnnotation, ): PathAwareVariableStatusInfo { val qualifiedAccesses = annotation.argumentList.arguments.mapNotNull { it as? FirQualifiedAccess }.toTypedArray() return visitQualifiedAccesses(dataForNode, *qualifiedAccesses) diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt index 866882db0a5..afb9be24ea2 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/checkers/type/FirOptInUsageTypeRefChecker.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.analysis.diagnostics.FirErrors.OPT_IN_MARKER_CAN import org.jetbrains.kotlin.fir.analysis.diagnostics.reportOn import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.getAnnotationByClassId -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.symbols.SymbolInternals import org.jetbrains.kotlin.fir.symbols.ensureResolved @@ -33,7 +33,7 @@ object FirOptInUsageTypeRefChecker : FirTypeRefChecker() { val symbol = coneType.lookupTag.toSymbol(context.session) ?: return symbol.ensureResolved(FirResolvePhase.STATUS) val classId = symbol.classId - val lastAnnotationCall = context.qualifiedAccessOrAnnotationCalls.lastOrNull() as? FirAnnotationCall + val lastAnnotationCall = context.qualifiedAccessOrAnnotationCalls.lastOrNull() as? FirAnnotation if (lastAnnotationCall == null || lastAnnotationCall.annotationTypeRef !== typeRef) { if (classId == OptInNames.REQUIRES_OPT_IN_CLASS_ID || classId == OptInNames.OPT_IN_CLASS_ID) { reporter.reportOn(source, OPT_IN_CAN_ONLY_BE_USED_AS_ANNOTATION, context) @@ -48,4 +48,4 @@ object FirOptInUsageTypeRefChecker : FirTypeRefChecker() { reportNotAcceptedExperimentalities(experimentalities, typeRef, context, reporter) } } -} \ No newline at end of file +} diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt index 1376cb2758b..c677b401cf5 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/AbstractDiagnosticCollectorVisitor.kt @@ -204,8 +204,8 @@ abstract class AbstractDiagnosticCollectorVisitor( visitWithQualifiedAccessOrAnnotationCall(propertyAccessExpression) } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: Nothing?) { - visitWithQualifiedAccessOrAnnotationCall(annotationCall) + override fun visitAnnotation(annotation: FirAnnotation, data: Nothing?) { + visitWithQualifiedAccessOrAnnotationCall(annotation) } override fun visitVariableAssignment(variableAssignment: FirVariableAssignment, data: Nothing?) { diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt index abfc5db1c7d..b9a4d4fce1a 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ErrorNodeDiagnosticCollectorComponent.kt @@ -51,7 +51,7 @@ class ErrorNodeDiagnosticCollectorComponent( // Use the source of the enclosing FirQualifiedAccess if it is exactly the call to the erroneous callee. when (it) { is FirQualifiedAccess -> it.calleeReference == errorNamedReference - is FirAnnotationCall -> it.calleeReference == errorNamedReference + is FirAnnotation -> it.calleeReference == errorNamedReference else -> false } } diff --git a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ExpressionCheckersDiagnosticComponent.kt b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ExpressionCheckersDiagnosticComponent.kt index 514b6aca56c..204458dd355 100644 --- a/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ExpressionCheckersDiagnosticComponent.kt +++ b/compiler/fir/checkers/src/org/jetbrains/kotlin/fir/analysis/collectors/components/ExpressionCheckersDiagnosticComponent.kt @@ -28,8 +28,8 @@ class ExpressionCheckersDiagnosticComponent( checkers.allConstExpressionCheckers.check(constExpression, data, reporter) } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: CheckerContext) { - checkers.allAnnotationCallCheckers.check(annotationCall, data, reporter) + override fun visitAnnotation(annotation: FirAnnotation, data: CheckerContext) { + checkers.allAnnotationCallCheckers.check(annotation, data, reporter) } override fun visitQualifiedAccessExpression(qualifiedAccessExpression: FirQualifiedAccessExpression, data: CheckerContext) { diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt index 04db63171fc..e3151ea1997 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/AbstractAnnotationDeserializer.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.utils.collectEnumEntries import org.jetbrains.kotlin.fir.diagnostics.ConeSimpleDiagnostic import org.jetbrains.kotlin.fir.diagnostics.DiagnosticKind -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.buildUnaryArgumentList @@ -58,13 +58,13 @@ abstract class AbstractAnnotationDeserializer( OTHERS } - fun loadClassAnnotations(classProto: ProtoBuf.Class, nameResolver: NameResolver): List { + fun loadClassAnnotations(classProto: ProtoBuf.Class, nameResolver: NameResolver): List { if (!Flags.HAS_ANNOTATIONS.get(classProto.flags)) return emptyList() val annotations = classProto.getExtension(protocol.classAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } } - fun loadTypeAliasAnnotations(aliasProto: ProtoBuf.TypeAlias, nameResolver: NameResolver): List { + fun loadTypeAliasAnnotations(aliasProto: ProtoBuf.TypeAlias, nameResolver: NameResolver): List { if (!Flags.HAS_ANNOTATIONS.get(aliasProto.flags)) return emptyList() return aliasProto.annotationList.map { deserializeAnnotation(it, nameResolver) } } @@ -74,7 +74,7 @@ abstract class AbstractAnnotationDeserializer( functionProto: ProtoBuf.Function, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(functionProto.flags)) return emptyList() val annotations = functionProto.getExtension(protocol.functionAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } @@ -86,7 +86,7 @@ abstract class AbstractAnnotationDeserializer( containingClassProto: ProtoBuf.Class?, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(propertyProto.flags)) return emptyList() val annotations = propertyProto.getExtension(protocol.propertyAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver, AnnotationUseSiteTarget.PROPERTY) } @@ -97,7 +97,7 @@ abstract class AbstractAnnotationDeserializer( propertyProto: ProtoBuf.Property, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { return emptyList() } @@ -106,7 +106,7 @@ abstract class AbstractAnnotationDeserializer( propertyProto: ProtoBuf.Property, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { return emptyList() } @@ -116,7 +116,7 @@ abstract class AbstractAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, getterFlags: Int - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(getterFlags)) return emptyList() val annotations = propertyProto.getExtension(protocol.propertyGetterAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver, AnnotationUseSiteTarget.PROPERTY_GETTER) } @@ -128,7 +128,7 @@ abstract class AbstractAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, setterFlags: Int - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(setterFlags)) return emptyList() val annotations = propertyProto.getExtension(protocol.propertySetterAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver, AnnotationUseSiteTarget.PROPERTY_SETTER) } @@ -139,7 +139,7 @@ abstract class AbstractAnnotationDeserializer( constructorProto: ProtoBuf.Constructor, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(constructorProto.flags)) return emptyList() val annotations = constructorProto.getExtension(protocol.constructorAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } @@ -154,7 +154,7 @@ abstract class AbstractAnnotationDeserializer( typeTable: TypeTable, kind: CallableKind, parameterIndex: Int - ): List { + ): List { if (!Flags.HAS_ANNOTATIONS.get(valueParameterProto.flags)) return emptyList() val annotations = valueParameterProto.getExtension(protocol.parameterAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } @@ -166,17 +166,17 @@ abstract class AbstractAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, kind: CallableKind - ): List { + ): List { return emptyList() } - abstract fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List + abstract fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List fun deserializeAnnotation( proto: ProtoBuf.Annotation, nameResolver: NameResolver, useSiteTarget: AnnotationUseSiteTarget? = null - ): FirAnnotationCall { + ): FirAnnotation { val classId = nameResolver.getClassId(proto.id) var arguments = emptyList() @@ -208,7 +208,7 @@ abstract class AbstractAnnotationDeserializer( } } - return buildAnnotationCall { + return buildAnnotation { annotationTypeRef = buildResolvedTypeRef { type = ConeClassLikeLookupTagImpl(classId).constructClassType(emptyArray(), isNullable = false) } diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt index 1a352b8a615..3357c22c9ca 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusIm import org.jetbrains.kotlin.fir.declarations.utils.addDeclarations import org.jetbrains.kotlin.fir.declarations.utils.moduleName import org.jetbrains.kotlin.fir.declarations.utils.sourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONE import org.jetbrains.kotlin.fir.resolve.providers.impl.FirCloneableSymbolProvider.Companion.CLONEABLE_CLASS_ID import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -212,7 +212,7 @@ fun deserializeClassToSymbol( } it.setSealedClassInheritors(inheritors) } - (it.annotations as MutableList) += + (it.annotations as MutableList) += context.annotationDeserializer.loadClassAnnotations(classProto, context.nameResolver) it.versionRequirementsTable = context.versionRequirementTable diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirBuiltinAnnotationDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirBuiltinAnnotationDeserializer.kt index 57a1c65efc0..2012d2c4e6e 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirBuiltinAnnotationDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirBuiltinAnnotationDeserializer.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.deserialization import org.jetbrains.kotlin.fir.FirSession -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.metadata.deserialization.Flags import org.jetbrains.kotlin.metadata.deserialization.NameResolver @@ -15,7 +15,7 @@ class FirBuiltinAnnotationDeserializer( session: FirSession ) : AbstractAnnotationDeserializer(session) { - override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List { + override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List { if (!Flags.HAS_ANNOTATIONS.get(typeProto.flags)) return emptyList() val annotations = typeProto.getExtension(protocol.typeAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } diff --git a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt index f2c7fa2c11f..25eb9704016 100644 --- a/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt +++ b/compiler/fir/fir-deserialization/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyGetter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertySetter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.utils.sourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.buildExpressionStub import org.jetbrains.kotlin.fir.resolve.defaultType @@ -261,7 +261,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { effectiveVisibility ) }.apply { - (annotations as MutableList) += + (annotations as MutableList) += c.annotationDeserializer.loadPropertyGetterAnnotations( c.containerSource, proto, local.nameResolver, local.typeTable, getterFlags ) @@ -317,7 +317,7 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) { effectiveVisibility ) }.apply { - (annotations as MutableList) += + (annotations as MutableList) += c.annotationDeserializer.loadPropertySetterAnnotations( c.containerSource, proto, local.nameResolver, local.typeTable, setterFlags ) diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt index d28cdcee5b0..8b00d747d9e 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirAnnotationSerializer.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.metadata.ProtoBuf import org.jetbrains.kotlin.name.Name class FirAnnotationSerializer(private val session: FirSession, internal val stringTable: FirElementAwareStringTable) { - fun serializeAnnotation(annotation: FirAnnotationCall): ProtoBuf.Annotation = ProtoBuf.Annotation.newBuilder().apply { + fun serializeAnnotation(annotation: FirAnnotation): ProtoBuf.Annotation = ProtoBuf.Annotation.newBuilder().apply { val lookupTag = annotation.typeRef.coneTypeSafe()?.lookupTag ?: error { "Annotation without proper lookup tag: ${annotation.annotationTypeRef.coneType}" } diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt index 4b202a7b806..a9b98056706 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirElementSerializer.kt @@ -18,11 +18,11 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultPropertyAccessor import org.jetbrains.kotlin.fir.declarations.utils.* import org.jetbrains.kotlin.fir.deserialization.CONTINUATION_INTERFACE_CLASS_ID import org.jetbrains.kotlin.fir.deserialization.projection -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression -import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall +import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotation import org.jetbrains.kotlin.fir.references.impl.FirReferencePlaceholderForResolvedAnnotations import org.jetbrains.kotlin.fir.resolve.* import org.jetbrains.kotlin.fir.resolve.calls.varargElementType @@ -240,7 +240,7 @@ class FirElementSerializer private constructor( } } - private fun FirPropertyAccessor.nonSourceAnnotations(session: FirSession, property: FirProperty): List = + private fun FirPropertyAccessor.nonSourceAnnotations(session: FirSession, property: FirProperty): List = (this as FirAnnotationContainer).nonSourceAnnotations(session) + property.nonSourceAnnotations(session).filter { val useSiteTarget = it.useSiteTarget useSiteTarget == AnnotationUseSiteTarget.PROPERTY_GETTER && isGetter || @@ -529,7 +529,7 @@ class FirElementSerializer private constructor( private fun valueParameterProto( parameter: FirValueParameter, - additionalAnnotations: List = emptyList() + additionalAnnotations: List = emptyList() ): ProtoBuf.ValueParameter.Builder { val builder = ProtoBuf.ValueParameter.newBuilder() @@ -708,13 +708,13 @@ class FirElementSerializer private constructor( } private fun serializeAnnotationFromAttribute( - existingAnnotations: List?, + existingAnnotations: List?, classId: ClassId, builder: ProtoBuf.Type.Builder ) { if (existingAnnotations?.any { it.annotationTypeRef.coneTypeSafe()?.classId == classId } != true) { extension.serializeTypeAnnotation( - buildAnnotationCall { + buildAnnotation { calleeReference = FirReferencePlaceholderForResolvedAnnotations annotationTypeRef = buildResolvedTypeRef { this.type = CompilerConeAttributes.ExtensionFunctionType.ANNOTATION_CLASS_ID.constructClassLikeType( @@ -834,7 +834,7 @@ class FirElementSerializer private constructor( private fun MutableVersionRequirementTable.serializeVersionRequirements(container: FirAnnotationContainer): List = serializeVersionRequirements(container.annotations) - private fun MutableVersionRequirementTable.serializeVersionRequirements(annotations: List): List = + private fun MutableVersionRequirementTable.serializeVersionRequirements(annotations: List): List = annotations .filter { it.toAnnotationClassId()?.asSingleFqName() == RequireKotlinConstants.FQ_NAME @@ -849,7 +849,7 @@ class FirElementSerializer private constructor( private fun MutableVersionRequirementTable.writeVersionRequirementDependingOnCoroutinesVersion(): Int = writeVersionRequirement(LanguageFeature.ReleaseCoroutines) - private fun serializeVersionRequirementFromRequireKotlin(annotation: FirAnnotationCall): ProtoBuf.VersionRequirement.Builder? { + private fun serializeVersionRequirementFromRequireKotlin(annotation: FirAnnotation): ProtoBuf.VersionRequirement.Builder? { val args = annotation.argumentList val versionString = (args[RequireKotlinConstants.VERSION]?.toConstantValue() as? StringValue)?.value ?: return null diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt index d6ff9914ed8..a29d7644a88 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/FirSerializerExtension.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.serialization import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeFlexibleType import org.jetbrains.kotlin.fir.types.ConeKotlinErrorType import org.jetbrains.kotlin.metadata.ProtoBuf @@ -74,7 +74,7 @@ abstract class FirSerializerExtension { open fun serializeFlexibleType(type: ConeFlexibleType, lowerProto: ProtoBuf.Type.Builder, upperProto: ProtoBuf.Type.Builder) { } - open fun serializeTypeAnnotation(annotation: FirAnnotationCall, proto: ProtoBuf.Type.Builder) { + open fun serializeTypeAnnotation(annotation: FirAnnotation, proto: ProtoBuf.Type.Builder) { } open fun serializeTypeParameter(typeParameter: FirTypeParameter, proto: ProtoBuf.TypeParameter.Builder) { diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt index b5f72b123c2..7e0ca84713b 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/ConstantValue.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.serialization.constant import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirRegularClass -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.resolve.defaultType import org.jetbrains.kotlin.fir.resolve.symbolProvider import org.jetbrains.kotlin.fir.types.* @@ -30,7 +30,7 @@ internal sealed class ConstantValue(open val value: T) { internal abstract class IntegerValueConstant protected constructor(value: T) : ConstantValue(value) internal abstract class UnsignedValueConstant protected constructor(value: T) : ConstantValue(value) -internal class AnnotationValue(value: FirAnnotationCall) : ConstantValue(value) { +internal class AnnotationValue(value: FirAnnotation) : ConstantValue(value) { override fun accept(visitor: AnnotationArgumentVisitor, data: D): R = visitor.visitAnnotationValue(this, data) } diff --git a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt index 2f9949d528e..92a35ae7d4e 100644 --- a/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt +++ b/compiler/fir/fir-serialization/src/org/jetbrains/kotlin/fir/serialization/constant/FirToConstantValueTransformer.kt @@ -55,11 +55,11 @@ internal object FirToConstantValueTransformer : FirDefaultVisitor { - return AnnotationValue(annotationCall) + return AnnotationValue(annotation) } override fun visitGetClassCall( diff --git a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt index f800359a624..4b171b1e974 100644 --- a/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt +++ b/compiler/fir/fir2ir/jvm-backend/src/org/jetbrains/kotlin/fir/backend/jvm/FirJvmSerializerExtension.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.backend.FirMetadataSource import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.render import org.jetbrains.kotlin.fir.resolve.firProvider import org.jetbrains.kotlin.fir.resolve.inference.isBuiltinFunctionalType @@ -160,7 +160,7 @@ class FirJvmSerializerExtension( } } - override fun serializeTypeAnnotation(annotation: FirAnnotationCall, proto: ProtoBuf.Type.Builder) { + override fun serializeTypeAnnotation(annotation: FirAnnotation, proto: ProtoBuf.Type.Builder) { proto.addExtension(JvmProtoBuf.typeAnnotation, annotationSerializer.serializeAnnotation(annotation)) } diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt index 09efc9dbed1..77a06230894 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/ConversionUtils.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.utils.isInline import org.jetbrains.kotlin.fir.declarations.utils.isJava import org.jetbrains.kotlin.fir.declarations.utils.visibility -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess import org.jetbrains.kotlin.fir.references.FirErrorNamedReference @@ -126,7 +126,7 @@ fun FirClassifierSymbol<*>.toSymbol( session: FirSession, classifierStorage: Fir2IrClassifierStorage, typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT, - handleAnnotations: ((List) -> Unit)? = null + handleAnnotations: ((List) -> Unit)? = null ): IrClassifierSymbol { return when (this) { is FirTypeParameterSymbol -> { diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt index 9e893334664..27c44fca8a5 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrImplicitCastInserter.kt @@ -38,7 +38,7 @@ class Fir2IrImplicitCastInserter( TODO("Should not be here: ${element::class}: ${element.render()}") } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: IrElement): IrElement = data + override fun visitAnnotation(annotation: FirAnnotation, data: IrElement): IrElement = data override fun visitAnonymousObjectExpression(anonymousObjectExpression: FirAnonymousObjectExpression, data: IrElement): IrElement = data diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt index e53a5f2bfb7..4fe6c54e722 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrTypeConverter.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.backend -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.classId import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.resolve.fullyExpandedType @@ -94,7 +94,7 @@ class Fir2IrTypeConverter( fun ConeKotlinType.toIrType( typeContext: ConversionTypeContext = ConversionTypeContext.DEFAULT, - annotations: List = emptyList(), + annotations: List = emptyList(), hasFlexibleNullability: Boolean = false ): IrType { return when (this) { diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt index 6bc7ca14f4d..808d4bbcd37 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/Fir2IrVisitor.kt @@ -372,8 +372,8 @@ class Fir2IrVisitor( return calleeReference.resolvedSymbol as? FirNamedFunctionSymbol } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: Any?): IrElement { - return callGenerator.convertToIrConstructorCall(annotationCall) + override fun visitAnnotation(annotation: FirAnnotation, data: Any?): IrElement { + return callGenerator.convertToIrConstructorCall(annotation) } override fun visitQualifiedAccessExpression(qualifiedAccessExpression: FirQualifiedAccessExpression, data: Any?): IrElement { diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt index bf21601ff4d..4eba482d5f4 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/AnnotationGenerator.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.backend.Fir2IrComponents import org.jetbrains.kotlin.fir.declarations.FirProperty import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.useSiteTargetsFromMetaAnnotation -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.ir.declarations.* import org.jetbrains.kotlin.ir.expressions.IrConstructorCall import org.jetbrains.kotlin.ir.util.isSetter @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.ir.util.isSetter */ class AnnotationGenerator(private val components: Fir2IrComponents) : Fir2IrComponents by components { - fun List.toIrAnnotations(): List = + fun List.toIrAnnotations(): List = mapNotNull { callGenerator.convertToIrConstructorCall(it) as? IrConstructorCall } @@ -36,7 +36,7 @@ class AnnotationGenerator(private val components: Fir2IrComponents) : Fir2IrComp irContainer.annotations = firContainer.annotations.toIrAnnotations() } - private fun FirAnnotationCall.target(applicable: List): AnnotationUseSiteTarget? = + private fun FirAnnotation.target(applicable: List): AnnotationUseSiteTarget? = useSiteTarget ?: applicable.firstOrNull(useSiteTargetsFromMetaAnnotation(session)::contains) companion object { diff --git a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt index 232f56c1b34..3a2a1e49503 100644 --- a/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt +++ b/compiler/fir/fir2ir/src/org/jetbrains/kotlin/fir/backend/generators/CallAndReferenceGenerator.kt @@ -379,15 +379,15 @@ class CallAndReferenceGenerator( } } - fun convertToIrConstructorCall(annotationCall: FirAnnotationCall): IrExpression { - val coneType = annotationCall.annotationTypeRef.coneTypeSafe() + fun convertToIrConstructorCall(annotation: FirAnnotation): IrExpression { + val coneType = annotation.annotationTypeRef.coneTypeSafe() val type = coneType?.toIrType() val symbol = type?.classifierOrNull - return annotationCall.convertWithOffsets { startOffset, endOffset -> + return annotation.convertWithOffsets { startOffset, endOffset -> when (symbol) { is IrClassSymbol -> { val irClass = symbol.owner - val irConstructor = (annotationCall.toResolvedCallableSymbol() as? FirConstructorSymbol)?.let { + val irConstructor = (annotation.toResolvedCallableSymbol() as? FirConstructorSymbol)?.let { this.declarationStorage.getIrConstructorSymbol(it) } ?: run { // Fallback for FirReferencePlaceholderForResolvedAnnotations from jar @@ -419,11 +419,11 @@ class CallAndReferenceGenerator( startOffset, endOffset, type ?: createErrorType(), - "Unresolved reference: ${annotationCall.render()}" + "Unresolved reference: ${annotation.render()}" ) } } - }.applyCallArguments(annotationCall, annotationMode = true) + }.applyCallArguments(annotation, annotationMode = true) } internal fun convertToGetObject(qualifier: FirResolvedQualifier): IrExpression { @@ -487,11 +487,11 @@ class CallAndReferenceGenerator( val calleeReference = when (call) { is FirFunctionCall -> call.calleeReference is FirDelegatedConstructorCall -> call.calleeReference - is FirAnnotationCall -> call.calleeReference + is FirAnnotation -> call.calleeReference else -> null } val function = if (calleeReference == FirReferencePlaceholderForResolvedAnnotations) { - val coneClassLikeType = (call as FirAnnotationCall).annotationTypeRef.coneTypeSafe() + val coneClassLikeType = (call as FirAnnotation).annotationTypeRef.coneTypeSafe() val firClass = (coneClassLikeType?.lookupTag?.toSymbol(session) as? FirRegularClassSymbol)?.fir firClass?.declarations?.filterIsInstance()?.firstOrNull() } else { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt index 877808de160..2c89368e5f6 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaUtils.kt @@ -149,13 +149,13 @@ private fun buildArgumentMapping( internal fun Iterable.convertAnnotationsToFir( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack -): List = map { it.toFirAnnotationCall(session, javaTypeParameterStack) } +): List = map { it.toFirAnnotationCall(session, javaTypeParameterStack) } internal fun JavaAnnotationOwner.convertAnnotationsToFir( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack -): List = annotations.convertAnnotationsToFir(session, javaTypeParameterStack) +): List = annotations.convertAnnotationsToFir(session, javaTypeParameterStack) -internal fun MutableList.addFromJava( +internal fun MutableList.addFromJava( session: FirSession, javaAnnotationOwner: JavaAnnotationOwner, javaTypeParameterStack: JavaTypeParameterStack @@ -165,8 +165,8 @@ internal fun MutableList.addFromJava( private fun JavaAnnotation.toFirAnnotationCall( session: FirSession, javaTypeParameterStack: JavaTypeParameterStack -): FirAnnotationCall { - return buildAnnotationCall { +): FirAnnotation { + return buildAnnotation { val lookupTag = when (classId) { JAVA_TARGET_CLASS_ID -> ClassId.topLevel(StandardNames.FqNames.target) JAVA_RETENTION_CLASS_ID -> ClassId.topLevel(StandardNames.FqNames.retention) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt index 58670af3b7a..e2b788d18fe 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaClass.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirRegularClassBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider @@ -36,7 +36,7 @@ class FirJavaClass @FirImplementationDetail internal constructor( @Volatile override var resolvePhase: FirResolvePhase, override val name: Name, - override val annotations: MutableList, + override val annotations: MutableList, override var status: FirDeclarationStatus, override val classKind: ClassKind, override val declarations: MutableList, @@ -139,7 +139,7 @@ internal class FirJavaClassBuilder : FirRegularClassBuilder(), FirAnnotationCont override var source: FirSourceElement? = null override var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() override val declarations: MutableList = mutableListOf() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt index 5f9109d8363..d5f65680e00 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaConstructor.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirConstructorBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -35,7 +35,7 @@ class FirJavaConstructor @FirImplementationDetail constructor( override var returnTypeRef: FirTypeRef, override val valueParameters: MutableList, override val typeParameters: MutableList, - annotationBuilder: () -> List, + annotationBuilder: () -> List, override var status: FirDeclarationStatus, @Volatile override var resolvePhase: FirResolvePhase, @@ -61,7 +61,7 @@ class FirJavaConstructor @FirImplementationDetail constructor( override val controlFlowGraphReference: FirControlFlowGraphReference? get() = null - override val annotations: List by lazy { annotationBuilder() } + override val annotations: List by lazy { annotationBuilder() } override fun transformValueParameters(transformer: FirTransformer, data: D): FirJavaConstructor { @@ -150,7 +150,7 @@ class FirJavaConstructorBuilder : FirConstructorBuilder() { lateinit var visibility: Visibility var isInner: Boolean by Delegates.notNull() var isPrimary: Boolean by Delegates.notNull() - lateinit var annotationBuilder: () -> List + lateinit var annotationBuilder: () -> List @OptIn(FirImplementationDetail::class) override fun build(): FirJavaConstructor { diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt index 6bbc43da224..02e7eae4079 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaField.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirFieldBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.languageVersionSettings import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol @@ -41,7 +41,7 @@ class FirJavaField @FirImplementationDetail constructor( override var returnTypeRef: FirTypeRef, override var status: FirDeclarationStatus, override val isVar: Boolean, - annotationBuilder: () -> List, + annotationBuilder: () -> List, override val typeParameters: MutableList, override var initializer: FirExpression?, override val dispatchReceiverType: ConeKotlinType?, @@ -60,7 +60,7 @@ class FirJavaField @FirImplementationDetail constructor( override val origin: FirDeclarationOrigin get() = FirDeclarationOrigin.Java - override val annotations: List by lazy { annotationBuilder() } + override val annotations: List by lazy { annotationBuilder() } override val deprecation: DeprecationsPerUseSite by lazy { annotations.getDeprecationInfosFromAnnotations(moduleData.session.languageVersionSettings.apiVersion, fromJava = true) @@ -160,7 +160,7 @@ internal class FirJavaFieldBuilder : FirFieldBuilder() { var modality: Modality? = null lateinit var visibility: Visibility var isStatic: Boolean by Delegates.notNull() - lateinit var annotationBuilder: () -> List + lateinit var annotationBuilder: () -> List override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt index a64dc59c40b..1a70f16d264 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaMethod.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -59,7 +59,7 @@ class FirJavaMethod @FirImplementationDetail constructor( override val name: Name, override var status: FirDeclarationStatus, override val symbol: FirNamedFunctionSymbol, - annotationBuilder: () -> List, + annotationBuilder: () -> List, override val dispatchReceiverType: ConeKotlinType?, ) : FirSimpleFunction() { init { @@ -83,7 +83,7 @@ class FirJavaMethod @FirImplementationDetail constructor( override var controlFlowGraphReference: FirControlFlowGraphReference? = null - override val annotations: List by lazy { annotationBuilder() } + override val annotations: List by lazy { annotationBuilder() } //not used actually, because get 'enhanced' into regular FirSimpleFunction override var deprecation: DeprecationsPerUseSite? = null @@ -196,11 +196,11 @@ class FirJavaMethodBuilder : FirFunctionBuilder, FirTypeParametersOwnerBuilder, override var dispatchReceiverType: ConeKotlinType? = null lateinit var name: Name lateinit var symbol: FirNamedFunctionSymbol - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() var isStatic: Boolean by Delegates.notNull() override var resolvePhase: FirResolvePhase = FirResolvePhase.ANALYZED_DEPENDENCIES - lateinit var annotationBuilder: () -> List + lateinit var annotationBuilder: () -> List @Deprecated("Modification of 'deprecation' has no impact for FirJavaFunctionBuilder", level = DeprecationLevel.HIDDEN) override var deprecation: DeprecationsPerUseSite? diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt index 64c43d39d59..accd07979ad 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/declarations/FirJavaValueParameter.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -36,7 +36,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( override var returnTypeRef: FirTypeRef, override val name: Name, override val symbol: FirValueParameterSymbol, - annotationBuilder: () -> List, + annotationBuilder: () -> List, override var defaultValue: FirExpression?, override val isVararg: Boolean, ) : FirValueParameter() { @@ -56,7 +56,7 @@ class FirJavaValueParameter @FirImplementationDetail constructor( override val isVar: Boolean get() = false - override val annotations: List by lazy { annotationBuilder() } + override val annotations: List by lazy { annotationBuilder() } override val origin: FirDeclarationOrigin get() = FirDeclarationOrigin.Java @@ -190,7 +190,7 @@ class FirJavaValueParameterBuilder { var attributes: FirDeclarationAttributes = FirDeclarationAttributes() lateinit var returnTypeRef: FirTypeRef lateinit var name: Name - lateinit var annotationBuilder: () -> List + lateinit var annotationBuilder: () -> List var defaultValue: FirExpression? = null var isVararg: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/AnnotationsLoader.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/AnnotationsLoader.kt index 7306d9fe105..93ff52f1162 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/AnnotationsLoader.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/AnnotationsLoader.kt @@ -34,7 +34,7 @@ import org.jetbrains.kotlin.resolve.constants.ClassLiteralValue internal class AnnotationsLoader(private val session: FirSession, private val kotlinClassFinder: KotlinClassFinder) { private fun loadAnnotation( - annotationClassId: ClassId, result: MutableList, + annotationClassId: ClassId, result: MutableList, ): KotlinJvmBinaryClass.AnnotationArgumentVisitor { val lookupTag = ConeClassLikeLookupTagImpl(annotationClassId) @@ -111,7 +111,7 @@ internal class AnnotationsLoader(private val session: FirSession, private val ko } override fun visitAnnotation(classId: ClassId): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { - val list = mutableListOf() + val list = mutableListOf() val visitor = loadAnnotation(classId, list) return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor by visitor { override fun visitEnd() { @@ -132,7 +132,7 @@ internal class AnnotationsLoader(private val session: FirSession, private val ko } override fun visitAnnotation(name: Name, classId: ClassId): KotlinJvmBinaryClass.AnnotationArgumentVisitor { - val list = mutableListOf() + val list = mutableListOf() val visitor = loadAnnotation(classId, list) return object : KotlinJvmBinaryClass.AnnotationArgumentVisitor by visitor { override fun visitEnd() { @@ -148,7 +148,7 @@ internal class AnnotationsLoader(private val session: FirSession, private val ko // resolved, since that class is only generated in the backend, and is not visible to the frontend. if (isRepeatableWithImplicitContainer(lookupTag, argumentMap)) return - result += buildAnnotationCall { + result += buildAnnotation { annotationTypeRef = lookupTag.toDefaultResolvedTypeRef() argumentList = buildArgumentList { for ((name, expression) in argumentMap) { @@ -185,7 +185,7 @@ internal class AnnotationsLoader(private val session: FirSession, private val ko } internal fun loadAnnotationIfNotSpecial( - annotationClassId: ClassId, result: MutableList, + annotationClassId: ClassId, result: MutableList, ): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { if (annotationClassId in SpecialJvmAnnotations.SPECIAL_ANNOTATIONS) return null return loadAnnotation(annotationClassId, result) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt index 6ce9790cdf7..0b6f1406923 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/JvmBinaryAnnotationDeserializer.kt @@ -9,8 +9,8 @@ import org.jetbrains.kotlin.descriptors.SourceElement import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.deserialization.AbstractAnnotationDeserializer -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall -import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation +import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotation import org.jetbrains.kotlin.load.java.JvmAbi import org.jetbrains.kotlin.load.kotlin.KotlinClassFinder import org.jetbrains.kotlin.load.kotlin.KotlinJvmBinaryClass @@ -49,7 +49,7 @@ class JvmBinaryAnnotationDeserializer( } } - override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List { + override fun loadTypeAnnotations(typeProto: ProtoBuf.Type, nameResolver: NameResolver): List { val annotations = typeProto.getExtension(JvmProtoBuf.typeAnnotation).orEmpty() return annotations.map { deserializeAnnotation(it, nameResolver) } } @@ -59,7 +59,7 @@ class JvmBinaryAnnotationDeserializer( constructorProto: ProtoBuf.Constructor, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { val signature = getCallableSignature(constructorProto, nameResolver, typeTable) ?: return emptyList() return findJvmBinaryClassAndLoadMemberAnnotations(signature) } @@ -69,7 +69,7 @@ class JvmBinaryAnnotationDeserializer( functionProto: ProtoBuf.Function, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { val signature = getCallableSignature(functionProto, nameResolver, typeTable) ?: return emptyList() return findJvmBinaryClassAndLoadMemberAnnotations(signature) } @@ -80,7 +80,7 @@ class JvmBinaryAnnotationDeserializer( containingClassProto: ProtoBuf.Class?, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { val signature = getPropertySignature(propertyProto, nameResolver, typeTable, synthetic = true) ?: return emptyList() val classIsInterface = containingClassProto?.let { Flags.CLASS_KIND.get(it.flags) == ProtoBuf.Class.Kind.INTERFACE } ?: false val jvmClassFlags = runIf(containingClassProto?.hasExtension(JvmProtoBuf.jvmClassFlags) == true) { @@ -91,7 +91,7 @@ class JvmBinaryAnnotationDeserializer( signature, searchInDefaultImpls = classIsInterface && allCompatibilityModeIsEnabled ).map { - buildAnnotationCall { + buildAnnotation { annotationTypeRef = it.annotationTypeRef argumentList = it.argumentList useSiteTarget = AnnotationUseSiteTarget.PROPERTY @@ -108,13 +108,13 @@ class JvmBinaryAnnotationDeserializer( propertyProto: ProtoBuf.Property, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { val signature = getPropertySignature(propertyProto, nameResolver, typeTable, field = true) ?: return emptyList() if (signature.isDelegated) { return emptyList() } return findJvmBinaryClassAndLoadMemberAnnotations(signature).map { - buildAnnotationCall { + buildAnnotation { annotationTypeRef = it.annotationTypeRef argumentList = it.argumentList useSiteTarget = AnnotationUseSiteTarget.FIELD @@ -128,13 +128,13 @@ class JvmBinaryAnnotationDeserializer( propertyProto: ProtoBuf.Property, nameResolver: NameResolver, typeTable: TypeTable - ): List { + ): List { val signature = getPropertySignature(propertyProto, nameResolver, typeTable, field = true) ?: return emptyList() if (!signature.isDelegated) { return emptyList() } return findJvmBinaryClassAndLoadMemberAnnotations(signature).map { - buildAnnotationCall { + buildAnnotation { annotationTypeRef = it.annotationTypeRef argumentList = it.argumentList useSiteTarget = AnnotationUseSiteTarget.PROPERTY_DELEGATE_FIELD @@ -149,7 +149,7 @@ class JvmBinaryAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, getterFlags: Int - ): List { + ): List { val signature = getCallableSignature(propertyProto, nameResolver, typeTable, CallableKind.PROPERTY_GETTER) ?: return emptyList() return findJvmBinaryClassAndLoadMemberAnnotations(signature) } @@ -160,7 +160,7 @@ class JvmBinaryAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, setterFlags: Int - ): List { + ): List { val signature = getCallableSignature(propertyProto, nameResolver, typeTable, CallableKind.PROPERTY_SETTER) ?: return emptyList() return findJvmBinaryClassAndLoadMemberAnnotations(signature) } @@ -174,7 +174,7 @@ class JvmBinaryAnnotationDeserializer( typeTable: TypeTable, kind: CallableKind, parameterIndex: Int, - ): List { + ): List { val methodSignature = getCallableSignature(callableProto, nameResolver, typeTable, kind) ?: return emptyList() val index = parameterIndex + computeJvmParameterIndexShift(classProto, callableProto) val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, index) @@ -187,7 +187,7 @@ class JvmBinaryAnnotationDeserializer( nameResolver: NameResolver, typeTable: TypeTable, kind: CallableKind - ): List { + ): List { val methodSignature = getCallableSignature(callableProto, nameResolver, typeTable, kind) ?: return emptyList() val paramSignature = MemberSignature.fromMethodSignatureAndParameterIndex(methodSignature, 0) return findJvmBinaryClassAndLoadMemberAnnotations(paramSignature) @@ -274,7 +274,7 @@ class JvmBinaryAnnotationDeserializer( private fun findJvmBinaryClassAndLoadMemberAnnotations( memberSignature: MemberSignature, searchInDefaultImpls: Boolean = false - ): List { + ): List { val info = if (searchInDefaultImpls) { annotationInfoForDefaultImpls ?: return emptyList() } else { @@ -285,7 +285,7 @@ class JvmBinaryAnnotationDeserializer( } // TODO: Rename this once property constants are recorded as well -private data class MemberAnnotations(val memberAnnotations: MutableMap>) +private data class MemberAnnotations(val memberAnnotations: MutableMap>) // TODO: better to be in KotlinDeserializedJvmSymbolsProvider? private fun FirSession.loadMemberAnnotations( @@ -293,7 +293,7 @@ private fun FirSession.loadMemberAnnotations( byteContent: ByteArray?, kotlinClassFinder: KotlinClassFinder, ): MemberAnnotations { - val memberAnnotations = hashMapOf>() + val memberAnnotations = hashMapOf>() val annotationsLoader = AnnotationsLoader(this, kotlinClassFinder) kotlinBinaryClass.visitMembers(object : KotlinJvmBinaryClass.MemberVisitor { @@ -328,7 +328,7 @@ private fun FirSession.loadMemberAnnotations( } open inner class MemberAnnotationVisitor(protected val signature: MemberSignature) : KotlinJvmBinaryClass.AnnotationVisitor { - private val result = arrayListOf() + private val result = arrayListOf() override fun visitAnnotation(classId: ClassId, source: SourceElement): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { return annotationsLoader.loadAnnotationIfNotSpecial(classId, result) diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt index c98dc5d0b4e..8e51adcc2c5 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/deserialization/KotlinDeserializedJvmSymbolsProvider.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.caches.firCachesFactory import org.jetbrains.kotlin.fir.caches.getValue import org.jetbrains.kotlin.fir.declarations.getDeprecationInfos import org.jetbrains.kotlin.fir.deserialization.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.java.JavaSymbolProvider import org.jetbrains.kotlin.fir.java.topLevelName import org.jetbrains.kotlin.fir.languageVersionSettings @@ -125,7 +125,7 @@ open class KotlinDeserializedJvmSymbolsProvider( kotlinClass: KotlinClassFinder.Result.KotlinClass, symbol: FirRegularClassSymbol ) { - val annotations = mutableListOf() + val annotations = mutableListOf() kotlinClass.kotlinJvmBinaryClass.loadClassAnnotations( object : KotlinJvmBinaryClass.AnnotationVisitor { override fun visitAnnotation(classId: ClassId, source: SourceElement): KotlinJvmBinaryClass.AnnotationArgumentVisitor? { @@ -137,7 +137,7 @@ open class KotlinDeserializedJvmSymbolsProvider( }, kotlinClass.byteContent, ) - (symbol.fir.annotations as MutableList) += annotations + (symbol.fir.annotations as MutableList) += annotations symbol.fir.replaceDeprecation(symbol.fir.getDeprecationInfos(session.languageVersionSettings.apiVersion)) } diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt index 3f48573665d..1af9f85bf29 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/FirAnnotationTypeQualifierResolver.kt @@ -25,18 +25,18 @@ class FirAnnotationTypeQualifierResolver( private val session: FirSession, javaTypeEnhancementState: JavaTypeEnhancementState, private val javaModuleAnnotationsProvider: JavaModuleAnnotationsProvider, -) : AbstractAnnotationTypeQualifierResolver(javaTypeEnhancementState), FirSessionComponent { +) : AbstractAnnotationTypeQualifierResolver(javaTypeEnhancementState), FirSessionComponent { - override val FirAnnotationCall.metaAnnotations: Iterable + override val FirAnnotation.metaAnnotations: Iterable get() = coneClassLikeType?.lookupTag?.toSymbol(session)?.fir?.annotations.orEmpty() - override val FirAnnotationCall.key: Any + override val FirAnnotation.key: Any get() = coneClassLikeType!!.lookupTag - override val FirAnnotationCall.fqName: FqName? + override val FirAnnotation.fqName: FqName? get() = coneClassLikeType?.lookupTag?.classId?.asSingleFqName() - override fun FirAnnotationCall.enumArguments(onlyValue: Boolean): Iterable = + override fun FirAnnotation.enumArguments(onlyValue: Boolean): Iterable = arguments.flatMap { argument -> if (!onlyValue || argument !is FirNamedArgumentExpression || argument.name == DEFAULT_ANNOTATION_MEMBER_NAME) argument.toEnumNames() diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt index 1cd9dd6faf3..2622b9dfc1e 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/enhancement/SignatureEnhancement.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.utils.isInner import org.jetbrains.kotlin.fir.declarations.utils.isStatic import org.jetbrains.kotlin.fir.declarations.utils.modality import org.jetbrains.kotlin.fir.declarations.utils.visibility -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.java.FirJavaTypeConversionMode import org.jetbrains.kotlin.fir.java.JavaTypeParameterStack import org.jetbrains.kotlin.fir.java.declarations.* @@ -504,14 +504,14 @@ private class EnhancementSignatureParts( override val forceOnlyHeadTypeConstructor: Boolean, override val containerApplicabilityType: AnnotationQualifierApplicabilityType, override val containerDefaultTypeQualifiers: JavaTypeQualifiersByElementType? -) : AbstractSignatureParts() { +) : AbstractSignatureParts() { override val enableImprovementsInStrictMode: Boolean get() = true override val skipRawTypeArguments: Boolean get() = false - override val containerAnnotations: Iterable + override val containerAnnotations: Iterable get() = typeContainer?.annotations ?: emptyList() override val containerIsVarargParameter: Boolean @@ -520,10 +520,10 @@ private class EnhancementSignatureParts( override val typeSystem: TypeSystemContext get() = session.typeContext - override val FirAnnotationCall.forceWarning: Boolean + override val FirAnnotation.forceWarning: Boolean get() = false // TODO: force warnings on IDEA external annotations - override val KotlinTypeMarker.annotations: Iterable + override val KotlinTypeMarker.annotations: Iterable get() = (this as ConeKotlinType).attributes.customAnnotations override val KotlinTypeMarker.fqNameUnsafe: FqNameUnsafe? diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt index d6d8a9969b5..6a3733c0364 100644 --- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt +++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/types/jvm/FirJavaTypeRef.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types.jvm import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirUserTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.load.java.structure.JavaType class FirJavaTypeRef( val type: JavaType, - annotationBuilder: () -> List, + annotationBuilder: () -> List, override val qualifier: MutableList ) : FirUserTypeRef() { override val customRenderer: Boolean @@ -33,7 +33,7 @@ class FirJavaTypeRef( override val source: FirSourceElement? get() = null - override val annotations: List by lazy { annotationBuilder() } + override val annotations: List by lazy { annotationBuilder() } override fun acceptChildren(visitor: FirVisitor, data: D) { for (part in qualifier) { @@ -60,7 +60,7 @@ class FirJavaTypeRef( @FirBuilderDsl class FirJavaTypeRefBuilder { - lateinit var annotationBuilder: () -> List + lateinit var annotationBuilder: () -> List lateinit var type: JavaType val qualifier: MutableList = mutableListOf() diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt index bef9cfd538e..c445bc191c9 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/DeclarationsConverter.kt @@ -85,7 +85,7 @@ class DeclarationsConverter( throw Exception() } - val fileAnnotationList = mutableListOf() + val fileAnnotationList = mutableListOf() val importList = mutableListOf() val firDeclarationList = mutableListOf() context.packageFqName = FqName.ROOT @@ -287,7 +287,7 @@ class DeclarationsConverter( /** * [org.jetbrains.kotlin.parsing.KotlinParsing.parseFileAnnotationList] */ - private fun convertFileAnnotationList(fileAnnotationList: LighterASTNode): List { + private fun convertFileAnnotationList(fileAnnotationList: LighterASTNode): List { return fileAnnotationList.forEachChildrenReturnList { node, container -> when (node.tokenType) { ANNOTATION -> container += convertAnnotation(node) @@ -299,7 +299,7 @@ class DeclarationsConverter( /** * @see org.jetbrains.kotlin.parsing.KotlinParsing.parseAnnotationOrList */ - fun convertAnnotation(annotationNode: LighterASTNode): List { + fun convertAnnotation(annotationNode: LighterASTNode): List { var annotationTarget: AnnotationUseSiteTarget? = null return annotationNode.forEachChildrenReturnList { node, container -> when (node.tokenType) { @@ -338,7 +338,7 @@ class DeclarationsConverter( fun convertAnnotationEntry( unescapedAnnotation: LighterASTNode, defaultAnnotationUseSiteTarget: AnnotationUseSiteTarget? = null - ): FirAnnotationCall { + ): FirAnnotation { var annotationUseSiteTarget: AnnotationUseSiteTarget? = null lateinit var constructorCalleePair: Pair> unescapedAnnotation.forEachChildren { @@ -348,7 +348,7 @@ class DeclarationsConverter( } } val name = (constructorCalleePair.first as? FirUserTypeRef)?.qualifier?.last()?.name ?: Name.special("") - return buildAnnotationCall { + return buildAnnotation { source = unescapedAnnotation.toFirSourceElement() useSiteTarget = annotationUseSiteTarget ?: defaultAnnotationUseSiteTarget annotationTypeRef = constructorCalleePair.first @@ -1775,7 +1775,7 @@ class DeclarationsConverter( lateinit var identifier: String lateinit var firType: FirTypeRef lateinit var referenceExpression: LighterASTNode - val annotations = mutableListOf() + val annotations = mutableListOf() typeConstraint.forEachChildren { when (it.tokenType) { //annotations will be saved later, on mapping stage with type parameters @@ -1890,7 +1890,7 @@ class DeclarationsConverter( } for (modifierList in allTypeModifiers) { - (calculatedFirType.annotations as MutableList) += modifierList.annotations + (calculatedFirType.annotations as MutableList) += modifierList.annotations } return calculatedFirType } @@ -2116,7 +2116,7 @@ class DeclarationsConverter( return ValueParameter(isVal, isVar, modifiers, firValueParameter, destructuringDeclaration) } - private val extensionFunctionAnnotation = buildAnnotationCall { + private val extensionFunctionAnnotation = buildAnnotation { annotationTypeRef = buildResolvedTypeRef { type = ConeClassLikeTypeImpl( ConeClassLikeLookupTagImpl(EXTENSION_FUNCTION_ANNOTATION), diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt index c20aa6f83b1..7dfb410a29f 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/converter/ExpressionsConverter.kt @@ -421,7 +421,7 @@ class ExpressionsConverter( */ private fun convertAnnotatedExpression(annotatedExpression: LighterASTNode): FirElement { var firExpression: FirElement? = null - val firAnnotationList = mutableListOf() + val firAnnotationList = mutableListOf() annotatedExpression.forEachChildren { when (it.tokenType) { ANNOTATION -> firAnnotationList += declarationsConverter.convertAnnotation(it) @@ -432,7 +432,7 @@ class ExpressionsConverter( val result = firExpression ?: buildErrorExpression(null, ConeNotAnnotationContainer(firExpression?.render() ?: "???")) require(result is FirAnnotationContainer) - (result.annotations as MutableList) += firAnnotationList + (result.annotations as MutableList) += firAnnotationList return result } diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt index b6dfc3e20ce..f0dfd7e33c5 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/TypeConstraint.kt @@ -6,11 +6,11 @@ package org.jetbrains.kotlin.fir.lightTree.fir import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirTypeRef class TypeConstraint( - val annotations: List, + val annotations: List, val identifier: String, val firTypeRef: FirTypeRef, val source: FirSourceElement diff --git a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt index b614d7653f1..f0d7f3e17ca 100644 --- a/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt +++ b/compiler/fir/raw-fir/light-tree2fir/src/org/jetbrains/kotlin/fir/lightTree/fir/modifier/Modifier.kt @@ -9,12 +9,12 @@ import com.intellij.lang.LighterASTNode import org.jetbrains.kotlin.descriptors.Modality import org.jetbrains.kotlin.descriptors.Visibilities import org.jetbrains.kotlin.descriptors.Visibility -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.lexer.KtTokens import org.jetbrains.kotlin.types.Variance open class Modifier(var modifiers: Long = ModifierFlag.NONE.value) { - val annotations: MutableList = mutableListOf() + val annotations: MutableList = mutableListOf() fun addModifier(modifier: LighterASTNode, isInClass: Boolean = false) { when (val tokenType = modifier.tokenType) { diff --git a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt index 3f7372ab629..3c7edd3860a 100644 --- a/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt +++ b/compiler/fir/raw-fir/psi2fir/src/org/jetbrains/kotlin/fir/builder/RawFirBuilder.kt @@ -594,9 +594,9 @@ open class RawFirBuilder( annotated.extractAnnotationsTo(this.annotations) } - private fun KtAnnotated.extractAnnotationsTo(container: MutableList) { + private fun KtAnnotated.extractAnnotationsTo(container: MutableList) { for (annotationEntry in annotationEntries) { - container += annotationEntry.convert() + container += annotationEntry.convert() } } @@ -864,7 +864,7 @@ open class RawFirBuilder( source = file.packageDirective?.toFirPsiSourceElement() } for (annotationEntry in file.annotationEntries) { - annotations += annotationEntry.convert() + annotations += annotationEntry.convert() } for (importDirective in file.importDirectives) { imports += buildImport { @@ -1682,14 +1682,14 @@ open class RawFirBuilder( for (modifierList in allModifierLists) { for (annotationEntry in modifierList.annotationEntries) { - firTypeBuilder.annotations += annotationEntry.convert() + firTypeBuilder.annotations += annotationEntry.convert() } } return firTypeBuilder.build() } override fun visitAnnotationEntry(annotationEntry: KtAnnotationEntry, data: Unit): FirElement { - return buildAnnotationCall { + return buildAnnotation { source = annotationEntry.toFirSourceElement() useSiteTarget = annotationEntry.useSiteTarget?.getAnnotationUseSiteTarget() annotationTypeRef = annotationEntry.typeReference.toFirOrErrorType() @@ -2354,7 +2354,7 @@ open class RawFirBuilder( expression.toFirSourceElement(), ConeNotAnnotationContainer(rawResult?.render() ?: "???") ) - expression.extractAnnotationsTo(result.annotations as MutableList) + expression.extractAnnotationsTo(result.annotations as MutableList) return result } @@ -2418,7 +2418,7 @@ open class RawFirBuilder( } } - private val extensionFunctionAnnotation = buildAnnotationCall { + private val extensionFunctionAnnotation = buildAnnotation { annotationTypeRef = buildResolvedTypeRef { type = ConeClassLikeTypeImpl( ConeClassLikeLookupTagImpl(EXTENSION_FUNCTION_ANNOTATION), diff --git a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt index 21b0e14797b..7712a0a7400 100644 --- a/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt +++ b/compiler/fir/raw-fir/psi2fir/tests/org/jetbrains/kotlin/fir/builder/AbstractRawFirBuilderTestCase.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirStubStatement @@ -183,7 +183,7 @@ abstract class AbstractRawFirBuilderTestCase : KtParsingTestCase( private fun throwTwiceVisitingError(element: FirElement) { if (element is FirTypeRef || element is FirNoReceiverExpression || element is FirTypeParameter || - element is FirTypeProjection || element is FirValueParameter || element is FirAnnotationCall || + element is FirTypeProjection || element is FirValueParameter || element is FirAnnotation || element is FirEmptyContractDescription || element is FirStubReference || element.isExtensionFunctionAnnotation || element is FirEmptyArgumentList || element is FirStubStatement || element === FirResolvedDeclarationStatusImpl.DEFAULT_STATUS_FOR_STATUSLESS_DECLARATIONS @@ -196,4 +196,4 @@ private fun throwTwiceVisitingError(element: FirElement) { private val FirElement.isExtensionFunctionAnnotation: Boolean - get() = (this as? FirAnnotationCall)?.isExtensionFunctionAnnotationCall == true + get() = (this as? FirAnnotation)?.isExtensionFunctionAnnotationCall == true diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt index 05939505b70..12e2deabcee 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/CopyUtils.kt @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef import org.jetbrains.kotlin.fir.types.builder.buildResolvedTypeRef fun FirFunctionCall.copy( - annotations: List = this.annotations, + annotations: List = this.annotations, argumentList: FirArgumentList = this.argumentList, calleeReference: FirNamedReference = this.calleeReference, explicitReceiver: FirExpression? = this.explicitReceiver, @@ -85,7 +85,7 @@ fun FirAnonymousFunction.copy( returnTypeRef: FirTypeRef = this.returnTypeRef, valueParameters: List = this.valueParameters, body: FirBlock? = this.body, - annotations: List = this.annotations, + annotations: List = this.annotations, typeRef: FirTypeRef = this.typeRef, label: FirLabel? = this.label, controlFlowGraphReference: FirControlFlowGraphReference? = this.controlFlowGraphReference, @@ -137,7 +137,7 @@ fun FirTypeRef.errorTypeFromPrototype( fun FirTypeParameter.copy( bounds: List = this.bounds, - annotations: List = this.annotations + annotations: List = this.annotations ): FirTypeParameter { return buildTypeParameter { source = this@copy.source @@ -155,7 +155,7 @@ fun FirTypeParameter.copy( fun FirWhenExpression.copy( resultType: FirTypeRef = this.typeRef, calleeReference: FirReference = this.calleeReference, - annotations: List = this.annotations + annotations: List = this.annotations ): FirWhenExpression = buildWhenExpression { source = this@copy.source subject = this@copy.subject @@ -171,7 +171,7 @@ fun FirWhenExpression.copy( fun FirTryExpression.copy( resultType: FirTypeRef = this.typeRef, calleeReference: FirReference = this.calleeReference, - annotations: List = this.annotations + annotations: List = this.annotations ): FirTryExpression = buildTryExpression { source = this@copy.source tryBlock = this@copy.tryBlock @@ -185,7 +185,7 @@ fun FirTryExpression.copy( fun FirCheckNotNullCall.copy( resultType: FirTypeRef = this.typeRef, calleeReference: FirReference = this.calleeReference, - annotations: List = this.annotations + annotations: List = this.annotations ): FirCheckNotNullCall = buildCheckNotNullCall { source = this@copy.source this.calleeReference = calleeReference diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt index a009ac09ac5..04e75e52066 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/FirCallResolver.kt @@ -489,16 +489,16 @@ class FirCallResolver( } } - fun resolveAnnotationCall(annotationCall: FirAnnotationCall): FirAnnotationCall? { - val reference = annotationCall.calleeReference as? FirSimpleNamedReference ?: return null - annotationCall.argumentList.transformArguments(transformer, ResolutionMode.ContextDependent) + fun resolveAnnotationCall(annotation: FirAnnotation): FirAnnotation? { + val reference = annotation.calleeReference as? FirSimpleNamedReference ?: return null + annotation.argumentList.transformArguments(transformer, ResolutionMode.ContextDependent) val callInfo = CallInfo( - annotationCall, + annotation, CallKind.Function, name = reference.name, explicitReceiver = null, - annotationCall.argumentList, + annotation.argumentList, isPotentialQualifierPart = false, isImplicitInvoke = false, typeArguments = emptyList(), @@ -507,7 +507,7 @@ class FirCallResolver( components.containingDeclarations ) - val annotationClassSymbol = annotationCall.getCorrespondingClassSymbolOrNull(session) + val annotationClassSymbol = annotation.getCorrespondingClassSymbolOrNull(session) val resolvedReference = if (annotationClassSymbol != null && annotationClassSymbol.fir.classKind == ClassKind.ANNOTATION_CLASS) { val resolutionResult = createCandidateForAnnotationCall(annotationClassSymbol, callInfo) ?: ResolutionResult(callInfo, CandidateApplicability.HIDDEN, emptyList()) @@ -529,7 +529,7 @@ class FirCallResolver( ) } - return annotationCall.transformCalleeReference(StoreNameReference, resolvedReference) + return annotation.transformCalleeReference(StoreNameReference, resolvedReference) } private fun createCandidateForAnnotationCall( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/FirAnnotationUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/FirAnnotationUtils.kt index 9663473e353..dc98c711fbf 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/FirAnnotationUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/FirAnnotationUtils.kt @@ -26,14 +26,14 @@ private val RETENTION_CLASS_ID = ClassId.fromString("kotlin/annotation/Retention private val TARGET_CLASS_ID = ClassId.fromString("kotlin/annotation/Target") private val JVM_FIELD_CLASS_ID = ClassId.fromString("kotlin/jvm/JvmField") -private fun FirAnnotationCall.toAnnotationLookupTag(): ConeClassLikeLookupTag? = +private fun FirAnnotation.toAnnotationLookupTag(): ConeClassLikeLookupTag? = // this cast fails when we have generic-typed annotations @T (annotationTypeRef.coneType as? ConeClassLikeType)?.lookupTag -fun FirAnnotationCall.toAnnotationClassId(): ClassId? = +fun FirAnnotation.toAnnotationClassId(): ClassId? = toAnnotationLookupTag()?.classId -private fun FirAnnotationCall.toAnnotationClass(session: FirSession): FirRegularClass? = +private fun FirAnnotation.toAnnotationClass(session: FirSession): FirRegularClass? = toAnnotationLookupTag()?.toSymbol(session)?.fir as? FirRegularClass // TODO: this is temporary solution, we need something better @@ -44,7 +44,7 @@ private val FirExpression.callableNameOfMetaAnnotationArgument: Name? callableSymbol?.callableId?.callableName } -fun FirAnnotationContainer.nonSourceAnnotations(session: FirSession): List = +fun FirAnnotationContainer.nonSourceAnnotations(session: FirSession): List = annotations.filter { annotation -> val firAnnotationClass = annotation.toAnnotationClass(session) firAnnotationClass != null && firAnnotationClass.annotations.none { meta -> @@ -56,10 +56,10 @@ fun FirAnnotationContainer.nonSourceAnnotations(session: FirSession): List = +fun FirAnnotation.useSiteTargetsFromMetaAnnotation(session: FirSession): Set = toAnnotationClass(session)?.annotations?.find { it.toAnnotationClassId() == TARGET_CLASS_ID }?.argumentList?.arguments ?.toAnnotationUseSiteTargets() ?: DEFAULT_USE_SITE_TARGETS @@ -94,35 +94,35 @@ fun FirAnnotatedDeclaration.hasAnnotation(classId: ClassId): Boolean { return annotations.any { it.toAnnotationClassId() == classId } } -fun FirBasedSymbol.getAnnotationByFqName(fqName: FqName): FirAnnotationCall? where D : FirAnnotationContainer, D : FirDeclaration { +fun FirBasedSymbol.getAnnotationByFqName(fqName: FqName): FirAnnotation? where D : FirAnnotationContainer, D : FirDeclaration { return fir.getAnnotationByFqName(fqName) } -fun FirBasedSymbol.getAnnotationByClassId(classId: ClassId): FirAnnotationCall? where D : FirAnnotationContainer, D : FirDeclaration { +fun FirBasedSymbol.getAnnotationByClassId(classId: ClassId): FirAnnotation? where D : FirAnnotationContainer, D : FirDeclaration { return fir.getAnnotationByClassId(classId) } -fun FirAnnotationContainer.getAnnotationByFqName(fqName: FqName): FirAnnotationCall? { +fun FirAnnotationContainer.getAnnotationByFqName(fqName: FqName): FirAnnotation? { return annotations.find { it.annotationTypeRef.coneTypeSafe()?.lookupTag?.classId?.asSingleFqName() == fqName } } -fun FirAnnotationContainer.getAnnotationByClassId(classId: ClassId): FirAnnotationCall? { +fun FirAnnotationContainer.getAnnotationByClassId(classId: ClassId): FirAnnotation? { return annotations.find { it.annotationTypeRef.coneTypeSafe()?.lookupTag?.classId == classId } } -fun FirAnnotationContainer.getAnnotationsByFqName(fqName: FqName): List = annotations.getAnnotationsByFqName(fqName) +fun FirAnnotationContainer.getAnnotationsByFqName(fqName: FqName): List = annotations.getAnnotationsByFqName(fqName) -fun List.getAnnotationsByFqName(fqName: FqName): List { +fun List.getAnnotationsByFqName(fqName: FqName): List { return filter { it.annotationTypeRef.coneTypeSafe()?.lookupTag?.classId?.asSingleFqName() == fqName } } -fun FirAnnotationCall.findArgumentByName(name: Name): FirExpression? { +fun FirAnnotation.findArgumentByName(name: Name): FirExpression? { val argumentMapping = argumentMapping if (argumentMapping != null) { return argumentMapping.keys.find { argumentMapping[it]?.name == name }?.unwrapArgument() @@ -138,7 +138,7 @@ fun FirAnnotationCall.findArgumentByName(name: Name): FirExpression? { return arguments.singleOrNull() } -fun FirAnnotationCall.getStringArgument(name: Name): String? = +fun FirAnnotation.getStringArgument(name: Name): String? = findArgumentByName(name)?.let { expression -> expression.safeAs>()?.value as? String } @@ -151,4 +151,4 @@ fun FirAnnotationContainer.getJvmNameFromAnnotation(target: AnnotationUseSiteTar return annotationCalls.firstNotNullOfOrNull { call -> call.getStringArgument(name)?.takeIf { target == null || call.useSiteTarget == target } } -} \ No newline at end of file +} diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/GeneratedDeclarationValidation.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/GeneratedDeclarationValidation.kt index e0f34ee6541..38083928392 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/GeneratedDeclarationValidation.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/GeneratedDeclarationValidation.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolveStatus import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedArgumentList @@ -30,9 +30,9 @@ object FirGeneratedElementsValidator : FirDefaultVisitor() { element.acceptChildren(this, null) } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: Any?) { - require(annotationCall.resolveStatus == FirAnnotationResolveStatus.Resolved) - annotationCall.acceptChildren(this, null) + override fun visitAnnotation(annotation: FirAnnotation, data: Any?) { + require(annotation.resolveStatus == FirAnnotationResolveStatus.Resolved) + annotation.acceptChildren(this, null) } override fun visitRegularClass(regularClass: FirRegularClass, data: Any?) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt index 7a488a9a548..236f123ce1b 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/declarations/deprecationUtils.kt @@ -77,7 +77,7 @@ fun getDeprecationsFromAccessors( return if (perUseSite.isEmpty()) EmptyDeprecationsPerUseSite else DeprecationsPerUseSite(null, perUseSite) } -fun List.getDeprecationInfosFromAnnotations(currentVersion: ApiVersion, fromJava: Boolean): DeprecationsPerUseSite { +fun List.getDeprecationInfosFromAnnotations(currentVersion: ApiVersion, fromJava: Boolean): DeprecationsPerUseSite { val deprecationByUseSite = extractDeprecationInfoPerUseSite(currentVersion, fromJava).toMap() return DeprecationsPerUseSite.fromMap(deprecationByUseSite) } @@ -93,10 +93,10 @@ fun FirBasedSymbol<*>.getDeprecationForCallSite( return (deprecations ?: EmptyDeprecationsPerUseSite).forUseSite(*sites) } -private fun FirAnnotationCall.getVersionFromArgument(name: Name): ApiVersion? = +private fun FirAnnotation.getVersionFromArgument(name: Name): ApiVersion? = getStringArgument(name)?.let { ApiVersion.parse(it) } -private fun FirAnnotationCall.getDeprecationLevel(): DeprecationLevelValue? { +private fun FirAnnotation.getDeprecationLevel(): DeprecationLevelValue? { //take last because Annotation might be not resolved yet and arguments passed without explicit names val arg = findArgumentByName(LEVEL_NAME) ?: arguments.lastOrNull() return arg?.let { argument -> @@ -106,7 +106,7 @@ private fun FirAnnotationCall.getDeprecationLevel(): DeprecationLevelValue? { } } -private fun List.extractDeprecationInfoPerUseSite( +private fun List.extractDeprecationInfoPerUseSite( currentVersion: ApiVersion, fromJava: Boolean ): List> { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt index d0132a33d6e..0529dab9533 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/ResolveUtils.kt @@ -366,7 +366,7 @@ fun CallableId.isIteratorHasNext(): Boolean = fun CallableId.isIterator(): Boolean = callableName.asString() == "iterator" && packageName.asString() in arrayOf("kotlin.collections", "kotlin.ranges") -fun FirAnnotationCall.fqName(session: FirSession): FqName? { +fun FirAnnotation.fqName(session: FirSession): FqName? { val symbol = session.symbolProvider.getSymbolByTypeRef(annotationTypeRef) ?: return null return symbol.classId.asSingleFqName() } @@ -419,7 +419,7 @@ private fun FirQualifiedAccess.expressionTypeOrUnitForAssignment(): ConeKotlinTy return StandardClassIds.Unit.constructClassLikeType(emptyArray(), isNullable = false) } -fun FirAnnotationCall.getCorrespondingClassSymbolOrNull(session: FirSession): FirRegularClassSymbol? { +fun FirAnnotation.getCorrespondingClassSymbolOrNull(session: FirSession): FirRegularClassSymbol? { return annotationTypeRef.coneType.fullyExpandedType(session).classId?.let { if (it.isLocal) { // TODO: How to retrieve local annotaiton's constructor? diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt index 1f65cf4cfa1..ff9088bd877 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/calls/CallableReferenceResolution.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.resolve.calls import org.jetbrains.kotlin.fir.* import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isSuspend -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier @@ -365,7 +365,7 @@ class FirFakeArgumentForCallableReference( override val typeRef: FirTypeRef get() = error("should not be called") - override val annotations: List + override val annotations: List get() = error("should not be called") override fun replaceTypeRef(newTypeRef: FirTypeRef) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt index ca8ea54ca09..7a69f64904c 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/FirDataFlowAnalyzer.kt @@ -1267,12 +1267,12 @@ abstract class FirDataFlowAnalyzer( // ----------------------------------- Annotations ----------------------------------- - fun enterAnnotationCall(annotationCall: FirAnnotationCall) { - graphBuilder.enterAnnotationCall(annotationCall).mergeIncomingFlow() + fun enterAnnotationCall(annotation: FirAnnotation) { + graphBuilder.enterAnnotationCall(annotation).mergeIncomingFlow() } - fun exitAnnotationCall(annotationCall: FirAnnotationCall) { - graphBuilder.exitAnnotationCall(annotationCall).mergeIncomingFlow() + fun exitAnnotationCall(annotation: FirAnnotation) { + graphBuilder.exitAnnotationCall(annotation).mergeIncomingFlow() } // ----------------------------------- Init block ----------------------------------- diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt index 95605d65521..2dcc6d524fc 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/CFGNode.kt @@ -734,7 +734,7 @@ class ElvisExitNode(owner: ControlFlowGraph, override val fir: FirElvisExpressio // ----------------------------------- Other ----------------------------------- -class AnnotationEnterNode(owner: ControlFlowGraph, override val fir: FirAnnotationCall, level: Int, id: Int) : CFGNode(owner, level, id), EnterNodeMarker { +class AnnotationEnterNode(owner: ControlFlowGraph, override val fir: FirAnnotation, level: Int, id: Int) : CFGNode(owner, level, id), EnterNodeMarker { init { owner.enterNode = this } @@ -743,7 +743,7 @@ class AnnotationEnterNode(owner: ControlFlowGraph, override val fir: FirAnnotati return visitor.visitAnnotationEnterNode(this, data) } } -class AnnotationExitNode(owner: ControlFlowGraph, override val fir: FirAnnotationCall, level: Int, id: Int) : CFGNode(owner, level, id), ExitNodeMarker { +class AnnotationExitNode(owner: ControlFlowGraph, override val fir: FirAnnotation, level: Int, id: Int) : CFGNode(owner, level, id), ExitNodeMarker { init { owner.exitNode = this } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt index a0c3e7d3831..e7c93099b98 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphBuilder.kt @@ -1177,16 +1177,16 @@ class ControlFlowGraphBuilder { // ----------------------------------- Annotations ----------------------------------- - fun enterAnnotationCall(annotationCall: FirAnnotationCall): AnnotationEnterNode { + fun enterAnnotationCall(annotation: FirAnnotation): AnnotationEnterNode { val graph = ControlFlowGraph(null, "STUB_GRAPH_FOR_ANNOTATION_CALL", ControlFlowGraph.Kind.AnnotationCall) pushGraph(graph, Mode.Body) - return createAnnotationEnterNode(annotationCall).also { + return createAnnotationEnterNode(annotation).also { lastNodes.push(it) } } - fun exitAnnotationCall(annotationCall: FirAnnotationCall): AnnotationExitNode { - val node = createAnnotationExitNode(annotationCall) + fun exitAnnotationCall(annotation: FirAnnotation): AnnotationExitNode { + val node = createAnnotationExitNode(annotation) popAndAddEdge(node) popGraph() return node diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt index 1c685183db9..34eb5e6c0db 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/dfa/cfg/ControlFlowGraphNodeBuilder.kt @@ -140,10 +140,10 @@ fun ControlFlowGraphBuilder.createStringConcatenationCallNode(fir: FirStringConc fun ControlFlowGraphBuilder.createVariableAssignmentNode(fir: FirVariableAssignment): VariableAssignmentNode = VariableAssignmentNode(currentGraph, fir, levelCounter, createId()) -fun ControlFlowGraphBuilder.createAnnotationExitNode(fir: FirAnnotationCall): AnnotationExitNode = +fun ControlFlowGraphBuilder.createAnnotationExitNode(fir: FirAnnotation): AnnotationExitNode = AnnotationExitNode(currentGraph, fir, levelCounter, createId()) -fun ControlFlowGraphBuilder.createAnnotationEnterNode(fir: FirAnnotationCall): AnnotationEnterNode = +fun ControlFlowGraphBuilder.createAnnotationEnterNode(fir: FirAnnotation): AnnotationEnterNode = AnnotationEnterNode(currentGraph, fir, levelCounter, createId()) fun ControlFlowGraphBuilder.createElvisLhsIsNotNullNode(fir: FirElvisExpression): ElvisLhsIsNotNullNode = diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt index 943f3fa5ad3..01df78299a3 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/inference/ConstraintSystemCompleter.kt @@ -467,7 +467,7 @@ fun FirStatement.processAllContainingCallCandidates(processBlocks: Boolean, proc rhs.processAllContainingCallCandidates(processBlocks, processor) } - is FirAnnotationCall -> { + is FirAnnotation -> { processCandidateIfApplicable(processor, processBlocks) arguments.forEach { it.processAllContainingCallCandidates(processBlocks, processor) } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt index e11a2dcfe71..97a4e106cde 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirCallCompletionResultsWriterTransformer.kt @@ -257,40 +257,40 @@ class FirCallCompletionResultsWriterTransformer( return constructor.returnTypeRef.coneType.isArrayOrPrimitiveArray } - override fun transformAnnotationCall( - annotationCall: FirAnnotationCall, + override fun transformAnnotation( + annotation: FirAnnotation, data: ExpectedArgumentType? ): FirStatement { - val calleeReference = annotationCall.calleeReference as? FirNamedReferenceWithCandidate - ?: return annotationCall - annotationCall.transformCalleeReference( + val calleeReference = annotation.calleeReference as? FirNamedReferenceWithCandidate + ?: return annotation + annotation.transformCalleeReference( StoreCalleeReference, calleeReference.toResolvedReference(), ) val subCandidate = calleeReference.candidate val expectedArgumentsTypeMapping = runIf(!calleeReference.isError) { subCandidate.createArgumentsMapping() } withFirArrayOfCallTransformer { - annotationCall.argumentList.transformArguments(this, expectedArgumentsTypeMapping) + annotation.argumentList.transformArguments(this, expectedArgumentsTypeMapping) var index = 0 subCandidate.argumentMapping = subCandidate.argumentMapping?.let { LinkedHashMap(it.size).let { newMapping -> subCandidate.argumentMapping?.mapKeysTo(newMapping) { (_, _) -> - annotationCall.argumentList.arguments[index++] + annotation.argumentList.arguments[index++] } } } } if (calleeReference.isError) { subCandidate.argumentMapping?.let { - annotationCall.replaceArgumentList(buildArgumentListForErrorCall(annotationCall.argumentList, it)) + annotation.replaceArgumentList(buildArgumentListForErrorCall(annotation.argumentList, it)) } } else { subCandidate.handleVarargs() subCandidate.argumentMapping?.let { - annotationCall.replaceArgumentList(buildResolvedArgumentList(it, annotationCall.argumentList.source)) + annotation.replaceArgumentList(buildResolvedArgumentList(it, annotation.argumentList.source)) } } - return annotationCall + return annotation } private fun Candidate.handleVarargs() { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt index 1e2d132dbe5..698a36aa4af 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/FirTypeResolveTransformer.kt @@ -9,7 +9,7 @@ import kotlinx.collections.immutable.toImmutableList import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isFromVararg -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirStatement @@ -19,7 +19,6 @@ import org.jetbrains.kotlin.fir.scopes.FirScope import org.jetbrains.kotlin.fir.scopes.createImportingScopes import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.fir.types.builder.buildErrorTypeRef -import org.jetbrains.kotlin.fir.types.impl.FirImplicitBuiltinTypeRef class FirTypeResolveProcessor( session: FirSession, @@ -204,8 +203,8 @@ open class FirTypeResolveTransformer( return delegatedConstructorCall } - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: Any?): FirStatement { - annotationCall.transformAnnotationTypeRef(this, data) - return annotationCall + override fun transformAnnotation(annotation: FirAnnotation, data: Any?): FirStatement { + annotation.transformAnnotationTypeRef(this, data) + return annotation } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt index 9a055a2aeb8..987046353d5 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirArrayOfCallTransformer.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.types.isArrayType /** * A transformer that converts resolved arrayOf() call to [FirArrayOfCall]. * - * Note that arrayOf() calls only in [FirAnnotationCall] or the default value of annotation constructor are transformed. + * Note that arrayOf() calls only in [FirAnnotation] or the default value of annotation constructor are transformed. */ internal class FirArrayOfCallTransformer { private val FirFunctionCall.isArrayOfCall: Boolean diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt index b19c3cf671e..ddf00b79da2 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirBodyResolveTransformer.kt @@ -203,8 +203,8 @@ open class FirBodyResolveTransformer( return expressionsTransformer.transformConstExpression(constExpression, data) } - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement { - return expressionsTransformer.transformAnnotationCall(annotationCall, data) + override fun transformAnnotation(annotation: FirAnnotation, data: ResolutionMode): FirStatement { + return expressionsTransformer.transformAnnotation(annotation, data) } override fun transformDelegatedConstructorCall( diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt index 6e1f17a1cb2..c239d487fb0 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/body/resolve/FirExpressionsResolveTransformer.kt @@ -892,25 +892,25 @@ open class FirExpressionsResolveTransformer(transformer: FirBodyResolveTransform return constExpression } - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement { - if (annotationCall.resolveStatus == FirAnnotationResolveStatus.Resolved) return annotationCall - return resolveAnnotationCall(annotationCall, FirAnnotationResolveStatus.Resolved) + override fun transformAnnotation(annotation: FirAnnotation, data: ResolutionMode): FirStatement { + if (annotation.resolveStatus == FirAnnotationResolveStatus.Resolved) return annotation + return resolveAnnotationCall(annotation, FirAnnotationResolveStatus.Resolved) } protected fun resolveAnnotationCall( - annotationCall: FirAnnotationCall, + annotation: FirAnnotation, status: FirAnnotationResolveStatus - ): FirAnnotationCall { + ): FirAnnotation { return withFirArrayOfCallTransformer { - annotationCall.transformAnnotationTypeRef(transformer, ResolutionMode.ContextIndependent) - if (status == FirAnnotationResolveStatus.PartiallyResolved) return annotationCall - dataFlowAnalyzer.enterAnnotationCall(annotationCall) - val result = callResolver.resolveAnnotationCall(annotationCall) - dataFlowAnalyzer.exitAnnotationCall(result ?: annotationCall) - if (result == null) return annotationCall + annotation.transformAnnotationTypeRef(transformer, ResolutionMode.ContextIndependent) + if (status == FirAnnotationResolveStatus.PartiallyResolved) return annotation + dataFlowAnalyzer.enterAnnotationCall(annotation) + val result = callResolver.resolveAnnotationCall(annotation) + dataFlowAnalyzer.exitAnnotationCall(result ?: annotation) + if (result == null) return annotation callCompleter.completeCall(result, noExpectedType) result.replaceResolveStatus(status) - annotationCall + annotation } } diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt index 1927dd32821..12387ea3083 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/contracts/FirContractResolveTransformer.kt @@ -45,8 +45,8 @@ open class FirContractResolveTransformer( ) { override val declarationsTransformer: FirDeclarationsResolveTransformer = FirDeclarationsContractResolveTransformer(this) - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement { - return annotationCall + override fun transformAnnotation(annotation: FirAnnotation, data: ResolutionMode): FirStatement { + return annotation } protected open class FirDeclarationsContractResolveTransformer(transformer: FirBodyResolveTransformer) : FirDeclarationsResolveTransformer(transformer) { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAbstractAnnotationResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAbstractAnnotationResolveTransformer.kt index dbdb121a9a5..83a5bdffcff 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAbstractAnnotationResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAbstractAnnotationResolveTransformer.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.scopes.FirCompositeScope @@ -22,7 +22,7 @@ internal abstract class FirAbstractAnnotationResolveTransformer( protected val session: FirSession, protected val scopeSession: ScopeSession ) : FirDefaultTransformer() { - abstract override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: D): FirStatement + abstract override fun transformAnnotation(annotation: FirAnnotation, data: D): FirStatement protected lateinit var scope: FirScope diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt index fdef9f92b3f..43522ee7bfa 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirAnnotationArgumentsResolveTransformer.kt @@ -137,13 +137,13 @@ private class FirExpressionsResolveTransformerForSpecificAnnotations( transformer: FirBodyResolveTransformer ) : FirExpressionsResolveTransformer(transformer) { - override fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: ResolutionMode): FirStatement { - if (annotationCall.resolveStatus >= FirAnnotationResolveStatus.PartiallyResolved) return annotationCall - dataFlowAnalyzer.enterAnnotationCall(annotationCall) - annotationCall.transformChildren(transformer, ResolutionMode.ContextDependent) - dataFlowAnalyzer.exitAnnotationCall(annotationCall) - annotationCall.replaceResolveStatus(FirAnnotationResolveStatus.PartiallyResolved) - return annotationCall + override fun transformAnnotation(annotation: FirAnnotation, data: ResolutionMode): FirStatement { + if (annotation.resolveStatus >= FirAnnotationResolveStatus.PartiallyResolved) return annotation + dataFlowAnalyzer.enterAnnotationCall(annotation) + annotation.transformChildren(transformer, ResolutionMode.ContextDependent) + dataFlowAnalyzer.exitAnnotationCall(annotation) + annotation.replaceResolveStatus(FirAnnotationResolveStatus.PartiallyResolved) + return annotation } override fun transformExpression(expression: FirExpression, data: ResolutionMode): FirStatement { diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt index 1ba4610cb6f..23f6e8c463e 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/resolve/transformers/plugin/FirPluginAnnotationsResolveTransformer.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.extensions.* import org.jetbrains.kotlin.fir.resolve.ScopeSession @@ -102,11 +102,11 @@ private class FirAnnotationResolveTransformer( owners = state } - override fun transformAnnotationCall( - annotationCall: FirAnnotationCall, + override fun transformAnnotation( + annotation: FirAnnotation, data: Multimap ): FirStatement { - return annotationCall.transformAnnotationTypeRef( + return annotation.transformAnnotationTypeRef( typeResolverTransformer, ScopeClassDeclaration(scope, classDeclarationsStack.lastOrNull()) ) diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt index 07fbba26cac..babd5e199a4 100644 --- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt +++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/scopes/impl/FirIntegerOperatorCall.kt @@ -9,8 +9,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin @@ -28,7 +27,7 @@ import org.jetbrains.kotlin.fir.types.builder.buildImplicitTypeRef class FirIntegerOperatorCall @FirImplementationDetail constructor( source: FirSourceElement?, typeRef: FirTypeRef, - annotations: MutableList, + annotations: MutableList, typeArguments: MutableList, explicitReceiver: FirExpression?, dispatchReceiver: FirExpression, @@ -52,7 +51,7 @@ class FirIntegerOperatorCall @FirImplementationDetail constructor( class FirIntegerOperatorCallBuilder : FirQualifiedAccessBuilder, FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = buildImplicitTypeRef() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression @@ -79,4 +78,4 @@ class FirIntegerOperatorCallBuilder : FirQualifiedAccessBuilder, FirCallBuilder, inline fun buildIntegerOperatorFunctionCall(init: FirIntegerOperatorCallBuilder.() -> Unit): FirIntegerOperatorCall { return FirIntegerOperatorCallBuilder().apply(init).build() -} \ No newline at end of file +} diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt index d7c1c164d5d..b9cdf23d26d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/FirAnnotationContainer.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.visitors.* interface FirAnnotationContainer : FirElement { override val source: FirSourceElement? - val annotations: List + val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotationContainer(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt index 4f99bfe9faf..9ad9b212526 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/builder/FirAnnotationContainerBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.builder import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAnnotationContainerBuilder { abstract var source: FirSourceElement? - abstract val annotations: MutableList + abstract val annotations: MutableList fun build(): FirAnnotationContainer } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt index c725596dd95..487b67c3b89 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnnotatedDeclaration.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -25,7 +25,7 @@ sealed class FirAnnotatedDeclaration : FirDeclaration(), FirAnnotationContainer abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotatedDeclaration(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt index 60b95b38820..b5687247dbc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousFunction.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol @@ -30,7 +30,7 @@ abstract class FirAnonymousFunction : FirFunction(), FirTypeParametersOwner { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus abstract override val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt index 0132f640494..2065d72e864 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirAnonymousObject.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol @@ -32,7 +32,7 @@ abstract class FirAnonymousObject : FirClass(), FirControlFlowGraphOwner { abstract override val classKind: ClassKind abstract override val superTypeRefs: List abstract override val declarations: List - abstract override val annotations: List + abstract override val annotations: List abstract override val scopeProvider: FirScopeProvider abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val symbol: FirAnonymousObjectSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt index c91606eee9a..7a97cd45275 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirBackingField.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -45,7 +45,7 @@ abstract class FirBackingField : FirVariable(), FirTypeParametersOwner, FirState abstract override val symbol: FirBackingFieldSymbol abstract val propertySymbol: FirPropertySymbol abstract override val initializer: FirExpression? - abstract override val annotations: List + abstract override val annotations: List abstract override val typeParameters: List abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt index 1bdf458bbee..248d74cb50e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirCallableDeclaration.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirCallableSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -26,7 +26,7 @@ sealed class FirCallableDeclaration : FirTypedDeclaration(), FirMemberDeclaratio abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt index 9e74f487f5e..044003a7d2f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClass.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol @@ -33,7 +33,7 @@ sealed class FirClass : FirClassLikeDeclaration(), FirStatement, FirTypeParamete abstract val classKind: ClassKind abstract val superTypeRefs: List abstract val declarations: List - abstract override val annotations: List + abstract override val annotations: List abstract val scopeProvider: FirScopeProvider override fun accept(visitor: FirVisitor, data: D): R = visitor.visitClass(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt index 5444e8dd50d..bfa7ea99153 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirClassLikeDeclaration.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -24,7 +24,7 @@ sealed class FirClassLikeDeclaration : FirAnnotatedDeclaration(), FirStatement { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract override val symbol: FirClassLikeSymbol abstract val deprecation: DeprecationsPerUseSite? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt index cd68110e0fd..ce52a379d5b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirConstructor.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -38,7 +38,7 @@ abstract class FirConstructor : FirFunction(), FirTypeParameterRefsOwner { abstract override val dispatchReceiverType: ConeKotlinType? abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val valueParameters: List - abstract override val annotations: List + abstract override val annotations: List abstract override val symbol: FirConstructorSymbol abstract val delegatedConstructor: FirDelegatedConstructorCall? abstract override val body: FirBlock? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt index 0e7ec4a2217..d976e488ec9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirEnumEntry.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -43,7 +43,7 @@ abstract class FirEnumEntry : FirVariable() { abstract override val getter: FirPropertyAccessor? abstract override val setter: FirPropertyAccessor? abstract override val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List abstract override val symbol: FirEnumEntrySymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitEnumEntry(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt index d0e93d6e8f0..7cb8f478956 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorFunction.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol @@ -30,7 +30,7 @@ abstract class FirErrorFunction : FirFunction(), FirDiagnosticHolder { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract override val returnTypeRef: FirTypeRef abstract override val status: FirDeclarationStatus abstract override val receiverTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt index 869678bb22a..5432e2e04b6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirErrorProperty.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -45,7 +45,7 @@ abstract class FirErrorProperty : FirVariable(), FirDiagnosticHolder { abstract override val getter: FirPropertyAccessor? abstract override val setter: FirPropertyAccessor? abstract override val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List abstract override val diagnostic: ConeDiagnostic abstract override val symbol: FirErrorPropertySymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt index b9d36b5a94a..6129bc576c9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirField.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -43,7 +43,7 @@ abstract class FirField : FirVariable() { abstract override val getter: FirPropertyAccessor? abstract override val setter: FirPropertyAccessor? abstract override val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List abstract override val symbol: FirFieldSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitField(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt index 24a9bb93e71..01f37e3418e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFile.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirPackageDirective import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -24,7 +24,7 @@ abstract class FirFile : FirAnnotatedDeclaration() { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract val packageDirective: FirPackageDirective abstract val imports: List abstract val declarations: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt index b6b2e0d8366..89077dc458a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirFunction.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTargetElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -30,7 +30,7 @@ sealed class FirFunction : FirCallableDeclaration(), FirTargetElement, FirContro abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract override val returnTypeRef: FirTypeRef abstract override val typeParameters: List abstract override val status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt index 419008102ea..c83b8c804af 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirProperty.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirDelegateFieldSymbol @@ -44,7 +44,7 @@ abstract class FirProperty : FirVariable(), FirTypeParametersOwner, FirControlFl abstract override val getter: FirPropertyAccessor? abstract override val setter: FirPropertyAccessor? abstract override val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val symbol: FirPropertySymbol abstract val delegateFieldSymbol: FirDelegateFieldSymbol? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt index eb9a3368302..25b9df4c60f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirPropertyAccessor.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol @@ -44,7 +44,7 @@ abstract class FirPropertyAccessor : FirFunction(), FirContractDescriptionOwner, abstract val propertySymbol: FirPropertySymbol? abstract val isGetter: Boolean abstract val isSetter: Boolean - abstract override val annotations: List + abstract override val annotations: List abstract override val typeParameters: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitPropertyAccessor(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt index cbfeb629d37..703f0f21d98 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirRegularClass.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.descriptors.ClassKind import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -32,7 +32,7 @@ abstract class FirRegularClass : FirClass(), FirMemberDeclaration, FirControlFlo abstract override val typeParameters: List abstract override val classKind: ClassKind abstract override val declarations: List - abstract override val annotations: List + abstract override val annotations: List abstract override val scopeProvider: FirScopeProvider abstract override val status: FirDeclarationStatus abstract override val controlFlowGraphReference: FirControlFlowGraphReference? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt index 0a236a99b81..ebbafcabe99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirSimpleFunction.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.contracts.FirContractDescription -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -42,7 +42,7 @@ abstract class FirSimpleFunction : FirFunction(), FirContractDescriptionOwner, F abstract override val contractDescription: FirContractDescription abstract val name: Name abstract override val symbol: FirNamedFunctionSymbol - abstract override val annotations: List + abstract override val annotations: List abstract override val typeParameters: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitSimpleFunction(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt index 7f24fbe639c..affce9f6a87 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeAlias.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name @@ -31,7 +31,7 @@ abstract class FirTypeAlias : FirClassLikeDeclaration(), FirMemberDeclaration, F abstract val name: Name abstract override val symbol: FirTypeAliasSymbol abstract val expandedTypeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeAlias(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt index 89b3dc6cf90..8ced2ba8860 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypeParameter.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -33,7 +33,7 @@ abstract class FirTypeParameter : FirTypeParameterRef, FirAnnotatedDeclaration() abstract val variance: Variance abstract val isReified: Boolean abstract val bounds: List - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeParameter(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt index fee6d90bb4b..b4e277f8f71 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirTypedDeclaration.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -25,7 +25,7 @@ sealed class FirTypedDeclaration : FirAnnotatedDeclaration() { abstract override val resolvePhase: FirResolvePhase abstract override val origin: FirDeclarationOrigin abstract override val attributes: FirDeclarationAttributes - abstract override val annotations: List + abstract override val annotations: List abstract val returnTypeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypedDeclaration(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt index b335268a72a..e6b6cdb5681 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirValueParameter.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -44,7 +44,7 @@ abstract class FirValueParameter : FirVariable(), FirControlFlowGraphOwner { abstract override val getter: FirPropertyAccessor? abstract override val setter: FirPropertyAccessor? abstract override val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List abstract override val controlFlowGraphReference: FirControlFlowGraphReference? abstract override val symbol: FirValueParameterSymbol abstract val defaultValue: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt index 10a48756431..1117fa8e080 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/FirVariable.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.symbols.impl.FirVariableSymbol @@ -45,7 +45,7 @@ sealed class FirVariable : FirCallableDeclaration(), FirStatement { abstract val getter: FirPropertyAccessor? abstract val setter: FirPropertyAccessor? abstract val backingField: FirBackingField? - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitVariable(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt index dde0c020e08..10097c8adaa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAbstractConstructorBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -39,7 +39,7 @@ interface FirAbstractConstructorBuilder : FirFunctionBuilder { abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes - abstract override val annotations: MutableList + abstract override val annotations: MutableList abstract override var returnTypeRef: FirTypeRef abstract override var status: FirDeclarationStatus abstract override var deprecation: DeprecationsPerUseSite? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt index 4af2c897d8f..d3fcef051ea 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousFunctionBuilder.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.declarations.InlineStatus import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousFunctionImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol @@ -45,7 +45,7 @@ class FirAnonymousFunctionBuilder : FirFunctionBuilder, FirAnnotationContainerBu override lateinit var moduleData: FirModuleData override lateinit var origin: FirDeclarationOrigin override var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var returnTypeRef: FirTypeRef var receiverTypeRef: FirTypeRef? = null override var deprecation: DeprecationsPerUseSite? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt index e5e142bde79..617c2043238 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirAnonymousObjectBuilder.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirAnonymousObjectImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol @@ -45,7 +45,7 @@ class FirAnonymousObjectBuilder : FirDeclarationBuilder, FirClassBuilder, FirAnn override lateinit var classKind: ClassKind override val superTypeRefs: MutableList = mutableListOf() override val declarations: MutableList = mutableListOf() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var scopeProvider: FirScopeProvider lateinit var symbol: FirAnonymousObjectSymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt index 19ff5d14991..602036ab861 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirBackingFieldBuilder.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.impl.FirBackingFieldImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol @@ -57,7 +57,7 @@ class FirBackingFieldBuilder : FirAnnotationContainerBuilder { lateinit var symbol: FirBackingFieldSymbol lateinit var propertySymbol: FirPropertySymbol var initializer: FirExpression? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() val typeParameters: MutableList = mutableListOf() lateinit var status: FirDeclarationStatus diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt index cd4a27a99ee..87a73a0dcef 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirClassBuilder.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -35,7 +35,7 @@ interface FirClassBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilder abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes - abstract override val annotations: MutableList + abstract override val annotations: MutableList abstract var deprecation: DeprecationsPerUseSite? abstract val typeParameters: MutableList abstract var classKind: ClassKind diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt index a025949e039..42de25449b4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirConstructorBuilder.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirAbstractConstructorBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirConstructorImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -50,7 +50,7 @@ open class FirConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotationC override var containerSource: DeserializedContainerSource? = null override var dispatchReceiverType: ConeKotlinType? = null override val valueParameters: MutableList = mutableListOf() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var symbol: FirConstructorSymbol override var delegatedConstructor: FirDelegatedConstructorCall? = null override var body: FirBlock? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt index d09a2211963..34a71b2b4f5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirDefaultSetterValueParameterBuilder.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirDefaultSetterValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -55,7 +55,7 @@ class FirDefaultSetterValueParameterBuilder : FirAnnotationContainerBuilder { var getter: FirPropertyAccessor? = null var setter: FirPropertyAccessor? = null var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var symbol: FirValueParameterSymbol var defaultValue: FirExpression? = null var isCrossinline: Boolean = false diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt index 05f4a93aa4d..d86f6c51ea1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirEnumEntryBuilder.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirEnumEntryImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -50,7 +50,7 @@ class FirEnumEntryBuilder : FirAnnotationContainerBuilder { lateinit var name: Name var initializer: FirExpression? = null var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var symbol: FirEnumEntrySymbol override fun build(): FirEnumEntry { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt index bb4d7336473..663494c2d2c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorFunctionBuilder.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirErrorFunctionImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol @@ -43,7 +43,7 @@ class FirErrorFunctionBuilder : FirAnnotationContainerBuilder { var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var deprecation: DeprecationsPerUseSite? = null var containerSource: DeserializedContainerSource? = null var dispatchReceiverType: ConeKotlinType? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt index e59698ea2aa..9aa37de9c09 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirErrorPropertyBuilder.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirErrorPropertyImpl import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -49,7 +49,7 @@ class FirErrorPropertyBuilder : FirAnnotationContainerBuilder { var dispatchReceiverType: ConeKotlinType? = null lateinit var name: Name var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var diagnostic: ConeDiagnostic lateinit var symbol: FirErrorPropertySymbol diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt index b72c3b59921..89bb97440e5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFieldBuilder.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirFieldImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -53,7 +53,7 @@ open class FirFieldBuilder : FirDeclarationBuilder, FirAnnotationContainerBuilde open var initializer: FirExpression? = null open var isVar: Boolean by kotlin.properties.Delegates.notNull() open var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() open lateinit var symbol: FirFieldSymbol @OptIn(FirImplementationDetail::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt index 6936fd41901..068b8ead4bf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFileBuilder.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.impl.FirFileImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -34,7 +34,7 @@ class FirFileBuilder : FirAnnotationContainerBuilder { var resolvePhase: FirResolvePhase = FirResolvePhase.RAW_FIR lateinit var origin: FirDeclarationOrigin var attributes: FirDeclarationAttributes = FirDeclarationAttributes() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var packageDirective: FirPackageDirective val imports: MutableList = mutableListOf() val declarations: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt index 0adb50f28dd..64017d5442a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirFunctionBuilder.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirFunction import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -36,7 +36,7 @@ interface FirFunctionBuilder : FirDeclarationBuilder, FirAnnotationContainerBuil abstract override var resolvePhase: FirResolvePhase abstract override var origin: FirDeclarationOrigin abstract override var attributes: FirDeclarationAttributes - abstract override val annotations: MutableList + abstract override val annotations: MutableList abstract var returnTypeRef: FirTypeRef abstract var status: FirDeclarationStatus abstract var deprecation: DeprecationsPerUseSite? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt index 1049561902f..a407cb74627 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPrimaryConstructorBuilder.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirAbstractConstructorBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirPrimaryConstructor -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -51,7 +51,7 @@ class FirPrimaryConstructorBuilder : FirAbstractConstructorBuilder, FirAnnotatio override var containerSource: DeserializedContainerSource? = null override var dispatchReceiverType: ConeKotlinType? = null override val valueParameters: MutableList = mutableListOf() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var symbol: FirConstructorSymbol override var delegatedConstructor: FirDelegatedConstructorCall? = null override var body: FirBlock? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt index 873b8aad3b1..6a4280ff1f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyAccessorBuilder.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyAccessorImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol @@ -57,7 +57,7 @@ class FirPropertyAccessorBuilder : FirFunctionBuilder, FirAnnotationContainerBui lateinit var symbol: FirPropertyAccessorSymbol var propertySymbol: FirPropertySymbol? = null var isGetter: Boolean by kotlin.properties.Delegates.notNull() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() val typeParameters: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt index 93671b003b3..26ac98cd75c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirPropertyBuilder.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -60,7 +60,7 @@ class FirPropertyBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder, var getter: FirPropertyAccessor? = null var setter: FirPropertyAccessor? = null var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var symbol: FirPropertySymbol var delegateFieldSymbol: FirDelegateFieldSymbol? = null var isLocal: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt index 4250e205299..7bfd01a84ae 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirRegularClassBuilder.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.builder.FirClassBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParameterRefsOwnerBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirRegularClassImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -46,7 +46,7 @@ open class FirRegularClassBuilder : FirClassBuilder, FirTypeParameterRefsOwnerBu override val typeParameters: MutableList = mutableListOf() override lateinit var classKind: ClassKind override val declarations: MutableList = mutableListOf() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var scopeProvider: FirScopeProvider open lateinit var status: FirDeclarationStatus open lateinit var name: Name diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt index 010478406a3..c528e8511eb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirSimpleFunctionBuilder.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.builder.FirFunctionBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirSimpleFunctionImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -56,7 +56,7 @@ open class FirSimpleFunctionBuilder : FirFunctionBuilder, FirTypeParametersOwner open var contractDescription: FirContractDescription = FirEmptyContractDescription open lateinit var name: Name open lateinit var symbol: FirNamedFunctionSymbol - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeParameters: MutableList = mutableListOf() override fun build(): FirSimpleFunction { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt index d92a16df18b..4f8939b3618 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeAliasBuilder.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.builder.FirDeclarationBuilder import org.jetbrains.kotlin.fir.declarations.builder.FirTypeParametersOwnerBuilder import org.jetbrains.kotlin.fir.declarations.impl.FirTypeAliasImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -44,7 +44,7 @@ class FirTypeAliasBuilder : FirDeclarationBuilder, FirTypeParametersOwnerBuilder lateinit var name: Name lateinit var symbol: FirTypeAliasSymbol lateinit var expandedTypeRef: FirTypeRef - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override fun build(): FirTypeAlias { return FirTypeAliasImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt index dc071c40ae3..6abc4a24e45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirTypeParameterBuilder.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -41,7 +41,7 @@ class FirTypeParameterBuilder : FirAnnotationContainerBuilder { lateinit var variance: Variance var isReified: Boolean by kotlin.properties.Delegates.notNull() val bounds: MutableList = mutableListOf() - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override fun build(): FirTypeParameter { return FirTypeParameterImpl( diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt index 60d543b2f5e..3d16fe030f2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/builder/FirValueParameterBuilder.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -49,7 +49,7 @@ open class FirValueParameterBuilder : FirAnnotationContainerBuilder { open var dispatchReceiverType: ConeKotlinType? = null open lateinit var name: Name open var backingField: FirBackingField? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() open lateinit var symbol: FirValueParameterSymbol open var defaultValue: FirExpression? = null open var isCrossinline: Boolean by kotlin.properties.Delegates.notNull() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt index a04202275e3..59aecc75418 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousFunctionImpl.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.InlineStatus import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousFunctionSymbol @@ -38,7 +38,7 @@ internal class FirAnonymousFunctionImpl( override val moduleData: FirModuleData, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override val annotations: MutableList, + override val annotations: MutableList, override var returnTypeRef: FirTypeRef, override var receiverTypeRef: FirTypeRef?, override var deprecation: DeprecationsPerUseSite?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt index 7c4c2f13d76..139d6e613be 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirAnonymousObjectImpl.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirAnonymousObjectSymbol @@ -39,7 +39,7 @@ internal class FirAnonymousObjectImpl( override val classKind: ClassKind, override val superTypeRefs: MutableList, override val declarations: MutableList, - override val annotations: MutableList, + override val annotations: MutableList, override val scopeProvider: FirScopeProvider, override val symbol: FirAnonymousObjectSymbol, ) : FirAnonymousObject() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt index f7f641a37bf..0bca0404906 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirBackingFieldImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol @@ -53,7 +53,7 @@ open class FirBackingFieldImpl @FirImplementationDetail constructor( override val symbol: FirBackingFieldSymbol, override val propertySymbol: FirPropertySymbol, override var initializer: FirExpression?, - override val annotations: MutableList, + override val annotations: MutableList, override val typeParameters: MutableList, override var status: FirDeclarationStatus, ) : FirBackingField() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt index 880a018cffc..5ee772cc9f2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirConstructorImpl.kt @@ -15,7 +15,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -45,7 +45,7 @@ internal class FirConstructorImpl( override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, override val valueParameters: MutableList, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirConstructorSymbol, override var delegatedConstructor: FirDelegatedConstructorCall?, override var body: FirBlock?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt index 157110e5f82..ec50cb4bf4d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultSetterValueParameter.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -51,7 +51,7 @@ internal class FirDefaultSetterValueParameter( override var getter: FirPropertyAccessor?, override var setter: FirPropertyAccessor?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirValueParameterSymbol, override var defaultValue: FirExpression?, override val isCrossinline: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt index 2403f356042..1350af0a8f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirEnumEntryImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirEnumEntry import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirEnumEntrySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -46,7 +46,7 @@ internal class FirEnumEntryImpl( override val name: Name, override var initializer: FirExpression?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirEnumEntrySymbol, ) : FirEnumEntry() { override val receiverTypeRef: FirTypeRef? get() = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt index 8462db1ff20..6fe677bab23 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorFunctionImpl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirErrorFunctionSymbol @@ -39,7 +39,7 @@ internal class FirErrorFunctionImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override val annotations: MutableList, + override val annotations: MutableList, override var deprecation: DeprecationsPerUseSite?, override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt index a59c6921d5b..351c1c9a70d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirErrorPropertyImpl.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirErrorPropertySymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -45,7 +45,7 @@ internal class FirErrorPropertyImpl( override val dispatchReceiverType: ConeKotlinType?, override val name: Name, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val diagnostic: ConeDiagnostic, override val symbol: FirErrorPropertySymbol, ) : FirErrorProperty() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt index 3e65c5102bf..5182e6b9bd0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFieldImpl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirField import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.symbols.impl.FirFieldSymbol import org.jetbrains.kotlin.fir.types.ConeKotlinType @@ -48,7 +48,7 @@ class FirFieldImpl @FirImplementationDetail constructor( override var initializer: FirExpression?, override val isVar: Boolean, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirFieldSymbol, ) : FirField() { override val receiverTypeRef: FirTypeRef? get() = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt index 834149f2ad4..411af90dae1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirFileImpl.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirImport import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirFileSymbol import org.jetbrains.kotlin.fir.visitors.* @@ -30,7 +30,7 @@ internal class FirFileImpl( override var resolvePhase: FirResolvePhase, override val origin: FirDeclarationOrigin, override val attributes: FirDeclarationAttributes, - override val annotations: MutableList, + override val annotations: MutableList, override var packageDirective: FirPackageDirective, override val imports: MutableList, override val declarations: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt index 63839ec8bd2..b3db4e49558 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPrimaryConstructor.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference @@ -46,7 +46,7 @@ class FirPrimaryConstructor @FirImplementationDetail constructor( override val containerSource: DeserializedContainerSource?, override val dispatchReceiverType: ConeKotlinType?, override val valueParameters: MutableList, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirConstructorSymbol, override var delegatedConstructor: FirDelegatedConstructorCall?, override var body: FirBlock?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt index e86c30bcd22..3d040b2bd25 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyAccessorImpl.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol @@ -51,7 +51,7 @@ open class FirPropertyAccessorImpl @FirImplementationDetail constructor( override val symbol: FirPropertyAccessorSymbol, override val propertySymbol: FirPropertySymbol?, override val isGetter: Boolean, - override val annotations: MutableList, + override val annotations: MutableList, override val typeParameters: MutableList, ) : FirPropertyAccessor() { override val receiverTypeRef: FirTypeRef? get() = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt index d79723d2d14..fb75d986ea6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirPropertyImpl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirPropertyAccessor import org.jetbrains.kotlin.fir.declarations.FirPropertyBodyResolveState import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol @@ -54,7 +54,7 @@ internal class FirPropertyImpl( override var getter: FirPropertyAccessor?, override var setter: FirPropertyAccessor?, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirPropertySymbol, override val delegateFieldSymbol: FirDelegateFieldSymbol?, override val isLocal: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt index 4465c304ce1..04c9cefde46 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirRegularClassImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.fir.symbols.impl.FirRegularClassSymbol @@ -40,7 +40,7 @@ internal class FirRegularClassImpl( override val typeParameters: MutableList, override val classKind: ClassKind, override val declarations: MutableList, - override val annotations: MutableList, + override val annotations: MutableList, override val scopeProvider: FirScopeProvider, override var status: FirDeclarationStatus, override val name: Name, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt index d6af32d1e2d..caca6557bcd 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirSimpleFunctionImpl.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirSimpleFunction import org.jetbrains.kotlin.fir.declarations.FirTypeParameter import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirNamedFunctionSymbol @@ -49,7 +49,7 @@ internal class FirSimpleFunctionImpl( override var contractDescription: FirContractDescription, override val name: Name, override val symbol: FirNamedFunctionSymbol, - override val annotations: MutableList, + override val annotations: MutableList, override val typeParameters: MutableList, ) : FirSimpleFunction() { override var controlFlowGraphReference: FirControlFlowGraphReference? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt index 3dbaea91701..f550cda4edf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeAliasImpl.kt @@ -14,7 +14,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeAlias import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirTypeAliasSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.name.Name @@ -38,7 +38,7 @@ internal class FirTypeAliasImpl( override val name: Name, override val symbol: FirTypeAliasSymbol, override var expandedTypeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, ) : FirTypeAlias() { init { symbol.bind(this) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt index 4e38a1ed476..1b8d9e9d9a9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirTypeParameterImpl.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -37,7 +37,7 @@ internal class FirTypeParameterImpl( override val variance: Variance, override val isReified: Boolean, override val bounds: MutableList, - override val annotations: MutableList, + override val annotations: MutableList, ) : FirTypeParameter() { init { symbol.bind(this) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt index e4dd663c9dd..473b4989996 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/declarations/impl/FirValueParameterImpl.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.declarations.FirResolvePhase import org.jetbrains.kotlin.fir.declarations.FirTypeParameterRef import org.jetbrains.kotlin.fir.declarations.FirValueParameter import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirValueParameterSymbol @@ -45,7 +45,7 @@ internal class FirValueParameterImpl( override val dispatchReceiverType: ConeKotlinType?, override val name: Name, override var backingField: FirBackingField?, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirValueParameterSymbol, override var defaultValue: FirExpression?, override val isCrossinline: Boolean, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt similarity index 81% rename from compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt rename to compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt index 5c5c8d9528a..9fbbfb3b214 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnnotation.kt @@ -17,21 +17,21 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -abstract class FirAnnotationCall : FirExpression(), FirCall, FirResolvable { +abstract class FirAnnotation : FirExpression(), FirCall, FirResolvable { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract override val calleeReference: FirReference abstract val useSiteTarget: AnnotationUseSiteTarget? abstract val annotationTypeRef: FirTypeRef abstract val resolveStatus: FirAnnotationResolveStatus - override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotationCall(this, data) + override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnnotation(this, data) @Suppress("UNCHECKED_CAST") override fun transform(transformer: FirTransformer, data: D): E = - transformer.transformAnnotationCall(this, data) as E + transformer.transformAnnotation(this, data) as E abstract override fun replaceTypeRef(newTypeRef: FirTypeRef) @@ -41,9 +41,9 @@ abstract class FirAnnotationCall : FirExpression(), FirCall, FirResolvable { abstract fun replaceResolveStatus(newResolveStatus: FirAnnotationResolveStatus) - abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnnotationCall + abstract override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnnotation - abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirAnnotationCall + abstract override fun transformCalleeReference(transformer: FirTransformer, data: D): FirAnnotation - abstract fun transformAnnotationTypeRef(transformer: FirTransformer, data: D): FirAnnotationCall + abstract fun transformAnnotationTypeRef(transformer: FirTransformer, data: D): FirAnnotation } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt index 681b79fb337..1e51bf7ecce 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousFunctionExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousFunctionExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val anonymousFunction: FirAnonymousFunction override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnonymousFunctionExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt index 71a628ed415..22e1d4b676b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAnonymousObjectExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAnonymousObjectExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val anonymousObject: FirAnonymousObject override fun accept(visitor: FirVisitor, data: D): R = visitor.visitAnonymousObjectExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt index 61d68f69424..5d2a34c5465 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirArrayOfCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirArrayOfCall : FirExpression(), FirCall { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList override fun accept(visitor: FirVisitor, data: D): R = visitor.visitArrayOfCall(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt index 4e7d8d0a9bc..6df4122cc99 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAssignmentOperatorStatement.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAssignmentOperatorStatement : FirPureAbstractElement(), FirStatement { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val operation: FirOperation abstract val leftArgument: FirExpression abstract val rightArgument: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt index 2e777565bfa..1d781100fba 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirAugmentedArraySetCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirAugmentedArraySetCall : FirPureAbstractElement(), FirStatement { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val assignCall: FirFunctionCall abstract val setGetBlock: FirBlock abstract val operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt index a22e23b8419..5e5124d7a58 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBinaryLogicExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBinaryLogicExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val leftOperand: FirExpression abstract val rightOperand: FirExpression abstract val kind: LogicOperationKind diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt index 4b305c18640..b4e10ffa96f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBlock.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBlock : FirExpression() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val statements: List abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt index 1c502b53bc5..54edef2dd57 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirBreakExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirBreakExpression : FirLoopJump() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val target: FirTarget override fun accept(visitor: FirVisitor, data: D): R = visitor.visitBreakExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt index e697fec9ba6..8a5ae7b2dec 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCall.kt @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.fir.visitors.* sealed interface FirCall : FirStatement { override val source: FirSourceElement? - override val annotations: List + override val annotations: List val argumentList: FirArgumentList override fun accept(visitor: FirVisitor, data: D): R = visitor.visitCall(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt index 16742d4d3b1..642a11318b1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCallableReferenceAccess.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirCallableReferenceAccess : FirQualifiedAccessExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt index e0f52a639d0..a9fd2a240c7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckNotNullCall.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirCheckNotNullCall : FirExpression(), FirCall, FirResolvable { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract override val calleeReference: FirReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt index 44cba4a5ad9..7f7e1833289 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirCheckedSafeCallSubject.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirCheckedSafeCallSubject : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val originalReceiverRef: FirExpressionRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitCheckedSafeCallSubject(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt index 7463ddc80f2..9e4985ed3f5 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirClassReferenceExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirClassReferenceExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val classTypeRef: FirTypeRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitClassReferenceExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt index 304fdcfb674..7f153150861 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComparisonExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirComparisonExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val operation: FirOperation abstract val compareToCall: FirFunctionCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt index f4eefe07757..c6b0c96279a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirComponentCall.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirComponentCall : FirFunctionCall() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val dispatchReceiver: FirExpression abstract override val extensionReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt index 1cb8ece6e12..d67456fa6a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirConstExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirConstExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val kind: ConstantValueKind abstract val value: T diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt index fa7fe0a9621..45028c67df7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirContinueExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirContinueExpression : FirLoopJump() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val target: FirTarget override fun accept(visitor: FirVisitor, data: D): R = visitor.visitContinueExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt index 85a749b0006..7e052ca3bab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDelegatedConstructorCall.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirDelegatedConstructorCall : FirPureAbstractElement(), FirResolvable, FirCall { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val constructedTypeRef: FirTypeRef abstract val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt index 678af70c910..c3da0151ba9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirDoWhileLoop.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirDoWhileLoop : FirLoop() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val block: FirBlock abstract override val condition: FirExpression abstract override val label: FirLabel? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt index 30b77abf1d0..127bd4a8bfb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirElvisExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirElvisExpression : FirExpression(), FirResolvable { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract val lhs: FirExpression abstract val rhs: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt index be6884dd34a..4bd0ebbca9d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirEqualityOperatorCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirEqualityOperatorCall : FirExpression(), FirCall { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt index c9f7f059aef..3873a8337dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorExpression.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorExpression : FirExpression(), FirDiagnosticHolder { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val diagnostic: ConeDiagnostic abstract val expression: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt index 89955031188..cd7b35c2510 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorLoop.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorLoop : FirLoop(), FirDiagnosticHolder { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val block: FirBlock abstract override val condition: FirExpression abstract override val label: FirLabel? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt index 7d87b87ba17..d9f90e3828e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirErrorResolvedQualifier.kt @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorResolvedQualifier : FirResolvedQualifier(), FirDiagnosticHolder { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val packageFqName: FqName abstract override val relativeClassFqName: FqName? abstract override val classId: ClassId? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt index 6225c3790c6..d34964c389e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirExpression : FirPureAbstractElement(), FirStatement { abstract override val source: FirSourceElement? abstract val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt index 733c3e7a8d9..c5da8060b44 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcast.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirExpressionWithSmartcast : FirQualifiedAccessExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt index 78bc9772270..7747e0ca65c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirExpressionWithSmartcastToNull.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirExpressionWithSmartcastToNull : FirExpressionWithSmartcast() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt index e52460a7162..bfe63613630 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirFunctionCall.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirFunctionCall : FirQualifiedAccessExpression(), FirCall { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt index caab905217b..b9b5e0793a7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirGetClassCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirGetClassCall : FirExpression(), FirCall { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val argument: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt index f2b8eb07658..82aa3c70fe1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirImplicitInvokeCall.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirImplicitInvokeCall : FirFunctionCall() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt index fbcd5e9bbde..18283f29688 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirJump.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirJump : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val target: FirTarget override fun accept(visitor: FirVisitor, data: D): R = visitor.visitJump(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt index b17245a9951..8d56a5d2cad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLambdaArgumentExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLambdaArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt index 39ea6d199fd..928dbe40c00 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoop.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirLoop : FirPureAbstractElement(), FirStatement, FirTargetElement { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val block: FirBlock abstract val condition: FirExpression abstract val label: FirLabel? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt index ac8d9f3ecc9..fe87e7dacb1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirLoopJump.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirLoopJump : FirJump() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val target: FirTarget override fun accept(visitor: FirVisitor, data: D): R = visitor.visitLoopJump(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt index 37e651d4739..ef806c087bb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirNamedArgumentExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirNamedArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean abstract val name: Name diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt index 0ee8952bd45..c0ac601a815 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirPropertyAccessExpression.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirPropertyAccessExpression : FirQualifiedAccessExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt index e91d5d1681e..ad11c4480ab 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccess.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail interface FirQualifiedAccess : FirResolvable, FirStatement { override val calleeReference: FirReference - override val annotations: List + override val annotations: List val typeArguments: List val explicitReceiver: FirExpression? val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt index 266e410008e..2269facae9b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirQualifiedAccessExpression.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirQualifiedAccessExpression : FirExpression(), FirQualifiedAccess { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt index fe81702e9a1..f6b49d2e5f9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedQualifier.kt @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedQualifier : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val packageFqName: FqName abstract val relativeClassFqName: FqName? abstract val classId: ClassId? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt index 75bb319e301..3a4948565f6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirResolvedReifiedParameterReference.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedReifiedParameterReference : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val symbol: FirTypeParameterSymbol override fun accept(visitor: FirVisitor, data: D): R = visitor.visitResolvedReifiedParameterReference(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt index 75e6aa0df9e..647a29576c7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirReturnExpression.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirReturnExpression : FirJump() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val target: FirTarget abstract val result: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt index 51655ade484..c3585a3b9c9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSafeCallExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSafeCallExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val receiver: FirExpression abstract val checkedSubjectRef: FirExpressionRef abstract val regularQualifiedAccess: FirQualifiedAccess diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt index db37a8cd415..44852c61c7e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirSpreadArgumentExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirSpreadArgumentExpression : FirWrappedArgumentExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val expression: FirExpression abstract override val isSpread: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt index 6350addd4ce..d81d878b706 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStatement.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* interface FirStatement : FirAnnotationContainer { override val source: FirSourceElement? - override val annotations: List + override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitStatement(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt index dca21875153..acbff9da646 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirStringConcatenationCall.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirStringConcatenationCall : FirCall, FirExpression() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract override val typeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt index ea37c0b4a07..44bc0f32bb9 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThisReceiverExpression.kt @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirThisReceiverExpression : FirQualifiedAccessExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt index 0727537772c..34745be7794 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirThrowExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirThrowExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val exception: FirExpression override fun accept(visitor: FirVisitor, data: D): R = visitor.visitThrowExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt index 06c3ba89d66..fb7aa0a32a6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTryExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTryExpression : FirExpression(), FirResolvable { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract val tryBlock: FirBlock abstract val catches: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt index 28c053b1e55..8df243a5409 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirTypeOperatorCall.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTypeOperatorCall : FirExpression(), FirCall { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val argumentList: FirArgumentList abstract val operation: FirOperation abstract val conversionTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt index f0f11292057..2c8e96b8249 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVarargArgumentsExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirVarargArgumentsExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val arguments: List abstract val varargElementType: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt index 597830e9ad7..6b09c24abcc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirVariableAssignment.kt @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail abstract class FirVariableAssignment : FirPureAbstractElement(), FirQualifiedAccess { abstract override val calleeReference: FirReference - abstract override val annotations: List + abstract override val annotations: List abstract override val typeArguments: List abstract override val explicitReceiver: FirExpression? abstract override val dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt index 5572fbc1cfb..f5ba91ce664 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenExpression.kt @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWhenExpression : FirExpression(), FirResolvable { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val calleeReference: FirReference abstract val subject: FirExpression? abstract val subjectVariable: FirVariable? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt index 81d9f0996e8..0f375a86083 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhenSubjectExpression.kt @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWhenSubjectExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val whenRef: FirExpressionRef override fun accept(visitor: FirVisitor, data: D): R = visitor.visitWhenSubjectExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt index 9b6267012f6..0c1e077f15c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWhileLoop.kt @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWhileLoop : FirLoop() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val label: FirLabel? abstract override val condition: FirExpression abstract override val block: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt index 5f56e8ca7ba..e495943868d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedArgumentExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedArgumentExpression : FirWrappedExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val expression: FirExpression abstract val isSpread: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt index 55215409545..b13322f4c66 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedDelegateExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedDelegateExpression : FirWrappedExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract override val expression: FirExpression abstract val delegateProvider: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt index 2cd6ba138a5..d25517aff6a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/FirWrappedExpression.kt @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirWrappedExpression : FirExpression() { abstract override val source: FirSourceElement? abstract override val typeRef: FirTypeRef - abstract override val annotations: List + abstract override val annotations: List abstract val expression: FirExpression override fun accept(visitor: FirVisitor, data: D): R = visitor.visitWrappedExpression(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt index 2f2c029fead..7b92a0a4817 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractFunctionCallBuilder.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirAbstractFunctionCallBuilder : FirQualifiedAccessBuilder, FirCallBuilder { - abstract override val annotations: MutableList + abstract override val annotations: MutableList abstract override val typeArguments: MutableList abstract override var explicitReceiver: FirExpression? abstract override var dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt index dec269b9b29..87619eab58b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAbstractResolvedQualifierBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.FqName interface FirAbstractResolvedQualifierBuilder { abstract var source: FirSourceElement? abstract var typeRef: FirTypeRef - abstract val annotations: MutableList + abstract val annotations: MutableList abstract var packageFqName: FqName abstract var relativeClassFqName: FqName? abstract var classId: ClassId? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt similarity index 76% rename from compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt rename to compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt index cd88fdbb6f3..bee1be3917b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAnnotationBuilder.kt @@ -10,13 +10,13 @@ import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolveStatus import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder -import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationCallImpl +import org.jetbrains.kotlin.fir.expressions.impl.FirAnnotationImpl import org.jetbrains.kotlin.fir.references.FirReference import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -27,17 +27,17 @@ import org.jetbrains.kotlin.fir.visitors.* */ @FirBuilderDsl -class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { +class FirAnnotationBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var calleeReference: FirReference var useSiteTarget: AnnotationUseSiteTarget? = null lateinit var annotationTypeRef: FirTypeRef var resolveStatus: FirAnnotationResolveStatus = FirAnnotationResolveStatus.Unresolved - override fun build(): FirAnnotationCall { - return FirAnnotationCallImpl( + override fun build(): FirAnnotation { + return FirAnnotationImpl( source, annotations, argumentList, @@ -49,7 +49,7 @@ class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, } - @Deprecated("Modification of 'typeRef' has no impact for FirAnnotationCallBuilder", level = DeprecationLevel.HIDDEN) + @Deprecated("Modification of 'typeRef' has no impact for FirAnnotationBuilder", level = DeprecationLevel.HIDDEN) override var typeRef: FirTypeRef get() = throw IllegalStateException() set(_) { @@ -58,9 +58,9 @@ class FirAnnotationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, } @OptIn(ExperimentalContracts::class) -inline fun buildAnnotationCall(init: FirAnnotationCallBuilder.() -> Unit): FirAnnotationCall { +inline fun buildAnnotation(init: FirAnnotationBuilder.() -> Unit): FirAnnotation { contract { callsInPlace(init, kotlin.contracts.InvocationKind.EXACTLY_ONCE) } - return FirAnnotationCallBuilder().apply(init).build() + return FirAnnotationBuilder().apply(init).build() } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt index fb369a3d27c..79af7e59789 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirArrayOfCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirArrayOfCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList override fun build(): FirArrayOfCall { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt index 85bd224bb73..a0200cdb4a3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAssignmentOperatorStatementBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAssignmentOperatorStatementBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var operation: FirOperation lateinit var leftArgument: FirExpression lateinit var rightArgument: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt index 4afe7b51eab..f2397dc73b3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirAugmentedArraySetCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirAugmentedArraySetCallBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var assignCall: FirFunctionCall lateinit var setGetBlock: FirBlock lateinit var operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt index 8a9ca9467ae..7b18aff4bbb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBinaryLogicExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.LogicOperationKind @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBinaryLogicExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var leftOperand: FirExpression lateinit var rightOperand: FirExpression lateinit var kind: LogicOperationKind diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt index 0f42d8c2c41..f4126badc65 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBlockBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() val statements: MutableList = mutableListOf() override fun build(): FirBlock { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt index 12773eef956..6b9532d3cd1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirBreakExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirBreakExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget override fun build(): FirBreakExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt index 1de4686606b..c2a6934f5f7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallBuilder.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCall import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirCallBuilder { abstract var source: FirSourceElement? - abstract val annotations: MutableList + abstract val annotations: MutableList abstract var argumentList: FirArgumentList fun build(): FirCall } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt index 91080b3f078..099569586e4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCallableReferenceAccessBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirCallableReferenceAccessBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt index 8679848ac6e..61530a68c96 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckNotNullCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirCheckNotNullCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var argumentList: FirArgumentList var calleeReference: FirReference = FirStubReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt index 5dd430fd83e..aa1e14d4b94 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirCheckedSafeCallSubjectBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirCheckedSafeCallSubjectBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var originalReceiverRef: FirExpressionRef override fun build(): FirCheckedSafeCallSubject { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt index 7647a3dceb4..68d65aeef0a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirClassReferenceExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirClassReferenceExpressionImpl @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirClassReferenceExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var classTypeRef: FirTypeRef override fun build(): FirClassReferenceExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt index de72efc12e9..70d2c7b82ca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComparisonExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirComparisonExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var operation: FirOperation lateinit var compareToCall: FirFunctionCall diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt index cd30c70ab7a..5a81029da74 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirComponentCallBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirComponentCall import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -37,7 +37,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirComponentCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() val typeArguments: MutableList = mutableListOf() var dispatchReceiver: FirExpression = FirNoReceiverExpression var extensionReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt index 70ead89e2b5..17ae956b128 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirContinueExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirContinueExpressionBuilder : FirLoopJumpBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var target: FirTarget override fun build(): FirContinueExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt index 5c5be506254..0e2dc3ea61d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDelegatedConstructorCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDelegatedConstructorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var constructedTypeRef: FirTypeRef var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt index 5b038ea9a60..1cfe0472742 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirDoWhileLoopBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDoWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var block: FirBlock override lateinit var condition: FirExpression override var label: FirLabel? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt index 9ebed55b7ff..9d93347fb03 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElseIfTrueConditionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirElseIfTrueCondition import org.jetbrains.kotlin.fir.fakeElement @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElseIfTrueConditionBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) override fun build(): FirExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt index 13f524589ba..4f2c9d09d33 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirElvisExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirElvisExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference lateinit var lhs: FirExpression lateinit var rhs: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt index 5accfcd5205..c060d6af7fb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEmptyExpressionBlockBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt index e08da49b7b9..dee48c0a79a 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirEqualityOperatorCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirEqualityOperatorCallBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var argumentList: FirArgumentList lateinit var operation: FirOperation diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt index 8cc6bdc2280..a554d02976d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var diagnostic: ConeDiagnostic var expression: FirExpression? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt index 21bf012bd05..28b7ac2fbac 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorLoopBuilder.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirErrorLoop import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirErrorLoopBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var label: FirLabel? = null lateinit var diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt index 23a4c000b6f..187f83fc878 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirErrorResolvedQualifierBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifierBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -31,7 +31,7 @@ import org.jetbrains.kotlin.name.FqName @FirBuilderDsl class FirErrorResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName override var relativeClassFqName: FqName? = null override var symbol: FirClassLikeSymbol<*>? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt index d47caa61df7..fa007416090 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionBuilder.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* interface FirExpressionBuilder { abstract var source: FirSourceElement? abstract var typeRef: FirTypeRef - abstract val annotations: MutableList + abstract val annotations: MutableList fun build(): FirExpression } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt index ff327fa0607..4bf04638494 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirExpressionStubBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirExpressionStub import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirExpressionStubBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) override fun build(): FirExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt index 5904dbc73a6..65e40dcf455 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirFunctionCallBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -36,7 +36,7 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirFunctionCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt index 33ee9d73421..724c8bc4234 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirGetClassCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirGetClassCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList override fun build(): FirGetClassCall { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt index 9c7c164f27d..8b0d454be06 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirImplicitInvokeCallBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -35,7 +35,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl open class FirImplicitInvokeCallBuilder : FirAbstractFunctionCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt index ee075bff24a..c5b4a696b78 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLambdaArgumentExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirLambdaArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression override fun build(): FirLambdaArgumentExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt index 9ae50a137f1..e6ca79b75b6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyBlockBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -36,7 +36,7 @@ class FirLazyBlockBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder @Deprecated("Modification of 'annotations' has no impact for FirLazyBlockBuilder", level = DeprecationLevel.HIDDEN) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() @Deprecated("Modification of 'typeRef' has no impact for FirLazyBlockBuilder", level = DeprecationLevel.HIDDEN) override var typeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt index 3c4fedc405e..b7c6cc1c138 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLazyExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirLazyExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -34,7 +34,7 @@ class FirLazyExpressionBuilder : FirAnnotationContainerBuilder { @Deprecated("Modification of 'annotations' has no impact for FirLazyExpressionBuilder", level = DeprecationLevel.HIDDEN) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt index c5d16402273..b3a21b910aa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLoop @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopBuilder { abstract var source: FirSourceElement? - abstract val annotations: MutableList + abstract val annotations: MutableList abstract var block: FirBlock abstract var condition: FirExpression abstract var label: FirLabel? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt index 6ac1963dbf9..876b33bc260 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirLoopJumpBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.expressions.FirLoopJump import org.jetbrains.kotlin.fir.visitors.* @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirLoopJumpBuilder { abstract var source: FirSourceElement? - abstract val annotations: MutableList + abstract val annotations: MutableList abstract var target: FirTarget fun build(): FirLoopJump } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt index 74628687c00..fbf10a6f1cf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirNamedArgumentExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.name.Name @FirBuilderDsl class FirNamedArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression var isSpread: Boolean by kotlin.properties.Delegates.notNull() lateinit var name: Name diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt index 6fc21995547..37c815eafe8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirPropertyAccessExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirPropertyAccessExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var calleeReference: FirReference override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt index 564a29e1928..b1edc823552 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirQualifiedAccessBuilder.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl interface FirQualifiedAccessBuilder { - abstract val annotations: MutableList + abstract val annotations: MutableList abstract val typeArguments: MutableList abstract var explicitReceiver: FirExpression? abstract var dispatchReceiver: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt index 27c687e3107..9e34c5c5ea7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedQualifierBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.expressions.builder.FirAbstractResolvedQualifierBuilder import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.name.FqName class FirResolvedQualifierBuilder : FirAbstractResolvedQualifierBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var packageFqName: FqName override var relativeClassFqName: FqName? = null override var symbol: FirClassLikeSymbol<*>? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt index 4a4f98bfd31..13b56847d39 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirResolvedReifiedParameterReferenceBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirResolvedReifiedParameterReferenceImpl @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirResolvedReifiedParameterReferenceBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var symbol: FirTypeParameterSymbol override fun build(): FirResolvedReifiedParameterReference { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt index a6e959599df..2ef43a1cddb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirReturnExpressionBuilder.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirReturnExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var target: FirTarget lateinit var result: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt index e0c9a6e8677..a9e12e55888 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSafeCallExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirSafeCallExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var receiver: FirExpression lateinit var checkedSubjectRef: FirExpressionRef lateinit var regularQualifiedAccess: FirQualifiedAccess diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt index 87f4eb85bc2..832c7d38df2 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirSpreadArgumentExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirSpreadArgumentExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression override fun build(): FirSpreadArgumentExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt index f1c44632369..77e48bc2524 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirStringConcatenationCallBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall import org.jetbrains.kotlin.fir.expressions.builder.FirCallBuilder @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirStringConcatenationCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override lateinit var argumentList: FirArgumentList override fun build(): FirStringConcatenationCall { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt index eaad5e4a7be..1b26827dc95 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThisReceiverExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -33,7 +33,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirThisReceiverExpressionBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() lateinit var calleeReference: FirThisReference diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt index 8b4f938e51a..60d7d331757 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirThrowExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -28,7 +28,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirThrowExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var exception: FirExpression override fun build(): FirThrowExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt index 95c588aed0e..5a72b66eb28 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTryExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch import org.jetbrains.kotlin.fir.expressions.FirTryExpression @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirTryExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference lateinit var tryBlock: FirBlock val catches: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt index f40a5b989dc..066ee53ddb4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirTypeOperatorCallBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEmptyArgumentList import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirTypeOperatorCallBuilder : FirCallBuilder, FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override var argumentList: FirArgumentList = FirEmptyArgumentList lateinit var operation: FirOperation lateinit var conversionTypeRef: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt index df034b25a3d..91cbbce82dc 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirUnitExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.impl.FirUnitExpression import org.jetbrains.kotlin.fir.fakeElement @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirUnitExpressionBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() @OptIn(FirImplementationDetail::class) override fun build(): FirExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt index 066ae3c33a9..4df6300b057 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVarargArgumentsExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -27,7 +27,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirVarargArgumentsExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() val arguments: MutableList = mutableListOf() lateinit var varargElementType: FirTypeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt index f78e64b9516..63d48570d9c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirVariableAssignmentBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment import org.jetbrains.kotlin.fir.expressions.builder.FirQualifiedAccessBuilder @@ -30,7 +30,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirVariableAssignmentBuilder : FirQualifiedAccessBuilder, FirAnnotationContainerBuilder { lateinit var calleeReference: FirReference - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val typeArguments: MutableList = mutableListOf() override var explicitReceiver: FirExpression? = null override var dispatchReceiver: FirExpression = FirNoReceiverExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt index bb4775c5d66..35af759276f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenExpressionBuilder.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch import org.jetbrains.kotlin.fir.expressions.FirWhenExpression @@ -32,7 +32,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirWhenExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var calleeReference: FirReference = FirStubReference var subject: FirExpression? = null var subjectVariable: FirVariable? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt index 2e374927c00..5cc5a858ff3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhenSubjectExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhenSubjectExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var whenRef: FirExpressionRef override fun build(): FirWhenSubjectExpression { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt index 17efe08b4ab..89fd7c696c4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWhileLoopBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhileLoop @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWhileLoopBuilder : FirLoopBuilder, FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override var label: FirLabel? = null override lateinit var condition: FirExpression override lateinit var block: FirBlock diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt index d5c11e7df39..44c08cfad92 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/builder/FirWrappedDelegateExpressionBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirWrappedDelegateExpressionBuilder : FirAnnotationContainerBuilder, FirExpressionBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var expression: FirExpression lateinit var delegateProvider: FirExpression diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt similarity index 87% rename from compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt rename to compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt index 4cf52c06e73..ef00deaa47b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAnnotationImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolveStatus import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.references.FirReference @@ -19,15 +19,15 @@ import org.jetbrains.kotlin.fir.visitors.* * DO NOT MODIFY IT MANUALLY */ -internal class FirAnnotationCallImpl( +internal class FirAnnotationImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, override var calleeReference: FirReference, override val useSiteTarget: AnnotationUseSiteTarget?, override var annotationTypeRef: FirTypeRef, override var resolveStatus: FirAnnotationResolveStatus, -) : FirAnnotationCall() { +) : FirAnnotation() { override val typeRef: FirTypeRef get() = annotationTypeRef override fun acceptChildren(visitor: FirVisitor, data: D) { @@ -37,7 +37,7 @@ internal class FirAnnotationCallImpl( annotationTypeRef.accept(visitor, data) } - override fun transformChildren(transformer: FirTransformer, data: D): FirAnnotationCallImpl { + override fun transformChildren(transformer: FirTransformer, data: D): FirAnnotationImpl { transformAnnotations(transformer, data) argumentList = argumentList.transform(transformer, data) transformCalleeReference(transformer, data) @@ -45,17 +45,17 @@ internal class FirAnnotationCallImpl( return this } - override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnnotationCallImpl { + override fun transformAnnotations(transformer: FirTransformer, data: D): FirAnnotationImpl { annotations.transformInplace(transformer, data) return this } - override fun transformCalleeReference(transformer: FirTransformer, data: D): FirAnnotationCallImpl { + override fun transformCalleeReference(transformer: FirTransformer, data: D): FirAnnotationImpl { calleeReference = calleeReference.transform(transformer, data) return this } - override fun transformAnnotationTypeRef(transformer: FirTransformer, data: D): FirAnnotationCallImpl { + override fun transformAnnotationTypeRef(transformer: FirTransformer, data: D): FirAnnotationImpl { annotationTypeRef = annotationTypeRef.transform(transformer, data) return this } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt index 8013273ce2b..1d13fe970c8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirArrayOfCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirArrayOfCall import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirArrayOfCallImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, ) : FirArrayOfCall() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt index 2384a97a934..d63af3692e7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAssignmentOperatorStatementImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAssignmentOperatorStatementImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val operation: FirOperation, override var leftArgument: FirExpression, override var rightArgument: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt index 4e0c2055266..66c263a35d8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirAugmentedArraySetCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAugmentedArraySetCall import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirAugmentedArraySetCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var assignCall: FirFunctionCall, override var setGetBlock: FirBlock, override val operation: FirOperation, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt index 6e86edd7ec2..5f96bd94179 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBinaryLogicExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBinaryLogicExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.LogicOperationKind @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBinaryLogicExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var leftOperand: FirExpression, override var rightOperand: FirExpression, override val kind: LogicOperationKind, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt index 1867c0b8964..ffcdf466620 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBlockImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBlockImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val statements: MutableList, ) : FirBlock() { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt index 10cc9398bc9..4e5e73a3941 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirBreakExpressionImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBreakExpression import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.fakeElement @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirBreakExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val target: FirTarget, ) : FirBreakExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt index cd25654506d..f84cf94d745 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCallableReferenceAccessImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCallableReferenceAccess import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirNamedReference @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirCallableReferenceAccessImpl( override var source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt index 9a4186c9b63..f8b155902aa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckNotNullCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCheckNotNullCall import org.jetbrains.kotlin.fir.references.FirReference @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirCheckNotNullCallImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, override var calleeReference: FirReference, ) : FirCheckNotNullCall() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt index 7fd85da354f..e120d2c4b91 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirCheckedSafeCallSubjectImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirCheckedSafeCallSubjectImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val originalReceiverRef: FirExpressionRef, ) : FirCheckedSafeCallSubject() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt index fae82be4c24..0747375b482 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirClassReferenceExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirClassReferenceExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirClassReferenceExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var classTypeRef: FirTypeRef, ) : FirClassReferenceExpression() { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt index cbacdbf42c4..2d011bfb4fe 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComparisonExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirComparisonExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val operation: FirOperation, override var compareToCall: FirFunctionCall, ) : FirComparisonExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt index 5cd609def35..25c9df1542b 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirComponentCallImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirComponentCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -29,7 +29,7 @@ import org.jetbrains.kotlin.fir.visitors.* @OptIn(FirImplementationDetail::class) internal class FirComponentCallImpl( override var source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var dispatchReceiver: FirExpression, override var extensionReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt index 34977f703ba..3e3ecad9535 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirConstExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirConstExpressionImpl ( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var kind: ConstantValueKind, override val value: T, ) : FirConstExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt index b9beebfad5e..1c98531879f 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirContinueExpressionImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirContinueExpression import org.jetbrains.kotlin.fir.expressions.FirLoop import org.jetbrains.kotlin.fir.fakeElement @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirContinueExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val target: FirTarget, ) : FirContinueExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt index 090cce529b2..296c8e05fbf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDelegatedConstructorCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirDelegatedConstructorCall import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDelegatedConstructorCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, override var constructedTypeRef: FirTypeRef, override var dispatchReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt index 6f190664203..616b26fb5be 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirDoWhileLoopImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirDoWhileLoop import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDoWhileLoopImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var block: FirBlock, override var condition: FirExpression, override var label: FirLabel?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt index 9af3ce9497c..908cf257b54 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElseIfTrueCondition.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirElseIfTrueCondition @FirImplementationDetail constructor( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, ) : FirExpression() { override var typeRef: FirTypeRef = FirImplicitBooleanTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt index d361f0ec28d..6d3354eb4ad 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirElvisExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirElvisExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirReference @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirElvisExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var calleeReference: FirReference, override var lhs: FirExpression, override var rhs: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt index 79fbd3f72f1..0b7f0bf53fb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEmptyExpressionBlock.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirEmptyExpressionBlock : FirBlock() { override val source: FirSourceElement? get() = null - override val annotations: List get() = emptyList() + override val annotations: List get() = emptyList() override val statements: List get() = emptyList() override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt index c3e586c5fd9..3e1f738eec4 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirEqualityOperatorCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirEqualityOperatorCall import org.jetbrains.kotlin.fir.expressions.FirOperation @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirEqualityOperatorCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, override val operation: FirOperation, ) : FirEqualityOperatorCall() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt index 13a0b9be147..e1ea6395da8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorExpressionImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val diagnostic: ConeDiagnostic, override var expression: FirExpression?, ) : FirErrorExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt index eade9129018..43bcc1c7313 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorLoopImpl.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.ConeStubDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirErrorLoop import org.jetbrains.kotlin.fir.expressions.FirExpression @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorLoopImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var label: FirLabel?, override val diagnostic: ConeDiagnostic, ) : FirErrorLoop() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt index e10279fb906..698ba3c3dfa 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirErrorResolvedQualifierImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirErrorResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirErrorResolvedQualifierImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val packageFqName: FqName, override val relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt index c9f69125b07..7aaf53c9c5d 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionStub.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirExpressionStub @FirImplementationDetail constructor( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, ) : FirExpression() { override fun acceptChildren(visitor: FirVisitor, data: D) { typeRef.accept(visitor, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt index df0bb963cd5..e3422fca5c1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirFunctionCallImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCall @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.visitors.* open class FirFunctionCallImpl @FirImplementationDetail constructor( override var source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt index 79fe8890c46..1c4166f3091 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirGetClassCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirGetClassCall @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirGetClassCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, ) : FirGetClassCall() { override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt index 64fb7c66003..281844a3bae 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirImplicitInvokeCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirFunctionCallOrigin @@ -26,7 +26,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirImplicitInvokeCallImpl( override var source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt index 51a0d9ca4a3..92d71ccac45 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLambdaArgumentExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirLambdaArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirLambdaArgumentExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var expression: FirExpression, ) : FirLambdaArgumentExpression() { override val typeRef: FirTypeRef get() = expression.typeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt index 6bf22535338..d189334fd16 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyBlock.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirLazyBlock @FirImplementationDetail constructor( override val source: FirSourceElement?, ) : FirBlock() { - override val annotations: List get() = error("FirLazyBlock should be calculated before accessing") + override val annotations: List get() = error("FirLazyBlock should be calculated before accessing") override val statements: List get() = error("FirLazyBlock should be calculated before accessing") override val typeRef: FirTypeRef get() = error("FirLazyBlock should be calculated before accessing") diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt index deb177a5057..92a4b5e5eea 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirLazyExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -21,7 +21,7 @@ class FirLazyExpression @FirImplementationDetail constructor( override val source: FirSourceElement?, ) : FirExpression() { override val typeRef: FirTypeRef get() = error("FirLazyExpression should be calculated before accessing") - override val annotations: List get() = error("FirLazyExpression should be calculated before accessing") + override val annotations: List get() = error("FirLazyExpression should be calculated before accessing") override fun acceptChildren(visitor: FirVisitor, data: D) { } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt index 5bf37aaba6c..80fb149c3b1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirNamedArgumentExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirNamedArgumentExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var expression: FirExpression, override val isSpread: Boolean, override val name: Name, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt index 7f3e62e4902..cb7b401d2f7 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirPropertyAccessExpressionImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirPropertyAccessExpression import org.jetbrains.kotlin.fir.references.FirReference @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirPropertyAccessExpressionImpl @FirImplementationDetail constructor( override var source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var calleeReference: FirReference, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt index 6206fa87cf8..77ce58beb90 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedQualifierImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedQualifier import org.jetbrains.kotlin.fir.symbols.impl.FirClassLikeSymbol import org.jetbrains.kotlin.fir.types.FirTypeProjection @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedQualifierImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var packageFqName: FqName, override var relativeClassFqName: FqName?, override val symbol: FirClassLikeSymbol<*>?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt index 4568eb2d23b..ee602310cc0 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirResolvedReifiedParameterReferenceImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirResolvedReifiedParameterReference import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirResolvedReifiedParameterReferenceImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val symbol: FirTypeParameterSymbol, ) : FirResolvedReifiedParameterReference() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt index 528f0d0cf76..bef02abf7cb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirReturnExpressionImpl.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.FirTarget import org.jetbrains.kotlin.fir.declarations.FirFunction -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirReturnExpression import org.jetbrains.kotlin.fir.fakeElement @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirReturnExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val target: FirTarget, override var result: FirExpression, ) : FirReturnExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt index 5d4f4a170ce..3909e89de16 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSafeCallExpressionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirCheckedSafeCallSubject import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccess @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSafeCallExpressionImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var receiver: FirExpression, override val checkedSubjectRef: FirExpressionRef, override var regularQualifiedAccess: FirQualifiedAccess, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt index 11a01451d00..f44a5b13f01 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirSpreadArgumentExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirSpreadArgumentExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirSpreadArgumentExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var expression: FirExpression, ) : FirSpreadArgumentExpression() { override val typeRef: FirTypeRef get() = expression.typeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt index 427a21811f2..182084733b3 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirStringConcatenationCallImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirStringConcatenationCall import org.jetbrains.kotlin.fir.fakeElement @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirStringConcatenationCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, ) : FirStringConcatenationCall() { override var typeRef: FirTypeRef = FirImplicitStringTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt index e5b3ed386c7..d37261f18bb 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThisReceiverExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThisReceiverExpression import org.jetbrains.kotlin.fir.expressions.impl.FirNoReceiverExpression @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirThisReceiverExpressionImpl( override var source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var calleeReference: FirThisReference, ) : FirThisReceiverExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt index 7f846fb6c76..42a54ef81af 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirThrowExpressionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirThrowExpression import org.jetbrains.kotlin.fir.fakeElement @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirThrowExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var exception: FirExpression, ) : FirThrowExpression() { override var typeRef: FirTypeRef = FirImplicitNothingTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt index b048d089556..c76a86df289 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTryExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirCatch import org.jetbrains.kotlin.fir.expressions.FirTryExpression @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTryExpressionImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var calleeReference: FirReference, override var tryBlock: FirBlock, override val catches: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt index aafb6f1c306..3ab0f5a6707 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirTypeOperatorCallImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirOperation import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirTypeOperatorCallImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var argumentList: FirArgumentList, override val operation: FirOperation, override var conversionTypeRef: FirTypeRef, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt index d56db382c4f..7626a40e01e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirUnitExpression.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.fakeElement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirUnitExpression @FirImplementationDetail constructor( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, ) : FirExpression() { override var typeRef: FirTypeRef = FirImplicitUnitTypeRef(source?.fakeElement(FirFakeSourceElementKind.ImplicitTypeRef)) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt index ae8f3c6a6ba..4c98ece79e8 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVarargArgumentsExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVarargArgumentsExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirVarargArgumentsExpressionImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override val arguments: MutableList, override var varargElementType: FirTypeRef, ) : FirVarargArgumentsExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt index 99437bc949b..0ac9b327611 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirVariableAssignmentImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirVariableAssignment import org.jetbrains.kotlin.fir.references.FirReference @@ -23,7 +23,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail internal class FirVariableAssignmentImpl( override var calleeReference: FirReference, - override val annotations: MutableList, + override val annotations: MutableList, override val typeArguments: MutableList, override var explicitReceiver: FirExpression?, override var dispatchReceiver: FirExpression, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt index 69cec83bf4f..ac7898049ef 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenExpressionImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirVariable import org.jetbrains.kotlin.fir.expressions.ExhaustivenessStatus -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhenBranch import org.jetbrains.kotlin.fir.expressions.FirWhenExpression @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhenExpressionImpl( override val source: FirSourceElement?, override var typeRef: FirTypeRef, - override val annotations: MutableList, + override val annotations: MutableList, override var calleeReference: FirReference, override var subject: FirExpression?, override var subjectVariable: FirVariable?, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt index ba475d3daf4..ef16838a96c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhenSubjectExpressionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirExpressionRef import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirWhenExpression import org.jetbrains.kotlin.fir.expressions.FirWhenSubjectExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhenSubjectExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val whenRef: FirExpressionRef, ) : FirWhenSubjectExpression() { override val typeRef: FirTypeRef get() = whenRef.value.subject!!.typeRef diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt index add3606c7e8..ac8a1f917b6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWhileLoopImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirLabel import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWhileLoop @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWhileLoopImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var label: FirLabel?, override var condition: FirExpression, override var block: FirBlock, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt index 8bce6763e13..43caadc8f21 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/expressions/impl/FirWrappedDelegateExpressionImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirWrappedDelegateExpression import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirWrappedDelegateExpressionImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override var expression: FirExpression, override var delegateProvider: FirExpression, ) : FirWrappedDelegateExpression() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt index 10f9817279b..7ba8519f7c6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirDynamicTypeRef.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirDynamicTypeRef : FirTypeRefWithNullability() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val isMarkedNullable: Boolean override fun accept(visitor: FirVisitor, data: D): R = visitor.visitDynamicTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt index 7273cda48dd..5323e66265e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirErrorTypeRef.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic import org.jetbrains.kotlin.fir.diagnostics.FirDiagnosticHolder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirErrorTypeRef : FirResolvedTypeRef(), FirDiagnosticHolder { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val type: ConeKotlinType abstract override val delegatedTypeRef: FirTypeRef? abstract override val diagnostic: ConeDiagnostic diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt index c8516077020..8efec00013e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirFunctionTypeRef.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirFunctionTypeRef : FirTypeRefWithNullability() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val isMarkedNullable: Boolean abstract val receiverTypeRef: FirTypeRef? abstract val valueParameters: List diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt index 21de4966b0b..e7fefd41364 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirImplicitTypeRef.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirImplicitTypeRef : FirTypeRef() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitImplicitTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt index 2ede606c0d2..8987a848bdf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirResolvedTypeRef.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirResolvedTypeRef : FirTypeRef() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val type: ConeKotlinType abstract val delegatedTypeRef: FirTypeRef? diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt index f27fd948b88..c0ec03f0042 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRef.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirAnnotationContainer import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* sealed class FirTypeRef : FirPureAbstractElement(), FirAnnotationContainer { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeRef(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt index 4032b5263b4..50f7e5b9ab6 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirTypeRefWithNullability.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirTypeRefWithNullability : FirTypeRef() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract val isMarkedNullable: Boolean override fun accept(visitor: FirVisitor, data: D): R = visitor.visitTypeRefWithNullability(this, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt index ecabbd62369..b82b00e0642 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/FirUserTypeRef.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.visitors.* /* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* abstract class FirUserTypeRef : FirTypeRefWithNullability() { abstract override val source: FirSourceElement? - abstract override val annotations: List + abstract override val annotations: List abstract override val isMarkedNullable: Boolean abstract val qualifier: List abstract val customRenderer: Boolean diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt index f7a539b863a..4b972ed5aca 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirDynamicTypeRefBuilder.kt @@ -9,7 +9,7 @@ import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.types.impl.FirDynamicTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* @@ -22,7 +22,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirDynamicTypeRefBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() override fun build(): FirDynamicTypeRef { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt index 5b967ddfdd4..c1356577dcf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirErrorTypeRefBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirErrorTypeRef @@ -39,7 +39,7 @@ class FirErrorTypeRefBuilder : FirAnnotationContainerBuilder { @Deprecated("Modification of 'annotations' has no impact for FirErrorTypeRefBuilder", level = DeprecationLevel.HIDDEN) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() } @OptIn(ExperimentalContracts::class) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt index db007ce7c6d..318a7b3c0f1 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirFunctionTypeRefBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirFunctionTypeRefImpl @@ -24,7 +24,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirFunctionTypeRefBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() var receiverTypeRef: FirTypeRef? = null val valueParameters: MutableList = mutableListOf() diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt index 099d172aff1..3bb66fcdb90 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirImplicitTypeRefBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types.builder import kotlin.contracts.* import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl import org.jetbrains.kotlin.fir.visitors.* diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt index 17460dbc630..abe96851559 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/builder/FirResolvedTypeRefBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -25,7 +25,7 @@ import org.jetbrains.kotlin.fir.visitors.* @FirBuilderDsl class FirResolvedTypeRefBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() lateinit var type: ConeKotlinType var delegatedTypeRef: FirTypeRef? = null diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt index e3079c8ddb3..d1e40d642ec 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirDynamicTypeRefImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirDynamicTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirDynamicTypeRefImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val isMarkedNullable: Boolean, ) : FirDynamicTypeRef() { override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt index 0a1f8d570cd..c814e42159c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirErrorTypeRefImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeClassErrorType import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirErrorTypeRef @@ -24,7 +24,7 @@ internal class FirErrorTypeRefImpl( override var delegatedTypeRef: FirTypeRef?, override val diagnostic: ConeDiagnostic, ) : FirErrorTypeRef() { - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val type: ConeKotlinType = ConeClassErrorType(diagnostic) override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt index ae2afb31fb4..8616196205e 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirFunctionTypeRefImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirValueParameter -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirFunctionTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -19,7 +19,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirFunctionTypeRefImpl( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val isMarkedNullable: Boolean, override var receiverTypeRef: FirTypeRef?, override val valueParameters: MutableList, diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt index 86a29ec3e89..5c5028a2a84 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirImplicitTypeRefImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirImplicitTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -18,7 +18,7 @@ import org.jetbrains.kotlin.fir.visitors.* internal class FirImplicitTypeRefImpl( override val source: FirSourceElement?, ) : FirImplicitTypeRef() { - override val annotations: List get() = emptyList() + override val annotations: List get() = emptyList() override fun acceptChildren(visitor: FirVisitor, data: D) { } diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt index 640f811ff4f..3bb6781b915 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/types/impl/FirResolvedTypeRefImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.ConeKotlinType import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -20,7 +20,7 @@ import org.jetbrains.kotlin.fir.visitors.* class FirResolvedTypeRefImpl @FirImplementationDetail constructor( override val source: FirSourceElement?, - override val annotations: MutableList, + override val annotations: MutableList, override val type: ConeKotlinType, override var delegatedTypeRef: FirTypeRef?, ) : FirResolvedTypeRef() { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt index bde4a259cff..bda55c2484c 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirTransformer.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement @@ -401,8 +401,8 @@ abstract class FirTransformer : FirVisitor() { return transformElement(call, data) } - open fun transformAnnotationCall(annotationCall: FirAnnotationCall, data: D): FirStatement { - return transformElement(annotationCall, data) + open fun transformAnnotation(annotation: FirAnnotation, data: D): FirStatement { + return transformElement(annotation, data) } open fun transformComparisonExpression(comparisonExpression: FirComparisonExpression, data: D): FirStatement { @@ -921,8 +921,8 @@ abstract class FirTransformer : FirVisitor() { return transformCall(call, data) } - final override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: D): FirStatement { - return transformAnnotationCall(annotationCall, data) + final override fun visitAnnotation(annotation: FirAnnotation, data: D): FirStatement { + return transformAnnotation(annotation, data) } final override fun visitComparisonExpression(comparisonExpression: FirComparisonExpression, data: D): FirStatement { diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt index edc4587e4c3..9b5aba2eedf 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitor.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement @@ -272,7 +272,7 @@ abstract class FirVisitor { open fun visitCall(call: FirCall, data: D): R = visitElement(call, data) - open fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: D): R = visitElement(annotationCall, data) + open fun visitAnnotation(annotation: FirAnnotation, data: D): R = visitElement(annotation, data) open fun visitComparisonExpression(comparisonExpression: FirComparisonExpression, data: D): R = visitElement(comparisonExpression, data) diff --git a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt index aadd0ce937e..3f51710ec47 100644 --- a/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt +++ b/compiler/fir/tree/gen/org/jetbrains/kotlin/fir/visitors/FirVisitorVoid.kt @@ -70,7 +70,7 @@ import org.jetbrains.kotlin.fir.types.FirStarProjection import org.jetbrains.kotlin.fir.types.FirTypeProjectionWithVariance import org.jetbrains.kotlin.fir.expressions.FirArgumentList import org.jetbrains.kotlin.fir.expressions.FirCall -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirComparisonExpression import org.jetbrains.kotlin.fir.expressions.FirTypeOperatorCall import org.jetbrains.kotlin.fir.expressions.FirAssignmentOperatorStatement @@ -400,8 +400,8 @@ abstract class FirVisitorVoid : FirVisitor() { visitElement(call) } - open fun visitAnnotationCall(annotationCall: FirAnnotationCall) { - visitElement(annotationCall) + open fun visitAnnotation(annotation: FirAnnotation) { + visitElement(annotation) } open fun visitComparisonExpression(comparisonExpression: FirComparisonExpression) { @@ -920,8 +920,8 @@ abstract class FirVisitorVoid : FirVisitor() { visitCall(call) } - final override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: Nothing?) { - visitAnnotationCall(annotationCall) + final override fun visitAnnotation(annotation: FirAnnotation, data: Nothing?) { + visitAnnotation(annotation) } final override fun visitComparisonExpression(comparisonExpression: FirComparisonExpression, data: Nothing?) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt index 9341f611093..cb1056a60b3 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/FirRenderer.kt @@ -200,10 +200,10 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM annotationContainer.annotations.renderAnnotations() } - private fun List.renderAnnotations() { + private fun List.renderAnnotations() { if (!mode.renderAnnotation) return for (annotation in this) { - visitAnnotationCall(annotation) + visitAnnotation(annotation) } } @@ -938,15 +938,15 @@ class FirRenderer(builder: StringBuilder, private val mode: RenderMode = RenderM print(")") } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall) { + override fun visitAnnotation(annotation: FirAnnotation) { print("@") - annotationCall.useSiteTarget?.let { + annotation.useSiteTarget?.let { print(it.name) print(":") } - annotationCall.annotationTypeRef.accept(this) - visitCall(annotationCall) - if (annotationCall.useSiteTarget == AnnotationUseSiteTarget.FILE) { + annotation.annotationTypeRef.accept(this) + visitCall(annotation) + if (annotation.useSiteTarget == AnnotationUseSiteTarget.FILE) { println() } else { print(" ") diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt index baa730afad4..997222d854d 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/impl/FirDefaultPropertyBackingField.kt @@ -12,7 +12,7 @@ import org.jetbrains.kotlin.fir.declarations.FirDeclarationAttributes import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirDeclarationStatus import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.symbols.impl.FirBackingFieldSymbol import org.jetbrains.kotlin.fir.symbols.impl.FirPropertySymbol import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -21,7 +21,7 @@ import org.jetbrains.kotlin.name.CallableId @OptIn(FirImplementationDetail::class) class FirDefaultPropertyBackingField( moduleData: FirModuleData, - annotations: MutableList, + annotations: MutableList, returnTypeRef: FirTypeRef, isVar: Boolean, propertySymbol: FirPropertySymbol, diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt index 1e358dcd186..321e97f275b 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticProperty.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.declarations.synthetic import org.jetbrains.kotlin.fir.FirModuleData import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirAccessorSymbol @@ -67,7 +67,7 @@ class FirSyntheticProperty( override val isVal: Boolean get() = !isVar - override val annotations: List + override val annotations: List get() = emptyList() override val typeParameters: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt index 94f9bcb5cba..bebd2b0c8f0 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/declarations/synthetic/FirSyntheticPropertyAccessor.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.contracts.FirContractDescription import org.jetbrains.kotlin.fir.contracts.impl.FirEmptyContractDescription import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.impl.FirPropertyAccessorImpl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.references.FirControlFlowGraphReference import org.jetbrains.kotlin.fir.symbols.impl.FirPropertyAccessorSymbol @@ -56,7 +56,7 @@ class FirSyntheticPropertyAccessor( override val valueParameters: List get() = delegate.valueParameters - override val annotations: List + override val annotations: List get() = delegate.annotations override val typeParameters: List diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt index 93f0a709c86..7b3549e2c53 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/FirExpressionUtil.kt @@ -25,10 +25,10 @@ import org.jetbrains.kotlin.fir.visitors.transformInplace import org.jetbrains.kotlin.name.ClassId import org.jetbrains.kotlin.types.ConstantValueKind -inline val FirAnnotationCall.coneClassLikeType: ConeClassLikeType? +inline val FirAnnotation.coneClassLikeType: ConeClassLikeType? get() = ((annotationTypeRef as? FirResolvedTypeRef)?.type as? ConeClassLikeType) -inline val FirAnnotationCall.classId: ClassId? +inline val FirAnnotation.classId: ClassId? get() = coneClassLikeType?.lookupTag?.classId fun buildConstOrErrorExpression(source: FirSourceElement?, kind: ConstantValueKind, value: T?, diagnostic: ConeDiagnostic): FirExpression = diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt index ba2bdccd20b..eccd36d3fe5 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousFunctionExpressionBuilder.kt @@ -10,7 +10,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression import org.jetbrains.kotlin.fir.expressions.builder.FirExpressionBuilder import org.jetbrains.kotlin.fir.expressions.impl.FirAnonymousFunctionExpressionImpl @@ -39,7 +39,7 @@ class FirAnonymousFunctionExpressionBuilder : FirAnnotationContainerBuilder, Fir } @Deprecated("Modification of 'annotations' has no impact for FirAnonymousFunctionExpressionBuilder", level = DeprecationLevel.HIDDEN) - override val annotations: MutableList + override val annotations: MutableList get() = throw IllegalStateException() } diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt index f33a0a6aa6b..32c800fa759 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirAnonymousObjectExpressionBuilder.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression import org.jetbrains.kotlin.fir.expressions.impl.FirAnonymousObjectExpressionImpl import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -23,7 +23,7 @@ class FirAnonymousObjectExpressionBuilder : FirAnnotationContainerBuilder, FirEx override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) lateinit var anonymousObject: FirAnonymousObject - override val annotations: MutableList + override val annotations: MutableList get() = error("Should not be called") override fun build(): FirAnonymousObjectExpression { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt index ecece802ee2..2d6d7b80b06 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/builder/FirConstExpressionBuilder.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.expressions.builder import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.impl.FirConstExpressionImpl import org.jetbrains.kotlin.fir.types.impl.* @@ -16,7 +16,7 @@ fun buildConstExpression( source: FirSourceElement?, kind: ConstantValueKind, value: T, - annotations: MutableList = mutableListOf(), + annotations: MutableList = mutableListOf(), setType: Boolean = false ): FirConstExpression { return FirConstExpressionImpl(source, annotations, kind, value).also { @@ -32,4 +32,4 @@ fun buildConstExpression( } } } -} \ No newline at end of file +} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt index 279bb6323cd..8da15f227d2 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousFunctionExpressionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousFunction -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousFunctionExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl @@ -20,7 +20,7 @@ internal class FirAnonymousFunctionExpressionImpl( override val typeRef: FirTypeRef get() = anonymousFunction.typeRef - override val annotations: List + override val annotations: List get() = anonymousFunction.annotations override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt index ccfa9194235..aa4a7b982ee 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirAnonymousObjectExpressionImpl.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.declarations.FirAnonymousObject -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnonymousObjectExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.visitors.* @@ -22,7 +22,7 @@ internal class FirAnonymousObjectExpressionImpl( override var typeRef: FirTypeRef, override var anonymousObject: FirAnonymousObject, ) : FirAnonymousObjectExpression() { - override val annotations: List + override val annotations: List get() = anonymousObject.annotations override fun acceptChildren(visitor: FirVisitor, data: D) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt index a024e8fa1cf..a981bac5a26 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -33,7 +33,7 @@ internal class FirExpressionWithSmartcastImpl( } override val source: FirSourceElement? get() = originalExpression.source - override val annotations: List get() = originalExpression.annotations + override val annotations: List get() = originalExpression.annotations override val typeArguments: List get() = originalExpression.typeArguments override val explicitReceiver: FirExpression? get() = originalExpression.explicitReceiver override val dispatchReceiver: FirExpression get() = originalExpression.dispatchReceiver diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt index edc3f6f4aee..642982d38fa 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirExpressionWithSmartcastToNullImpl.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirImplementationDetail import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.diagnostics.ConeDiagnostic -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcastToNull import org.jetbrains.kotlin.fir.expressions.FirQualifiedAccessExpression @@ -34,7 +34,7 @@ class FirExpressionWithSmartcastToNullImpl( } override val source: FirSourceElement? get() = originalExpression.source - override val annotations: List get() = originalExpression.annotations + override val annotations: List get() = originalExpression.annotations override val typeArguments: List get() = originalExpression.typeArguments override val explicitReceiver: FirExpression? get() = originalExpression.explicitReceiver override val dispatchReceiver: FirExpression get() = originalExpression.dispatchReceiver diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt index fecf4e1865b..c24f631fd17 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirNoReceiverExpression.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirTypeRef import org.jetbrains.kotlin.fir.types.impl.FirImplicitTypeRefImpl @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.visitors.FirVisitor object FirNoReceiverExpression : FirExpression() { override val source: FirSourceElement? = null override val typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) - override val annotations: List get() = emptyList() + override val annotations: List get() = emptyList() override fun acceptChildren(visitor: FirVisitor, data: D) {} @@ -30,4 +30,4 @@ object FirNoReceiverExpression : FirExpression() { } override fun replaceTypeRef(newTypeRef: FirTypeRef) {} -} \ No newline at end of file +} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt index 11b2236f958..6b5d3b0b6c9 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirSingleExpressionBlock.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.types.FirTypeRef @@ -23,7 +23,7 @@ class FirSingleExpressionBlock( ) : FirBlock() { override val source: FirSourceElement? get() = statement.source?.fakeElement(FirFakeSourceElementKind.SingleExpressionBlock) - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() override val statements: List get() = listOf(statement) override var typeRef: FirTypeRef = FirImplicitTypeRefImpl(null) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt index bfad41033d5..da1fb5865f8 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/expressions/impl/FirStubStatement.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.expressions.impl import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirPureAbstractElement import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirStatement import org.jetbrains.kotlin.fir.visitors.FirTransformer import org.jetbrains.kotlin.fir.visitors.FirVisitor @@ -17,7 +17,7 @@ object FirStubStatement : FirPureAbstractElement(), FirStatement { override val source: FirSourceElement? get() = null - override val annotations: List + override val annotations: List get() = emptyList() override fun transformAnnotations(transformer: FirTransformer, data: D): FirStatement { @@ -29,4 +29,4 @@ object FirStubStatement : FirPureAbstractElement(), FirStatement { override fun transformChildren(transformer: FirTransformer, data: D): FirElement { return this } -} \ No newline at end of file +} diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt index c7b4dca855d..7767e582c79 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/symbols/impl/FirCallableSymbol.kt @@ -6,7 +6,6 @@ package org.jetbrains.kotlin.fir.symbols.impl import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall import org.jetbrains.kotlin.fir.symbols.FirBasedSymbol import org.jetbrains.kotlin.fir.symbols.ensureResolved import org.jetbrains.kotlin.fir.types.* diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt index 25b6dd2b5d5..04fdd602a09 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/CustomAnnotationTypeAttribute.kt @@ -5,11 +5,11 @@ package org.jetbrains.kotlin.fir.types -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.render import kotlin.reflect.KClass -class CustomAnnotationTypeAttribute(val annotations: List) : ConeAttribute() { +class CustomAnnotationTypeAttribute(val annotations: List) : ConeAttribute() { override fun union(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute? = null override fun intersect(other: CustomAnnotationTypeAttribute?): CustomAnnotationTypeAttribute? = null @@ -24,4 +24,4 @@ class CustomAnnotationTypeAttribute(val annotations: List) : private val ConeAttributes.custom: CustomAnnotationTypeAttribute? by ConeAttributes.attributeAccessor() -val ConeAttributes.customAnnotations: List get() = custom?.annotations.orEmpty() +val ConeAttributes.customAnnotations: List get() = custom?.annotations.orEmpty() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt index 54699ef3368..0e298b89367 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/FirTypeUtils.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types import org.jetbrains.kotlin.builtins.functions.FunctionClassKind -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirExpressionWithSmartcast @@ -82,8 +82,8 @@ val FirFunctionTypeRef.parametersCount: Int val EXTENSION_FUNCTION_ANNOTATION = ClassId.fromString("kotlin/ExtensionFunctionType") -val FirAnnotationCall.isExtensionFunctionAnnotationCall: Boolean - get() = (this as? FirAnnotationCall)?.let { annotationCall -> +val FirAnnotation.isExtensionFunctionAnnotationCall: Boolean + get() = (this as? FirAnnotation)?.let { annotationCall -> (annotationCall.annotationTypeRef as? FirResolvedTypeRef)?.let { typeRef -> (typeRef.type as? ConeClassLikeType)?.let { it.lookupTag.classId == EXTENSION_FUNCTION_ANNOTATION @@ -92,7 +92,7 @@ val FirAnnotationCall.isExtensionFunctionAnnotationCall: Boolean } == true -fun List.dropExtensionFunctionAnnotation(): List { +fun List.dropExtensionFunctionAnnotation(): List { return filterNot { it.isExtensionFunctionAnnotationCall } } @@ -109,12 +109,12 @@ fun ConeClassLikeType.toConstKind(): ConstantValueKind<*>? = when (lookupTag.cla else -> null } -fun List.computeTypeAttributes( +fun List.computeTypeAttributes( additionalProcessor: MutableList>.(ClassId) -> Unit = {} ): ConeAttributes { if (this.isEmpty()) return ConeAttributes.Empty val attributes = mutableListOf>() - val customAnnotations = mutableListOf() + val customAnnotations = mutableListOf() for (annotation in this) { val type = annotation.annotationTypeRef.coneTypeSafe() ?: continue when (val classId = type.lookupTag.classId) { diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt index d145cbe18df..51a2c93a18a 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/builder/FirUserTypeRefBuilder.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types.builder import org.jetbrains.kotlin.fir.FirSourceElement import org.jetbrains.kotlin.fir.builder.FirAnnotationContainerBuilder import org.jetbrains.kotlin.fir.builder.FirBuilderDsl -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirUserTypeRef import org.jetbrains.kotlin.fir.types.impl.FirUserTypeRefImpl @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.fir.types.impl.FirUserTypeRefImpl @FirBuilderDsl open class FirUserTypeRefBuilder : FirAnnotationContainerBuilder { override var source: FirSourceElement? = null - override val annotations: MutableList = mutableListOf() + override val annotations: MutableList = mutableListOf() open var isMarkedNullable: Boolean by kotlin.properties.Delegates.notNull() val qualifier: MutableList = mutableListOf() diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt index b15113b8b30..edade9ccc5f 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirImplicitBuiltinTypeRef.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirFakeSourceElementKind import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.name.StandardClassIds import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.types.ConeClassLikeType @@ -26,7 +26,7 @@ sealed class FirImplicitBuiltinTypeRef( typeArguments: Array = emptyArray(), isNullable: Boolean = false ) : FirResolvedTypeRef() { - override val annotations: List + override val annotations: List get() = emptyList() override val type: ConeClassLikeType = ConeClassLikeTypeImpl(ConeClassLikeLookupTagImpl(id), typeArguments, isNullable) diff --git a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt index 1d0011a6c64..9dad5d0a4d3 100644 --- a/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt +++ b/compiler/fir/tree/src/org/jetbrains/kotlin/fir/types/impl/FirUserTypeRefImpl.kt @@ -6,7 +6,7 @@ package org.jetbrains.kotlin.fir.types.impl import org.jetbrains.kotlin.fir.FirSourceElement -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.types.FirQualifierPart import org.jetbrains.kotlin.fir.types.FirTypeProjection import org.jetbrains.kotlin.fir.types.FirUserTypeRef @@ -18,7 +18,7 @@ class FirUserTypeRefImpl( override var source: FirSourceElement?, override val isMarkedNullable: Boolean, override val qualifier: MutableList, - override val annotations: MutableList + override val annotations: MutableList ) : FirUserTypeRef() { override val customRenderer: Boolean get() = false diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt index 8e37757c39b..05a5d154673 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/BuilderConfigurator.kt @@ -108,7 +108,7 @@ object BuilderConfigurator : AbstractBuilderConfigurator(FirTree withCopy() } - builder(annotationCall) { + builder(annotation) { parents += callBuilder default("argumentList") { value = "FirEmptyArgumentList" diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt index 1e62cefe130..845cd7c5b78 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FieldSets.kt @@ -5,7 +5,7 @@ package org.jetbrains.kotlin.fir.tree.generator -import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotationCall +import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.annotation import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.block import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.controlFlowGraphReference import org.jetbrains.kotlin.fir.tree.generator.FirTreeBuilder.declaration @@ -37,7 +37,7 @@ object FieldSets { val declarations by lazy { fieldList(declaration.withArgs("E" to "*")) } - val annotations by lazy { fieldList("annotations", annotationCall).withTransform(needTransformInOtherChildren = true) } + val annotations by lazy { fieldList("annotations", annotation).withTransform(needTransformInOtherChildren = true) } fun symbolWithPackage(packageName: String?, symbolClassName: String, argument: String? = null): Field { return field("symbol", type(packageName, symbolClassName), argument) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt index 5038e99f2d1..8a3896c4373 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/FirTreeBuilder.kt @@ -89,7 +89,7 @@ object FirTreeBuilder : AbstractFirTreeBuilder() { val typeProjectionWithVariance = element("TypeProjectionWithVariance", TypeRef, typeProjection) val argumentList = element("ArgumentList", Expression) val call = sealedElement("Call", Expression, statement) // TODO: may smth like `CallWithArguments` or `ElementWithArguments`? - val annotationCall = element("AnnotationCall", Expression, expression, call, resolvable) + val annotation = element("Annotation", Expression, expression, call, resolvable) val comparisonExpression = element("ComparisonExpression", Expression, expression) val typeOperatorCall = element("TypeOperatorCall", Expression, expression, call) val assignmentOperatorStatement = element("AssignmentOperatorStatement", Expression, statement) diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt index 825ad5bd320..513ce4e704e 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/ImplementationConfigurator.kt @@ -73,7 +73,7 @@ object ImplementationConfigurator : AbstractFirTreeImplementationConfigurator() delegateFields(listOf("aliasName", "importedFqName", "isAllUnder", "source"), "delegate") } - impl(annotationCall) { + impl(annotation) { default("typeRef") { value = "annotationTypeRef" withGetter = true diff --git a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt index df627e9b479..936bb6d176e 100644 --- a/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt +++ b/compiler/fir/tree/tree-generator/src/org/jetbrains/kotlin/fir/tree/generator/NodeConfigurator.kt @@ -444,7 +444,7 @@ object NodeConfigurator : AbstractFieldConfigurator(FirTreeBuild +field("delegate", import) } - annotationCall.configure { + annotation.configure { +field("useSiteTarget", annotationUseSiteTargetType, nullable = true) +field("annotationTypeRef", typeRef).withTransform() +field("resolveStatus", annotationResolveStatusType, withReplace = true) diff --git a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt index 2f6fa4d114e..4887262f922 100644 --- a/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt +++ b/compiler/visualizer/render-fir/src/org/jetbrains/kotlin/compiler/visualizer/FirVisualizer.kt @@ -182,7 +182,7 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() { renderVariableType(multiDeclarationEntry) override fun visitAnnotationEntry(annotationEntry: KtAnnotationEntry) { - annotationEntry.firstOfTypeWithRender(annotationEntry.getChildOfType()) + annotationEntry.firstOfTypeWithRender(annotationEntry.getChildOfType()) super.visitAnnotationEntry(annotationEntry) } @@ -706,8 +706,8 @@ class FirVisualizer(private val firFile: FirFile) : BaseRenderer() { } } - override fun visitAnnotationCall(annotationCall: FirAnnotationCall, data: StringBuilder) { - visitConstructor(annotationCall, data) + override fun visitAnnotation(annotation: FirAnnotation, data: StringBuilder) { + visitConstructor(annotation, data) } override fun visitDelegatedConstructorCall(delegatedConstructorCall: FirDelegatedConstructorCall, data: StringBuilder) { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForResolveOnAir.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForResolveOnAir.kt index 6fc88f10f65..12ef38b9ed8 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForResolveOnAir.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/api/LowLevelFirApiFacadeForResolveOnAir.kt @@ -9,7 +9,7 @@ import com.intellij.psi.util.PsiTreeUtil import org.jetbrains.kotlin.analysis.providers.getModuleInfo import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.resolve.FirTowerDataContext import org.jetbrains.kotlin.fir.resolve.ScopeSession @@ -189,7 +189,7 @@ object LowLevelFirApiFacadeForResolveOnAir { replacement: RawFirReplacement, firFile: FirFile, collector: FirTowerDataContextCollector? = null, - ): FirAnnotationCall { + ): FirAnnotation { val annotationCall = buildFileFirAnnotation( session = firFile.moduleData.session, baseScopeProvider = firFile.moduleData.session.firIdeProvider.kotlinScopeProvider, diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt index 01fa8daff58..94f0e25e616 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/FirLazyDeclarationResolver.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticProperty import org.jetbrains.kotlin.fir.declarations.synthetic.FirSyntheticPropertyAccessor -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolveStatus import org.jetbrains.kotlin.fir.realPsi import org.jetbrains.kotlin.fir.resolve.ScopeSession @@ -38,7 +38,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui */ fun resolveFileAnnotations( firFile: FirFile, - annotations: List, + annotations: List, moduleFileCache: ModuleFileCache, scopeSession: ScopeSession, checkPCE: Boolean, @@ -61,7 +61,7 @@ internal class FirLazyDeclarationResolver(private val firFileBuilder: FirFileBui */ private fun resolveFileAnnotationsWithoutLock( firFile: FirFile, - annotations: List, + annotations: List, scopeSession: ScopeSession, collector: FirTowerDataContextCollector? = null, ) { diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/RawFirFileAnnotationBuilder.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/RawFirFileAnnotationBuilder.kt index 9c3023e004e..08d2c44f470 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/RawFirFileAnnotationBuilder.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/lazy/resolve/RawFirFileAnnotationBuilder.kt @@ -9,7 +9,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.builder.PsiHandlingMode import org.jetbrains.kotlin.fir.builder.RawFirBuilder -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.scopes.FirScopeProvider import org.jetbrains.kotlin.psi.KtAnnotationEntry import org.jetbrains.kotlin.psi.KtElement @@ -19,7 +19,7 @@ internal fun buildFileFirAnnotation( baseScopeProvider: FirScopeProvider, fileAnnotation: KtAnnotationEntry, replacement: RawFirReplacement? = null -): FirAnnotationCall { +): FirAnnotation { val replacementApplier = replacement?.Applier() @@ -30,7 +30,7 @@ internal fun buildFileFirAnnotation( } } builder.context.packageFqName = fileAnnotation.containingKtFile.packageFqName - val result = builder.VisitorWithReplacement().convertElement(fileAnnotation) as FirAnnotationCall + val result = builder.VisitorWithReplacement().convertElement(fileAnnotation) as FirAnnotation replacementApplier?.ensureApplied() return result -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirFileAnnotationsResolveTransformer.kt b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirFileAnnotationsResolveTransformer.kt index 6c147cf4be9..fccae4b2f7d 100644 --- a/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirFileAnnotationsResolveTransformer.kt +++ b/idea/idea-frontend-fir/idea-fir-low-level-api/src/org/jetbrains/kotlin/idea/fir/low/level/api/transformers/FirFileAnnotationsResolveTransformer.kt @@ -4,7 +4,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirDeclaration import org.jetbrains.kotlin.fir.declarations.FirFile import org.jetbrains.kotlin.fir.declarations.FirResolvePhase -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirAnnotationResolveStatus import org.jetbrains.kotlin.fir.resolve.ResolutionMode import org.jetbrains.kotlin.fir.resolve.ScopeSession @@ -17,7 +17,7 @@ import org.jetbrains.kotlin.idea.fir.low.level.api.element.builder.FirIdeDesigna internal class FirFileAnnotationsResolveTransformer( private val firFile: FirFile, - private val annotations: List, + private val annotations: List, session: FirSession, scopeSession: ScopeSession, implicitBodyResolveComputationSession: ImplicitBodyResolveComputationSession = ImplicitBodyResolveComputationSession(), diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt index 4a7042e0994..01414e74191 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/components/KtFirCallResolver.kt @@ -107,7 +107,7 @@ internal class KtFirCallResolver( override fun resolveCall(call: KtCallElement): KtCall? = withValidityAssertion { return when (val fir = call.getOrBuildFir(firResolveState)) { is FirFunctionCall -> resolveCall(fir) - is FirAnnotationCall -> fir.asAnnotationCall() + is FirAnnotation -> fir.asAnnotationCall() is FirDelegatedConstructorCall -> fir.asDelegatedConstructorCall() is FirConstructor -> fir.asDelegatedConstructorCall() is FirSafeCallExpression -> fir.regularQualifiedAccess.safeAs()?.let { resolveCall(it) } @@ -167,7 +167,7 @@ internal class KtFirCallResolver( return KtFunctionCall(createArgumentMapping(), target) } - private fun FirAnnotationCall.asAnnotationCall(): KtAnnotationCall? { + private fun FirAnnotation.asAnnotationCall(): KtAnnotationCall? { val target = calleeReference.createCallTarget() ?: return null return KtAnnotationCall(createArgumentMapping(), target) } diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt index a8f245d5d4f..3d568da6af9 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/ConeTypeIdeRenderer.kt @@ -11,7 +11,7 @@ import org.jetbrains.kotlin.fir.containingClassForLocal import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.isInner import org.jetbrains.kotlin.fir.declarations.utils.isLocal -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.renderWithType import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnresolvedError import org.jetbrains.kotlin.fir.resolve.inference.* @@ -42,7 +42,7 @@ internal class ConeTypeIdeRenderer( private var filterExtensionFunctionType: Boolean = false - private fun StringBuilder.renderAnnotationList(annotations: List?) { + private fun StringBuilder.renderAnnotationList(annotations: List?) { if (annotations != null) { val filteredExtensionIfNeeded = annotations.applyIf(filterExtensionFunctionType) { annotations.filterNot { it.toAnnotationClassId() == StandardClassIds.extensionFunctionType } @@ -51,7 +51,7 @@ internal class ConeTypeIdeRenderer( } } - fun renderType(type: ConeTypeProjection, annotations: List? = null): String = buildString { + fun renderType(type: ConeTypeProjection, annotations: List? = null): String = buildString { when (type) { is ConeKotlinErrorType -> { diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirAnnotationsIdeRenderer.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirAnnotationsIdeRenderer.kt index 4c315380f7b..a5cbc0441eb 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirAnnotationsIdeRenderer.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirAnnotationsIdeRenderer.kt @@ -8,7 +8,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.renderer import org.jetbrains.kotlin.builtins.StandardNames import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.toAnnotationClassId -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.types.FirResolvedTypeRef @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.mapAnnotationParameters internal fun StringBuilder.renderAnnotations( coneTypeIdeRenderer: ConeTypeIdeRenderer, - annotations: List, + annotations: List, session: FirSession ) { for (annotation in annotations) { @@ -27,11 +27,11 @@ internal fun StringBuilder.renderAnnotations( } } -private fun FirAnnotationCall.isParameterName(): Boolean { +private fun FirAnnotation.isParameterName(): Boolean { return toAnnotationClassId()?.asSingleFqName() == StandardNames.FqNames.parameterName } -private fun renderAnnotation(annotation: FirAnnotationCall, coneTypeIdeRenderer: ConeTypeIdeRenderer, session: FirSession): String { +private fun renderAnnotation(annotation: FirAnnotation, coneTypeIdeRenderer: ConeTypeIdeRenderer, session: FirSession): String { return buildString { append('@') val resolvedTypeRef = annotation.typeRef as? FirResolvedTypeRef @@ -45,7 +45,7 @@ private fun renderAnnotation(annotation: FirAnnotationCall, coneTypeIdeRenderer: } } -private fun renderAndSortAnnotationArguments(descriptor: FirAnnotationCall, session: FirSession): List { +private fun renderAndSortAnnotationArguments(descriptor: FirAnnotation, session: FirSession): List { val argumentList = mapAnnotationParameters(descriptor, session).entries.map { (name, value) -> "$name = ${renderConstant(value)}" } @@ -57,4 +57,4 @@ private fun renderConstant(value: FirExpression): String { is FirConstExpression<*> -> value.toString() else -> "NOT_CONST_EXPRESSION" } -} \ No newline at end of file +} diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirIdeRenderer.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirIdeRenderer.kt index cb6da967124..82ecb48184d 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirIdeRenderer.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/renderer/FirIdeRenderer.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.FirElement import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.utils.* -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirBlock import org.jetbrains.kotlin.fir.resolve.defaultType import org.jetbrains.kotlin.fir.types.* @@ -42,7 +42,7 @@ internal class FirIdeRenderer private constructor( } } - private fun renderType(type: ConeTypeProjection, annotations: List? = null): String = + private fun renderType(type: ConeTypeProjection, annotations: List? = null): String = typeIdeRenderer.renderType(type, annotations) private fun renderType(firRef: FirTypeRef, approximate: Boolean = false): String { diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt index 3b30e11cb4b..8e754eb2a01 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/KtFirAnnotationCall.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations import org.jetbrains.kotlin.descriptors.annotations.AnnotationUseSiteTarget import org.jetbrains.kotlin.fir.declarations.FirDeclaration -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.idea.fir.findPsi import org.jetbrains.kotlin.idea.fir.low.level.api.lazy.resolve.ResolveType import org.jetbrains.kotlin.idea.frontend.api.fir.utils.* @@ -19,10 +19,10 @@ import org.jetbrains.kotlin.psi.KtCallElement internal class KtFirAnnotationCall( private val containingDeclaration: FirRefWithValidityCheck, - annotationCall: FirAnnotationCall + annotation: FirAnnotation ) : KtAnnotationCall() { - private val annotationCallRef by weakRef(annotationCall) + private val annotationCallRef by weakRef(annotation) override val token: ValidityToken get() = containingDeclaration.token diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt index d8a27283c17..c41976567a3 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/symbols/annotations/firAnnotationUtils.kt @@ -7,7 +7,7 @@ package org.jetbrains.kotlin.idea.frontend.api.fir.symbols.annotations import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.FirAnnotatedDeclaration -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.coneClassLikeType import org.jetbrains.kotlin.fir.resolve.fullyExpandedType import org.jetbrains.kotlin.fir.types.classId @@ -16,7 +16,7 @@ import org.jetbrains.kotlin.idea.frontend.api.fir.utils.FirRefWithValidityCheck import org.jetbrains.kotlin.name.ClassId -internal fun FirAnnotationCall.getClassId(session: FirSession): ClassId? = +internal fun FirAnnotation.getClassId(session: FirSession): ClassId? = coneClassLikeType?.fullyExpandedType(session)?.classId internal fun FirRefWithValidityCheck.toAnnotationsList() = withFir { fir -> diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt index 6f09694f2e5..2bacfaea4a0 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/frontend/api/fir/utils/firUtils.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.declarations.FirCallableDeclaration import org.jetbrains.kotlin.fir.declarations.FirDeclarationOrigin import org.jetbrains.kotlin.fir.declarations.FirRegularClass import org.jetbrains.kotlin.fir.declarations.utils.primaryConstructor -import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall +import org.jetbrains.kotlin.fir.expressions.FirAnnotation import org.jetbrains.kotlin.fir.expressions.FirConstExpression import org.jetbrains.kotlin.fir.expressions.FirExpression import org.jetbrains.kotlin.fir.expressions.FirNamedArgumentExpression @@ -33,7 +33,6 @@ import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtConstantValue import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtSimpleConstantValue import org.jetbrains.kotlin.idea.frontend.api.symbols.markers.KtUnsupportedConstantValue import org.jetbrains.kotlin.idea.frontend.api.types.KtTypeNullability -import org.jetbrains.kotlin.idea.references.FirReferenceResolveHelper import org.jetbrains.kotlin.name.FqName import org.jetbrains.kotlin.psi.* @@ -68,9 +67,9 @@ internal fun FirNamedReference.getReferencedElementType(resolveState: FirModuleR } } -internal fun mapAnnotationParameters(annotationCall: FirAnnotationCall, session: FirSession): Map { +internal fun mapAnnotationParameters(annotation: FirAnnotation, session: FirSession): Map { - val annotationCone = annotationCall.annotationTypeRef.coneType as? ConeClassLikeType ?: return emptyMap() + val annotationCone = annotation.annotationTypeRef.coneType as? ConeClassLikeType ?: return emptyMap() val annotationPrimaryCtor = (annotationCone.lookupTag.toSymbol(session)?.fir as? FirRegularClass)?.primaryConstructor val annotationCtorParameterNames = annotationPrimaryCtor?.valueParameters?.map { it.name } @@ -79,11 +78,11 @@ internal fun mapAnnotationParameters(annotationCall: FirAnnotationCall, session: val namesSequence = annotationCtorParameterNames?.asSequence()?.iterator() - for (argument in annotationCall.argumentList.arguments.filterIsInstance()) { + for (argument in annotation.argumentList.arguments.filterIsInstance()) { resultSet[argument.name.asString()] = argument.expression } - for (argument in annotationCall.argumentList.arguments) { + for (argument in annotation.argumentList.arguments) { if (argument is FirNamedArgumentExpression) continue while (namesSequence != null && namesSequence.hasNext()) { diff --git a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt index 2f4b7b97a38..391d4e6da36 100644 --- a/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt +++ b/idea/idea-frontend-fir/src/org/jetbrains/kotlin/idea/references/FirReferenceResolveHelper.kt @@ -18,9 +18,6 @@ import org.jetbrains.kotlin.fir.expressions.* import org.jetbrains.kotlin.fir.references.* import org.jetbrains.kotlin.fir.resolve.ScopeSession import org.jetbrains.kotlin.fir.resolve.calls.FirSyntheticPropertySymbol -import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeAmbiguityError -import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeInapplicableCandidateError -import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeOperatorAmbiguityError import org.jetbrains.kotlin.fir.resolve.diagnostics.ConeUnmatchedTypeArgumentsError import org.jetbrains.kotlin.fir.resolve.toSymbol import org.jetbrains.kotlin.fir.resolve.transformers.FirImportResolveTransformer @@ -31,7 +28,6 @@ import org.jetbrains.kotlin.fir.symbols.impl.ConeClassLikeLookupTagImpl import org.jetbrains.kotlin.fir.types.* import org.jetbrains.kotlin.idea.fir.getCandidateSymbols import org.jetbrains.kotlin.idea.fir.isImplicitFunctionCall -import org.jetbrains.kotlin.idea.fir.low.level.api.api.FirModuleResolveState import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFir import org.jetbrains.kotlin.idea.fir.low.level.api.api.getOrBuildFirSafe import org.jetbrains.kotlin.idea.frontend.api.fir.KtFirAnalysisSession @@ -179,7 +175,7 @@ internal object FirReferenceResolveHelper { is FirResolvedTypeRef -> getSymbolsForResolvedTypeRef(fir, expression, session, symbolBuilder) is FirResolvedQualifier -> getSymbolsForResolvedQualifier(fir, expression, session, symbolBuilder) - is FirAnnotationCall -> getSymbolsForAnnotationCall(fir, session, symbolBuilder) + is FirAnnotation -> getSymbolsForAnnotationCall(fir, session, symbolBuilder) is FirResolvedImport -> getSymbolsByResolvedImport(expression, symbolBuilder, fir, session) is FirPackageDirective -> getSymbolsForPackageDirective(expression, symbolBuilder) is FirFile -> getSymbolsByFirFile(symbolBuilder, fir) @@ -498,7 +494,7 @@ internal object FirReferenceResolveHelper { } private fun getSymbolsForAnnotationCall( - fir: FirAnnotationCall, + fir: FirAnnotation, session: FirSession, symbolBuilder: KtSymbolByFirBuilder ): Collection { diff --git a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt index f37d8bd3b34..b40fdff3502 100644 --- a/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt +++ b/plugins/fir/fir-plugin-prototype/src/org/jetbrains/kotlin/fir/plugin/generators/AllOpenRecursiveNestedClassGenerator.kt @@ -13,7 +13,7 @@ import org.jetbrains.kotlin.fir.FirSession import org.jetbrains.kotlin.fir.declarations.* import org.jetbrains.kotlin.fir.declarations.builder.buildRegularClass import org.jetbrains.kotlin.fir.declarations.impl.FirResolvedDeclarationStatusImpl -import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotationCall +import org.jetbrains.kotlin.fir.expressions.builder.buildAnnotation import org.jetbrains.kotlin.fir.extensions.FirDeclarationGenerationExtension import org.jetbrains.kotlin.fir.extensions.predicate.DeclarationPredicate import org.jetbrains.kotlin.fir.extensions.predicate.has @@ -48,7 +48,7 @@ class AllOpenRecursiveNestedClassGenerator(session: FirSession) : FirDeclaration name = Name.identifier("Nested") symbol = FirRegularClassSymbol(owner.symbol.classId.createNestedClassId(name)) scopeProvider = owner.scopeProvider - annotations += buildAnnotationCall { + annotations += buildAnnotation { annotationTypeRef = buildResolvedTypeRef { type = ConeClassLikeTypeImpl( ConeClassLikeLookupTagImpl(annotationClassId),